diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-27 16:17:51 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-27 16:17:51 +0200 |
commit | 0ee0392ee9301df31f6e3c601214bb250112fa75 (patch) | |
tree | 3d91576bf751a8a45ddad77e0a37c2d8fd4fa91f /community | |
parent | a3ba265c32b1de731745e1abc812f5d21bcd6aaf (diff) | |
parent | 5233daa5825f00ccf0722ef9733ea6b3bbd44bc8 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dwdiff/PKGBUILD
community/ejabberd/PKGBUILD
community/gnome-settings-daemon-updates/PKGBUILD
community/gpicview/PKGBUILD
community/libgexiv2/PKGBUILD
community/mapnik/PKGBUILD
community/mplayer2/PKGBUILD
community/open-vm-tools/PKGBUILD
community/vdrift/PKGBUILD
community/xboard/PKGBUILD
core/openssh/PKGBUILD
extra/boost/PKGBUILD
extra/dconf/PKGBUILD
extra/elfutils/PKGBUILD
extra/gconf/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-disk-utility/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-themes-standard/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/icu/PKGBUILD
extra/libgsf/PKGBUILD
extra/libimobiledevice/PKGBUILD
extra/libplist/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/pango/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/telepathy-kde-accounts-kcm/PKGBUILD
extra/telepathy-kde-approver/PKGBUILD
extra/telepathy-kde-auth-handler/PKGBUILD
extra/telepathy-kde-contact-list/PKGBUILD
extra/telepathy-kde-filetransfer-handler/PKGBUILD
extra/telepathy-kde-integration-module/PKGBUILD
extra/telepathy-kde-send-file/PKGBUILD
extra/telepathy-kde-text-ui/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/virtuoso/PKGBUILD
extra/yelp/PKGBUILD
libre/unarchiver/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-pango/PKGBUILD
testing/binutils/PKGBUILD
Diffstat (limited to 'community')
71 files changed, 910 insertions, 457 deletions
diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD new file mode 100644 index 000000000..d42dafb35 --- /dev/null +++ b/community/almanah/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 69798 2012-04-23 09:46:12Z ibiru $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=almanah +pkgver=0.9.0 +pkgrel=1 +pkgdesc="Small GTK+ application to allow you to keep a diary of your life" +arch=('i686' 'x86_64') +url="http://live.gnome.org/Almanah_Diary" +license=('GPL') +depends=('evolution-data-server>=3.4.0' 'gtkspell3' 'libcryptui' 'xdg-utils') +makedepends=('intltool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('c8928c5beda9e7a54040ba5a87873ad8fad5feb5585546b0ab5e57d08c3aa7c6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-compile + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/almanah/almanah.install b/community/almanah/almanah.install new file mode 100644 index 000000000..6ce7836d2 --- /dev/null +++ b/community/almanah/almanah.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index c4f532fa0..d8ae0e53b 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 68660 2012-03-30 19:41:39Z svenstaro $ +# $Id: PKGBUILD 69800 2012-04-23 09:46:22Z ibiru $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=clanlib pkgver=2.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64' 'mips64el') url="http://clanlib.org/" license=('zlib') -depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite3') +depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite') makedepends=('doxygen' 'graphviz') options=('!libtool') source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz) diff --git a/community/contacts/PKGBUILD b/community/contacts/PKGBUILD index 901bdae52..638c9866d 100644 --- a/community/contacts/PKGBUILD +++ b/community/contacts/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68465 2012-03-25 08:49:14Z bgyorgy $ +# $Id: PKGBUILD 69724 2012-04-23 09:06:34Z ibiru $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=contacts pkgver=0.12 -pkgrel=5 +pkgrel=6 pkgdesc="Small, lightweight GTK+ address book app" arch=('i686' 'x86_64') url="http://pimlico-project.org/contacts.html" diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 5c57a031e..7d62a91bb 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,35 +1,39 @@ -# $Id: PKGBUILD 61260 2011-12-26 21:33:37Z spupykin $ +# $Id: PKGBUILD 69752 2012-04-23 09:14:35Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua -# Previous Contributor: Michael Fellinger <m.fellinger@gmail.com> +# Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb pkgver=1.2.0 -pkgrel=2git20111115 +pkgrel=3 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64' 'mips64el') url="http://couchdb.apache.org" license=('APACHE') depends=('icu' 'erlang' 'js' 'openssl' 'curl') -makedepends=('gcc') install=couchdb.install options=('!libtool') backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') -#source=("http://www.apache.org/dist/$pkgname/$pkgver/apache-$pkgname-$pkgver.tar.gz" -source=("http://arch.p5n.pp.ru/~sergej/dl/apache-couchdb-$pkgver.git20111115.tar.gz" - "rc-script.patch") -md5sums=('b4236a36a473e3a1c81e7548de194c47' - '8a3b1a1ff98a6411827ad991db7a355b') +source=("http://www.apache.org/dist/couchdb/releases/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc} + "rc-script.patch" "configure-fix.patch") +md5sums=('a5cbbcaac288831b3d8a08b725657f10' + '890a85b22219ea113a4901a289c442f8' + '8a3b1a1ff98a6411827ad991db7a355b' + 'fd1669544d08bda09c3318873d51db1e') build() { cd "$srcdir/apache-$pkgname-$pkgver" - [ -x configure ] || ./bootstrap - sed -i 's|-ljs|-lmozjs185|' configure - [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + # workaround for FS#26827 + patch -Np1 < $srcdir/configure-fix.patch + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var make + patch -R etc/init/couchdb <$srcdir/rc-script.patch } diff --git a/community/couchdb/configure-fix.patch b/community/couchdb/configure-fix.patch new file mode 100644 index 000000000..0bb68ecfe --- /dev/null +++ b/community/couchdb/configure-fix.patch @@ -0,0 +1,21 @@ +diff -rup apache-couchdb-1.2.0/configure apache-couchdb-1.2.0.new/configure +--- apache-couchdb-1.2.0/configure 2012-03-29 23:05:41.000000000 +0200 ++++ apache-couchdb-1.2.0.new/configure 2012-04-08 13:50:14.923693056 +0200 +@@ -18234,7 +18234,7 @@ echo "$as_me: error: $erlang_version_err + fi + fi + +-otp_release="`${ERL} -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`" ++otp_release="`${ERL} -smp disable -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`" + + if test x$otp_release \> xR13B03; then + USE_OTP_NIFS_TRUE= +@@ -18253,7 +18253,7 @@ else + fi + + +-has_crypto=`${ERL} -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop` ++has_crypto=`${ERL} -smp disable -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop` + + if test -n "$has_crypto"; then + { { echo "$as_me:$LINENO: error: Could not find the Erlang crypto library. Has Erlang been compiled with OpenSSL support?" >&5 diff --git a/community/dates/PKGBUILD b/community/dates/PKGBUILD index 668eb6177..8c512cb21 100644 --- a/community/dates/PKGBUILD +++ b/community/dates/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68466 2012-03-25 08:50:04Z bgyorgy $ +# $Id: PKGBUILD 69802 2012-04-23 09:46:41Z ibiru $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=dates pkgver=0.4.11 -pkgrel=4 +pkgrel=5 pkgdesc="Small, lightweight GTK+ calendar app" arch=('i686' 'x86_64') url="http://pimlico-project.org/dates.html" diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD new file mode 100644 index 000000000..a116b0f00 --- /dev/null +++ b/community/dee/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 69804 2012-04-23 09:46:49Z ibiru $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=dee +pkgver=1.0.10 +pkgrel=1 +pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" +arch=('i686' 'x86_64') +url="https://launchpad.net/dee" +license=('LGPL') +depends=('glib2' 'icu') +makedepends=('python2' 'gobject-introspection' 'vala') +options=('!libtool') +source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('17b715147e1721ce9624557949408d15') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-tests \ + PYTHON=python2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD index 5042e9358..504a84e76 100644 --- a/community/dwdiff/PKGBUILD +++ b/community/dwdiff/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 57280 2011-10-25 09:58:12Z spupykin $ +# $Id: PKGBUILD 69754 2012-04-23 09:14:53Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=dwdiff pkgver=2.0 -pkgrel=1 -pkgdesc="a front-end for the diff program that operates at the word level instead of the line level" +pkgrel=2 +pkgdesc="A front-end for the diff program that operates at the word level instead of the line level" arch=('i686' 'x86_64' 'mips64el') url="http://os.ghalkes.nl/dwdiff.html" depends=('diffutils' 'icu') license=('GPL') -source=(http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz) +source=("http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz") md5sums=('98dd16b58a1f136a2cd49f7dd88c5313') build() { diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index c293e0612..9e1547975 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,46 +1,44 @@ -# $Id: PKGBUILD 65019 2012-02-20 01:58:47Z spupykin $ +# $Id: PKGBUILD 69776 2012-04-23 09:18:21Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Jeff 'codemac' Mickey <jeff@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> +# Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ejabberd pkgver=2.1.10 -pkgrel=3 -pkgdesc="An erlang jabber server" -arch=(i686 x86_64 'mips64el') +pkgrel=4 +pkgdesc="Jabber server written in Erlang" +arch=('x86_64' 'i686' 'mips64el') url="http://www.ejabberd.im/" license=("GPL") -# TODO: replace net-tools usage in rc.d with iproute2 -depends=('expat' 'openssl' 'zlib' 'erlang' 'pam' - 'net-tools') -makedepends=() -backup=(etc/ejabberd/ejabberd.cfg - etc/logrotate.d/ejabberd) -install=ejabberd.install -source=(http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tar.gz - ejabberd - ejabberd.logrotate) -md5sums=('70f0e17983114c62893e43b6ef2e9d0c' - 'c49bb73bdcb50ea7fcf411bbfed7629a' - 'f97c8a96160f30e0aecc9526c12e6606') +depends=('expat' 'openssl' 'zlib' 'erlang' 'pam' 'iproute2') +backup=(etc/ejabberd/ejabberd.cfg etc/logrotate.d/ejabberd) +install=$pkgname.install +source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tar.gz" + "$pkgname.logrotate" + "$pkgname") +sha256sums=('9dc2e5889e919a7d51f2b95b83da835116631db81550a115c02e71909ad932be' + '31780cac78736d285e46f445f8c8463a70f2aeb2683280c259129db11832ddd2' + '93f8f9a8751b9e982b332f74e71f766c3c9c4818876991cadef08fe140b83ca6') build() { - cd ${srcdir}/${pkgname}-${pkgver}/src + cd "$srcdir/$pkgname-$pkgver/src" - sed -i "s|EJABBERDDIR = \$(DESTDIR)@prefix@/var/lib/ejabberd|EJABBERDDIR = \$(DESTDIR)@prefix@/usr/lib/ejabberd|g" ./Makefile.in - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-pam --enable-odbc + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --enable-pam --enable-odbc make } package() { - cd ${srcdir}/${pkgname}-${pkgver}/src - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver/src" - install -D -m 0755 ${srcdir}/ejabberd ${pkgdir}/etc/rc.d/ejabberd - install -d ${pkgdir}/var/spool/ejabberd - install -d ${pkgdir}/var/lib/ejabberd - - install -D -m0644 ${srcdir}/ejabberd.logrotate ${pkgdir}/etc/logrotate.d/ejabberd - chmod ug+r ${pkgdir}/etc/ejabberd/* - rm -rf $pkgdir/var/lock + make DESTDIR="$pkgdir" install + install -D -m 0755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname" + install -d "$pkgdir/var/spool/$pkgname" + install -d "$pkgdir/var/lib/$pkgname" + install -D -m0644 "$srcdir/$pkgname.logrotate" \ + "$pkgdir/etc/logrotate.d/$pkgname" + chmod ug+r "$pkgdir/etc/$pkgname/"* + rm -rf "$pkgdir/var/lock" } + +# vim:set ts=2 sw=2 et: diff --git a/community/ejabberd/ejabberd b/community/ejabberd/ejabberd index 48f88d282..259d4db66 100644 --- a/community/ejabberd/ejabberd +++ b/community/ejabberd/ejabberd @@ -7,10 +7,10 @@ cd /var/log/ejabberd/ get_pid() { pidof epmd >/dev/null || { echo '' ; return 0; } - # get port from 'epmd -names', then get pid from 'netstat -tlnp' + # get port from 'epmd -names', then get pid from 'ss -tlnp' PORT=`epmd -names | grep ejabberd | cut -f5 -d\ ` [ -z "$PORT" ] && { echo '' ; return 0; } - PID=`netstat -tlnp | grep $PORT | grep -oE '[[:digit:]]+/'` + PID=`ss -tlnp | grep $PORT | grep -oE '[[:digit:]]+,' | cut -d, -f1` [ -z "$PID" ] && { echo '' ; return 0; } echo ${PID%/} } diff --git a/community/ejabberd/ejabberd.install b/community/ejabberd/ejabberd.install index eceb73592..9d17a911e 100644 --- a/community/ejabberd/ejabberd.install +++ b/community/ejabberd/ejabberd.install @@ -1,24 +1,26 @@ post_install() { - groupadd -r jabber - useradd -r -G jabber -d /var/lib/ejabberd ejabberd - chown -R ejabberd.jabber /var/log/ejabberd - chown -R ejabberd.jabber /var/spool/ejabberd - chown -R ejabberd.jabber /var/lib/ejabberd - chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam - chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd - chmod 4750 /usr/lib/ejabberd/priv/bin/epam + groupadd -r jabber + useradd -r -G jabber -d /var/lib/ejabberd ejabberd + chown -R ejabberd.jabber /var/log/ejabberd + chown -R ejabberd.jabber /var/spool/ejabberd + chown -R ejabberd.jabber /var/lib/ejabberd + chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam + chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd + chmod 4750 /usr/lib/ejabberd/priv/bin/epam } post_upgrade() { - chown -R ejabberd.jabber /var/log/ejabberd - chown -R ejabberd.jabber /var/spool/ejabberd - chown -R ejabberd.jabber /var/lib/ejabberd - chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd - chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam - chmod 4750 /usr/lib/ejabberd/priv/bin/epam + chown -R ejabberd.jabber /var/log/ejabberd + chown -R ejabberd.jabber /var/spool/ejabberd + chown -R ejabberd.jabber /var/lib/ejabberd + chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd + chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam + chmod 4750 /usr/lib/ejabberd/priv/bin/epam } post_remove() { - userdel ejabberd - groupdel jabber + userdel ejabberd + groupdel jabber } + +# vim:set ts=2 sw=2 et: diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index b52cbf059..933865d51 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,71 +1,72 @@ -# $Id: PKGBUILD 67366 2012-03-10 17:20:02Z tdziedzic $ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# $Id: PKGBUILD 69792 2012-04-23 09:41:50Z ibiru $ +# Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> +# Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com> pkgname=erlang -pkgver=R14B04 -pkgrel=2 -pkgdesc="A small concurrent functional programming language developed by Ericsson." +pkgver=R15B01 +pkgrel=1 +pkgdesc='A small concurrent functional programming language developed by Ericsson.' arch=(i686 x86_64) -url="http://www.erlang.org/index.html" +url='http://www.erlang.org/index.html' license=('custom') depends=('ncurses' 'glibc') makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa') -optdepends=('wxgtk: for wx support' 'unixodbc: database') - +optdepends=('wxgtk: for wx support' + 'mesa: for wx support' + 'unixodbc: database' + 'java-environment: for Java support') options=('!makeflags') -source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz - http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz) -md5sums=('4b469729f103f52702bfb1fb24529dc0' - 'f31e72518daae4007f595c0b224dd59f') - -# please check these deps reported by namcap when you do the next build: -#erlang E: Dependency java-environment detected and not included (found class files usr/lib/erlang/lib/jinterface-1.5.4/priv/OtpErlang.jar, usr/lib/erlang/lib/ic-4.2.27/priv/ic.jar) -#erlang E: Dependency mesa detected and not included (libraries ['usr/lib/libGLU.so.1'] needed in files ['usr/lib/erlang/lib/wx-0.99/priv/erl_gl.so']) - +source=("http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz" + "http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz") +md5sums=('f12d00f6e62b36ad027d6c0c08905fad' + 'd87412c2a1e6005bbe29dfe642a9ca20') build() { cd "$srcdir/otp_src_${pkgver/./-}" + export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk) - export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk) + export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < \ + lib/erl_interface/vsn.mk) sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure - CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs + CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support \ + --enable-threads make } package() { cd "$srcdir/otp_src_${pkgver/./-}" + make INSTALL_PREFIX="$pkgdir" install -# fix prefix - cd "$pkgdir" - for i in usr/lib/erlang/bin/erl \ - usr/lib/erlang/bin/start \ - usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \ - usr/lib/erlang/erts-${ERTSVERSION}/bin/start \ - usr/lib/erlang/releases/RELEASES ;do - sed -i "s#$pkgdir##" $i - done + # fix prefix + cd "$pkgdir/usr/lib/erlang" + sed -i "s#$pkgdir##" bin/erl bin/start "erts-${ERTSVERSION}/bin/erl" \ + "erts-${ERTSVERSION}/bin/start" releases/RELEASES -# fix symlinks - cd "$pkgdir/usr/lib/erlang/bin" - ln -sf ../erts-${ERTSVERSION}/bin/epmd + # fix symlinks + cd bin/ + ln -sf "../erts-${ERTSVERSION}/bin/epmd" cd "$pkgdir/usr/bin" for file in *; do - ln -sfv ../lib/erlang/bin/$file + ln -sfv "../lib/erlang/bin/$file" done - ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call" + ln -s "../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call" \ + "$pkgdir/usr/bin/erl_call" -# install documentation + # install documentation install -d "$pkgdir/usr/share/doc/erlang" - install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang" - cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang" + install -Dm0644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang" - install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" + # install man pages + cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang" + # install license + install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" \ + "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" } diff --git a/community/esdl/PKGBUILD b/community/esdl/PKGBUILD index eee11f97b..1324daaee 100644 --- a/community/esdl/PKGBUILD +++ b/community/esdl/PKGBUILD @@ -4,7 +4,7 @@ pkgname=esdl pkgver=1.0.1 -pkgrel=1 +pkgrel=2 epoch=2 arch=('x86_64' 'i686') pkgdesc="SDL and OpenGL bindings for the Erlang programming language" diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index f914a6d91..0773f67d3 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67178 2012-03-05 08:56:50Z ibiru $ +# $Id: PKGBUILD 69756 2012-04-23 09:15:01Z ibiru $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=fatrat pkgver=1.2.0_beta1 -pkgrel=4 +pkgrel=5 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64' 'mips64el') url="http://fatrat.dolezel.info/" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 0c17566b7..ceb786751 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69042 2012-04-08 17:05:00Z lcarlier $ +# $Id: PKGBUILD 69722 2012-04-23 07:27:51Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -12,7 +12,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=3.1.0 +pkgver=3.1.1 pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') @@ -28,7 +28,7 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('e41982c83e8b27bd2cba8fe8c173b979' +md5sums=('bdf387f435d7aeedb7efa488ea1a5d62' 'b284be39d147ec799f1116a6abc068b4' 'b5cc403990f31b8ea1c5cf37366d3d29') diff --git a/community/gdlmm/PKGBUILD b/community/gdlmm/PKGBUILD index bdd1c68a5..3c5d0091f 100644 --- a/community/gdlmm/PKGBUILD +++ b/community/gdlmm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 61579 2012-01-03 16:01:24Z arodseth $ +# $Id: PKGBUILD 69726 2012-04-23 09:06:41Z ibiru $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=gdlmm pkgver=3.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="C++ bindings for the gdl library" arch=('x86_64' 'i686') url="http://git.gnome.org/browse/gdlmm/" diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index ff63dd9fd..8432fa488 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63362 2012-01-31 11:48:17Z arodseth $ +# $Id: PKGBUILD 69728 2012-04-23 09:06:52Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.2.1 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 pkgdesc="Plugins for gedit" arch=('x86_64' 'i686' 'mips64el') license=('GPL') @@ -15,23 +15,21 @@ url="http://live.gnome.org/GeditPlugins" depends=('gedit' 'dbus-python') optdepends=('gucharmap: for charmap plugin' 'vte3: for embedded terminal') -makedepends=('intltool' 'gnome-doc-utils') +makedepends=('intltool' 'gnome-doc-utils' 'vte3') options=('!libtool' '!emptydirs') install=gedit-plugins.install -source=("ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.2/$pkgname-$pkgver.tar.xz") -sha256sums=('45dee01a196a7d5e87027187e76d57643b146ea1c313cad2686ebd369890f841') +source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz") +sha256sums=('a66138b43e1a77f39258f04936be35163b4c6bfd49643791ca445cb3c3d60e0a') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all \ --disable-schemas-compile make } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD new file mode 100644 index 000000000..37d4a74fb --- /dev/null +++ b/community/glabels/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 69806 2012-04-23 09:47:01Z ibiru $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: yugrotavele <yugrotavele at archlinux dot us> +# Contributor: Damir Perisa <damir@archlinux.org> + +pkgname=glabels +pkgver=3.0.0 +pkgrel=3 +pkgdesc="Creating labels and business cards the very easy way" +arch=('i686' 'x86_64') +url="http://glabels.sourceforge.net/" +license=('GPL' 'LGPL') +depends=('librsvg' 'evolution-data-server>=3.4.0' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils') +makedepends=('barcode' 'intltool' 'gnome-doc-utils') +options=('!libtool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 + fix-gschema.patch) +sha256sums=('a3a3db4dd25bfb1a03f4008f01c5d9045174e78e13ae77438b81bfe4bf14e64a' + 'ef4f368b49fe66fb7e9c1c4edabb96e1f10fd3e8502d695aef6b89388c38cd94') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix-gschema.patch" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-scrollkeeper --disable-schemas-compile + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/glabels/fix-gschema.patch b/community/glabels/fix-gschema.patch new file mode 100644 index 000000000..51e197096 --- /dev/null +++ b/community/glabels/fix-gschema.patch @@ -0,0 +1,36 @@ +diff -Naur glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in +--- glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in 2012-04-09 13:58:25.256413359 +0000 ++++ glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in 2012-04-09 13:59:40.495830152 +0000 +@@ -2,10 +2,10 @@ + + + <schema id="org.gnome.glabels-3" path="/apps/glabels-3/" gettext-domain="glabels-3.0"> +- <child name="ui" schema="org.gnome.glabels.ui"/> +- <child name="locale" schema="org.gnome.glabels.locale"/> +- <child name="objects" schema="org.gnome.glabels.objects"/> +- <child name="history" schema="org.gnome.glabels.history"/> ++ <child name="ui" schema="org.gnome.glabels-3.ui"/> ++ <child name="locale" schema="org.gnome.glabels-3.locale"/> ++ <child name="objects" schema="org.gnome.glabels-3.objects"/> ++ <child name="history" schema="org.gnome.glabels-3.history"/> + </schema> + + +diff -Naur glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in.in glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in.in +--- glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in.in 2012-04-09 13:58:25.256413359 +0000 ++++ glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in.in 2012-04-09 13:59:32.232560783 +0000 +@@ -2,10 +2,10 @@ + + + <schema id="org.gnome.glabels-3" path="/apps/glabels-3/" gettext-domain="@GETTEXT_PACKAGE@"> +- <child name="ui" schema="org.gnome.glabels.ui"/> +- <child name="locale" schema="org.gnome.glabels.locale"/> +- <child name="objects" schema="org.gnome.glabels.objects"/> +- <child name="history" schema="org.gnome.glabels.history"/> ++ <child name="ui" schema="org.gnome.glabels-3.ui"/> ++ <child name="locale" schema="org.gnome.glabels-3.locale"/> ++ <child name="objects" schema="org.gnome.glabels-3.objects"/> ++ <child name="history" schema="org.gnome.glabels-3.history"/> + </schema> + + diff --git a/community/glabels/glabels.install b/community/glabels/glabels.install new file mode 100644 index 000000000..42bb5884d --- /dev/null +++ b/community/glabels/glabels.install @@ -0,0 +1,15 @@ +post_install() { + xdg-icon-resource forceupdate + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + + +post_remove() { + post_install $1 +} diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index 317810951..ec5771273 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 67184 2012-03-05 08:57:17Z ibiru $ +# $Id: PKGBUILD 69730 2012-04-23 09:07:06Z ibiru $ # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=glom -pkgver=1.20.4 +pkgver=1.22.0 pkgrel=1 pkgdesc="An easy-to-use database designer and user interface" arch=('i686' 'x86_64' 'mips64el') url="http://www.glom.org/" license=('GPL') depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql') -makedepends=('intltool' 'gnome-doc-utils' 'python2-sphinx' 'boost') +makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('038d106313774832c56c61312bb387a54cd2ffff50e6c7e56e47bc98b8b8531b') +sha256sums=('e6ce1b0c76cec8c85beba4900a80f257de3cc23a2c65908262fd8be87c2e546a') build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,7 +24,8 @@ build() { --with-postgres-utils=/usr/bin \ --disable-scrollkeeper \ --disable-update-mime-database \ - --disable-static + --disable-static \ + PYTHON=python2 make } diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 4a7690194..bce6b8708 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69172 2012-04-09 23:02:59Z spupykin $ +# $Id: PKGBUILD 69809 2012-04-23 10:15:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -6,7 +6,7 @@ pkgbase=gmic pkgname=('gmic' 'gimp-plugin-gmic') -pkgver=1.5.1.1 +pkgver=1.5.1.2 pkgrel=1 pkgdesc="image procession framework" arch=('i686' 'x86_64' 'mips64el') @@ -16,13 +16,11 @@ makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagema options=('docs' '!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz" opencv-buildfix.patch) -md5sums=('858a1d8d06d19a1903feb5314a58c805' +md5sums=('1599803b0c60aa834cdc4f6200db5335' '62515a0e477e71e11ee24f66b5799937') build() { cd "$srcdir/gmic-$pkgver" -# CFLAGS+=" -Dcimg_use_lapack" -# LDFLAGS="-llapack" patch -p1 <$srcdir/opencv-buildfix.patch make -C src all } diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index 0d2ffa8b7..ffb1c210e 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68215 2012-03-19 12:02:37Z lfleischer $ +# $Id: PKGBUILD 69732 2012-04-23 09:07:15Z ibiru $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgname=gnome-packagekit -pkgver=3.2.1 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64' 'mips64el') url='http://www.packagekit.org/' @@ -11,20 +11,21 @@ license=('GPL') depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'packagekit') makedepends=('gconf' 'gtk-doc' 'intltool' 'libcanberra' 'upower') -optdepends=('gnome-settings-daemon-updates: update and message notifications') +optdepends=('polkit-gnome: required for privileged actions' + 'gnome-settings-daemon-updates: update and message notifications') options=('!emptydirs' '!libtool') install="$pkgname.install" -source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" - 'arch.patch') -sha256sums=('7a6383a2a91fd29c0b6fd9b8900d498efd2e38b89149470433748d989926c341' - '9c809ac3c8bbf870442e7bc4123c70b144930a287b28626be1b8bae95edf71ac') +source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz") +sha256sums=('4f23be695b70bdda8b5c15237472a735bb1745af11dbc324eead9b988f2343c6') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/arch.patch" - sed -i 's/python/python2/' python/enum-convertor.py - sed -i 's/python enum-convertor.py/python2 enum-convertor.py/' python/packagekit/Makefile.{am,in} + _mime='application/x-xz-compressed-tar;application/x-servicepack;' + sed -i "s@MimeType=.*@MimeType=$_mime@" data/gpk-install-local-file.desktop.in + + sed -i 's@python@python2@' python/enum-convertor.py + sed -i 's@python enum-convertor.py@python2 enum-convertor.py@' python/packagekit/Makefile.{am,in} export PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ @@ -39,6 +40,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make -s DESTDIR="$pkgdir" install - - rm -rf "$pkgdir/usr/lib/gnome-settings-daemon-3.0/gtk-modules" } diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index 31e48a2b5..ced18ce73 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,33 +1,38 @@ -# $Id: PKGBUILD 68092 2012-03-17 19:45:14Z giovanni $ +# $Id: PKGBUILD 69734 2012-04-23 09:07:27Z ibiru $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates -pkgver=3.2.0 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnome.org" license=('GPL') depends=('gnome-packagekit' "$_pkgname") -makedepends=('intltool' 'gtk-doc' 'gnome-desktop') +makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom') options=('!emptydirs' '!libtool') install=$_pkgname.install +url="http://www.gnome.org" source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz" + 'systemd-fallback.patch' 'arch.patch') -sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b' - 'e5029915c423f72256c4170f917363c385b6fcd180b87ceba0d7bb11a841d7e9') +sha256sums=('5639cbba28caa7b3e33990f49aeed11ed9325e78e76af2175d9ccd5ff298401d' + '82b721d0e274af15ed2770052d550d3162d2d37e5e9ee5e6fcebac1ed6cb8199' + '727ab3e8181464af32ba604b2931b77cd6d4fbf34e10bbba99bb213eb992466e') build() { cd "$srcdir/$_pkgname-$pkgver" + patch -Np1 -i "$srcdir/arch.patch" - ./configure --prefix=/usr \ + patch -Np1 -i "$srcdir/systemd-fallback.patch" + + gnome-autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon \ --disable-static \ - --enable-pulse \ - --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids + --enable-systemd + #https://bugzilla.gnome.org/show_bug.cgi?id=656231 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make -s diff --git a/community/gnome-settings-daemon-updates/arch.patch b/community/gnome-settings-daemon-updates/arch.patch index f405d7593..6718e4db9 100644 --- a/community/gnome-settings-daemon-updates/arch.patch +++ b/community/gnome-settings-daemon-updates/arch.patch @@ -36,7 +36,7 @@ index 9510c65..191092d 100644 libupdates_la_CPPFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c -index 90ea246..d79455c 100644 +index 4ed046c..9842b32 100644 --- a/plugins/updates/gsd-updates-manager.c +++ b/plugins/updates/gsd-updates-manager.c @@ -32,6 +32,7 @@ @@ -55,7 +55,7 @@ index 90ea246..d79455c 100644 GSettings *settings_ftp; GSettings *settings_gsd; GSettings *settings_http; -@@ -1359,6 +1361,9 @@ gsd_updates_manager_start (GsdUpdatesManager *manager, +@@ -1358,6 +1360,9 @@ gsd_updates_manager_start (GsdUpdatesManager *manager, g_signal_connect (manager->priv->refresh, "get-updates", G_CALLBACK (due_get_updates_cb), manager); @@ -65,7 +65,7 @@ index 90ea246..d79455c 100644 /* get http settings */ manager->priv->settings_http = g_settings_new ("org.gnome.system.proxy.http"); g_signal_connect (manager->priv->settings_http, "changed", -@@ -1464,6 +1469,10 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager) +@@ -1463,6 +1468,10 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager) g_object_unref (manager->priv->firmware); manager->priv->firmware = NULL; } @@ -78,7 +78,7 @@ index 90ea246..d79455c 100644 manager->priv->proxy_session = NULL; diff --git a/plugins/updates/gsd-updates-watch.c b/plugins/updates/gsd-updates-watch.c new file mode 100644 -index 0000000..892acad +index 0000000..37d8778 --- /dev/null +++ b/plugins/updates/gsd-updates-watch.c @@ -0,0 +1,179 @@ @@ -125,13 +125,13 @@ index 0000000..892acad +static void +gsd_updates_watch_message_cb (PkMessage *item, GsdUpdatesWatch *watch) +{ -+ NotifyNotification *notification; ++ NotifyNotification *notification; + gchar *details = NULL; + const gchar *title, *message; + GError *error = NULL; + + g_return_if_fail (PK_IS_MESSAGE (item)); -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); + + g_object_get (item, "details", &details, NULL); + title = _("More information"); @@ -148,15 +148,15 @@ index 0000000..892acad + } + + /* display a notification */ -+ notification = notify_notification_new (title, message, NULL); ++ notification = notify_notification_new (title, message, NULL); + notify_notification_set_app_name (notification, _("Software Updates")); -+ notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); -+ notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL); ++ notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); ++ notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL); + -+ if (!notify_notification_show (notification, &error)) { -+ g_warning ("error: %s", error->message); -+ g_error_free (error); -+ } ++ if (!notify_notification_show (notification, &error)) { ++ g_warning ("error: %s", error->message); ++ g_error_free (error); ++ } + + g_free (details); +} @@ -170,9 +170,9 @@ index 0000000..892acad + GPtrArray *array; + GError *error = NULL; + -+ g_return_if_fail (PK_IS_CLIENT (client)); ++ g_return_if_fail (PK_IS_CLIENT (client)); + g_return_if_fail (G_IS_ASYNC_RESULT (res)); -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); + + results = pk_client_generic_finish (client, res, &error); + if (results == NULL) { @@ -206,9 +206,9 @@ index 0000000..892acad +static void +gsd_updates_watch_tlist_added_cb (PkTransactionList *tlist, const gchar *tid, GsdUpdatesWatch *watch) +{ -+ g_return_if_fail (PK_IS_TRANSACTION_LIST (tlist)); -+ g_return_if_fail (tid != NULL); -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); ++ g_return_if_fail (PK_IS_TRANSACTION_LIST (tlist)); ++ g_return_if_fail (tid != NULL); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); + + /* listen for messages */ + pk_client_adopt_async (watch->priv->client, tid, NULL, NULL, NULL, @@ -218,9 +218,9 @@ index 0000000..892acad +static void +gsd_updates_watch_init (GsdUpdatesWatch *watch) +{ -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); + -+ watch->priv = GSD_UPDATES_WATCH_GET_PRIVATE (watch); ++ watch->priv = GSD_UPDATES_WATCH_GET_PRIVATE (watch); + watch->priv->tlist = pk_transaction_list_new (); + watch->priv->client = pk_client_new (); + @@ -231,12 +231,12 @@ index 0000000..892acad +static void +gsd_updates_watch_finalize (GObject *object) +{ -+ GsdUpdatesWatch *watch; ++ GsdUpdatesWatch *watch; + -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (object)); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (object)); + -+ watch = GSD_UPDATES_WATCH (object); -+ g_return_if_fail (watch->priv != NULL); ++ watch = GSD_UPDATES_WATCH (object); ++ g_return_if_fail (watch->priv != NULL); + + if (watch->priv->tlist != NULL) { + g_object_unref (watch->priv->tlist); @@ -245,21 +245,21 @@ index 0000000..892acad + g_object_unref (watch->priv->client); + } + -+ G_OBJECT_CLASS (gsd_updates_watch_parent_class)->finalize (object); ++ G_OBJECT_CLASS (gsd_updates_watch_parent_class)->finalize (object); +} + +GsdUpdatesWatch * +gsd_updates_watch_new (void) +{ -+ return GSD_UPDATES_WATCH (g_object_new (GSD_TYPE_UPDATES_WATCH, NULL)); ++ return GSD_UPDATES_WATCH (g_object_new (GSD_TYPE_UPDATES_WATCH, NULL)); +} + +static void +gsd_updates_watch_class_init (GsdUpdatesWatchClass *klass) +{ -+ GObjectClass *object_class = G_OBJECT_CLASS (klass); -+ object_class->finalize = gsd_updates_watch_finalize; -+ g_type_class_add_private (klass, sizeof (GsdUpdatesWatchPrivate)); ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ object_class->finalize = gsd_updates_watch_finalize; ++ g_type_class_add_private (klass, sizeof (GsdUpdatesWatchPrivate)); +} diff --git a/plugins/updates/gsd-updates-watch.h b/plugins/updates/gsd-updates-watch.h new file mode 100644 diff --git a/community/gnome-settings-daemon-updates/systemd-fallback.patch b/community/gnome-settings-daemon-updates/systemd-fallback.patch new file mode 100644 index 000000000..ffe953c63 --- /dev/null +++ b/community/gnome-settings-daemon-updates/systemd-fallback.patch @@ -0,0 +1,154 @@ +commit b9ded09387f0b99ece97baee18595eb9e86a5b9b +Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +Date: Mon Mar 12 01:52:54 2012 +0100 + + Fallback to CK if systemd is not available + + Be nice to distributions where systemd is optional. This will select + the code path at runtime depending on whether the system was booted + using systemd. + +diff --git a/configure.ac b/configure.ac +index 3b4789f..d522852 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd], + [with_systemd=$enableval], + [with_systemd=no]) + if test "$with_systemd" = "yes" ; then +- PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login]) ++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login]) + AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking]) + SESSION_TRACKING=systemd + else +diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c +index 5786300..83fe21e 100644 +--- a/gnome-settings-daemon/gnome-settings-session.c ++++ b/gnome-settings-daemon/gnome-settings-session.c +@@ -30,6 +30,7 @@ + #include "gnome-settings-session.h" + + #ifdef HAVE_SYSTEMD ++#include <systemd/sd-daemon.h> + #include <systemd/sd-login.h> + + typedef struct +@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate + { + #ifdef HAVE_SYSTEMD + GSource *sd_source; +-#else ++#endif + GDBusProxy *proxy_session; + GCancellable *cancellable; +-#endif + gchar *session_id; + GnomeSettingsSessionState state; + }; +@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data) + return TRUE; + } + +-#else /* HAVE_SYSTEMD */ ++#endif /* HAVE_SYSTEMD */ + + static void + gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy, +@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d + g_object_unref (proxy_manager); + } + +-#endif /* HAVE_SYSTEMD */ +- + static void + gnome_settings_session_init (GnomeSettingsSession *session) + { + session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session); + + #ifdef HAVE_SYSTEMD +- sd_pid_get_session (getpid(), &session->priv->session_id); ++ session->priv->sd_source = NULL; ++ ++ if (sd_booted () > 0) { ++ sd_pid_get_session (getpid(), &session->priv->session_id); + +- session->priv->sd_source = sd_source_new (); +- g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); +- g_source_attach (session->priv->sd_source, NULL); ++ session->priv->sd_source = sd_source_new (); ++ g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); ++ g_source_attach (session->priv->sd_source, NULL); + +- sessions_changed (session); +-#else ++ sessions_changed (session); ++ return; ++ } ++#endif + session->priv->cancellable = g_cancellable_new (); + + /* connect to ConsoleKit */ +@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session) + session->priv->cancellable, + got_manager_proxy_cb, + session); +-#endif + } + + static void +@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object) + if (session->priv->sd_source != NULL) { + g_source_destroy (session->priv->sd_source); + g_source_unref (session->priv->sd_source); ++ goto out; + } +-#else ++#endif ++ + g_cancellable_cancel (session->priv->cancellable); + + if (session->priv->proxy_session != NULL) + g_object_unref (session->priv->proxy_session); + g_object_unref (session->priv->cancellable); +-#endif + ++out: + G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object); + } + +diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c +index 8db04e5..9883d76 100644 +--- a/plugins/power/gsd-power-manager.c ++++ b/plugins/power/gsd-power-manager.c +@@ -2031,7 +2031,7 @@ systemd_stop (void) + g_object_unref (bus); + } + +-#else ++#endif + + static void + consolekit_stop_cb (GObject *source_object, +@@ -2081,7 +2081,6 @@ consolekit_stop (void) + consolekit_stop_cb, NULL); + g_object_unref (proxy); + } +-#endif + + static void + upower_sleep_cb (GObject *source_object, +@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager, + * hibernate is not available and is marginally better + * than just powering down the computer mid-write */ + #ifdef HAVE_SYSTEMD +- systemd_stop (); +-#else +- consolekit_stop (); ++ if (sd_booted () > 0) ++ systemd_stop (); ++ else + #endif ++ consolekit_stop (); + break; + case GSD_POWER_ACTION_BLANK: + ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD index b245f93cc..f553e04e7 100644 --- a/community/gnote/PKGBUILD +++ b/community/gnote/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64329 2012-02-11 23:21:43Z allan $ +# $Id: PKGBUILD 69794 2012-04-23 09:41:58Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: uastasi <uastasi@archlinux.us> pkgname=gnote -pkgver=0.8.2 -pkgrel=2 +pkgver=0.8.3 +pkgrel=1 pkgdesc="A note taking application." arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Gnote" @@ -13,10 +13,10 @@ makedepends=('intltool' 'gnome-doc-utils' 'boost') options=('!libtool') install=gnote.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.8/$pkgname-$pkgver.tar.xz) -sha256sums=('7d42b16d6d6751c88f029aff78db7ed1560f2cb727e6cb3f3ef09711e2381992') +sha256sums=('41308f957b9cb6f885adb61a607b93ec969be069676e7d518c007ecf35f474ab') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -28,6 +28,6 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index 4a2a82d58..b2afaf904 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 64331 2012-02-11 23:21:51Z allan $ +# $Id: PKGBUILD 69832 2012-04-24 11:08:37Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> pkgname=gource -pkgver=0.37 -pkgrel=2 +pkgver=0.38 +pkgrel=1 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64 'mips64el') url=http://code.google.com/p/gource/ -depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew') +depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew' 'boost-libs') +makedepends=('boost' 'glm') source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('9c023429a8a495e6473d4c166788278a') +md5sums=('6584241879dbb6dfaecc6ae6b58ad38c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gpicview/PKGBUILD b/community/gpicview/PKGBUILD index f1bc12e0c..6d5200832 100644 --- a/community/gpicview/PKGBUILD +++ b/community/gpicview/PKGBUILD @@ -1,19 +1,22 @@ -# $Id: PKGBUILD 52590 2011-07-26 09:08:13Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 69882 2012-04-25 13:40:48Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + pkgname=gpicview -pkgver=0.2.2 -pkgrel=1.1 -pkgdesc="Picture viewer of the LXDE Desktop" +pkgver=0.2.3 +pkgrel=1 +pkgdesc="lightweight image viewer" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://lxde.org/" groups=('lxde') -depends=('gtk2') +depends=('gtk2' 'desktop-file-utils') +install=$pkgname.install makedepends=('pkgconfig' 'intltool') optdepends=('librsvg: For SVG support') -source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) -md5sums=('943da9f4a23541accd5acdd4fb69966f') +source=(http://ftp.de.debian.org/debian/pool/main/g/$pkgname/${pkgname}_${pkgver}.orig.tar.xz) +md5sums=('0f1275b5b0ca66e48963a7ccda8a5019') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gpicview/gpicview.install b/community/gpicview/gpicview.install new file mode 100644 index 000000000..bc3abcd40 --- /dev/null +++ b/community/gpicview/gpicview.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/gtk-engine-unico/PKGBUILD b/community/gtk-engine-unico/PKGBUILD index aea29b9f9..3fd503843 100644 --- a/community/gtk-engine-unico/PKGBUILD +++ b/community/gtk-engine-unico/PKGBUILD @@ -1,17 +1,18 @@ -# Maintainer: Bartlomiej Piotrowski +# $Id: PKGBUILD 69736 2012-04-23 09:07:35Z ibiru $ +# Maintainer: Bartlomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Hilinus <itahilinus[at]hotmail[dot]it> pkgname=gtk-engine-unico -pkgver=1.0.1 -pkgrel=2 +pkgver=1.0.2 +pkgrel=1 pkgdesc="Unico GTK3 theme engine" arch=('i686' 'x86_64') url="https://launchpad.net/unico" license=('GPL') depends=("gtk3") -source=("http://launchpad.net/unico/1.0/$pkgver/+download/${pkgname#gtk-engine-}-$pkgver.tar.gz") -md5sums=('1e56ff86337120dcf1b04dd443ea4b71') options=(!libtool) +source=("http://launchpad.net/unico/1.0/$pkgver/+download/${pkgname#gtk-engine-}-$pkgver.tar.gz") +md5sums=('19fb3ecc36d4d13b4a76e26a4ebd6412') build() { diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD index 6b3aed518..5b612932f 100644 --- a/community/gtranslator/PKGBUILD +++ b/community/gtranslator/PKGBUILD @@ -1,25 +1,24 @@ -# $Id: PKGBUILD 68181 2012-03-18 21:14:51Z jlichtblau $ +# $Id: PKGBUILD 69738 2012-04-23 09:07:48Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Christer Solskogen (solskogen@carebears.mine.nu) pkgname=gtranslator -pkgver=2.90.8 -pkgrel=1 +pkgver=2.91.3 +pkgrel=2 pkgdesc="An enhanced gettext po file editor for the GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://projects.gnome.org/gtranslator/" license=('GPL') -depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell' 'iso-codes' 'libgda' 'libpeas' 'libunique' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf') -makedepends=('intltool' 'gnome-doc-utils' 'gnome-utils' 'gucharmap' 'json-glib') -optdepends=('gtkspell: spell check' - 'gucharmap: for charmap plugin' +depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell3' 'iso-codes' 'libgda' 'libpeas' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf') +makedepends=('intltool' 'gnome-doc-utils' 'gucharmap' 'json-glib') +optdepends=('gucharmap: for charmap plugin' 'json-glib: for open-tran plugin') options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog -source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.90/$pkgname-$pkgver.tar.xz) -sha256sums=('89f6be55d901d62e09065ed92f471eb569834eaa7babc8a48b2255c26a105037') +source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz) +sha256sums=('0e398cf7909d1fbaf9db66e20913553b38d1af7cad097f5bc8cc229d9ffbc594') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog index 301bec578..c9b484e39 100644 --- a/community/gtranslator/gtranslator.changelog +++ b/community/gtranslator/gtranslator.changelog @@ -1,3 +1,16 @@ +2012-04-23 Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + * gtranslator 2.91.3-2 + rebuild for gdl 3.4.2 + +2012-04-21 Balló György <ballogyor+arch at gmail dot com> + * gtranslator 2.91.3-1 + +2012-04-09 Balló György <ballogyor+arch at gmail dot com> + * gtranslator 2.91.2-1 + replace gtkspell dependency with gtkspell3 + remove unused libunique dependency + remove broken dictionary plugin + 2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * gtranslator 2.90.8-1 diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD new file mode 100644 index 000000000..739432875 --- /dev/null +++ b/community/gwibber/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 69796 2012-04-23 09:42:07Z ibiru $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=gwibber +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Microblogging client for GNOME, which supports Twitter, Identi.ca, StatusNet, Facebook, Flickr, Digg, FriendFeed and Qaiku" +arch=('i686' 'x86_64') +url="http://gwibber.com/" +license=('GPL') +depends=('libgee' 'libnotify' 'dee>=1.0.0' 'json-glib' 'gtkspell3' 'python2-gobject' 'libwnck3' 'libwebkit3' 'libgnome-keyring>=3.3' 'dbus-python' 'python2-httplib2' 'python-egenix-mx-base' 'python2-oauth' 'python-imaging' 'pyxdg' 'dconf' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('intltool' 'vala>=0.15.0') +options=('!libtool') +install=$pkgname.install +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz + lp_959068.patch) +md5sums=('cec2c692d870f7aa7fb6a7cb556617ad' + 'c15dd5289f36270f980036ead71b6c20') + +build() { + cd "$srcdir/$pkgname-$pkgver" + find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + patch -Np1 -i "$srcdir/lp_959068.patch" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-compile --disable-unity + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/community/gwibber/gwibber.install b/community/gwibber/gwibber.install new file mode 100644 index 000000000..d973d53f7 --- /dev/null +++ b/community/gwibber/gwibber.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/gwibber/lp_959068.patch b/community/gwibber/lp_959068.patch new file mode 100644 index 000000000..66b288ba7 --- /dev/null +++ b/community/gwibber/lp_959068.patch @@ -0,0 +1,27 @@ +=== modified file 'libgwibber/streams.vala' +--- old/libgwibber/streams.vala 2012-03-19 13:35:30 +0000 ++++ new/libgwibber/streams.vala 2012-04-04 20:53:49 +0000 +@@ -213,13 +213,21 @@ + model = create_model (); + } + model.row_removed.connect((_m, _i) => { ++ var to_remove = new GLib.List <string> (); + foreach (var v in seen.entries) + { + if (v.value == _i) + { +- seen.unset(v.key); ++ /* defer calling unset until after we are done iterating ++ * the HashMap, it will resize making the iterator invalid ++ * This is fixed in the 0.7 series of libgee ++ * https://bugzilla.gnome.org/show_bug.cgi?id=671327 ++ */ ++ to_remove.prepend (v.key); + } + } ++ foreach (var v in to_remove) ++ seen.unset(v); + }); + Idle.add(() => { + refresh_model_async.begin (); + diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD index a7355073f..dcc84c1d8 100644 --- a/community/ibus-qt/PKGBUILD +++ b/community/ibus-qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66611 2012-02-26 14:33:07Z lfleischer $ +# $Id: PKGBUILD 69758 2012-04-23 09:15:08Z ibiru $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: garion < garion @ mailoo.org > # Contributor: leemars pkgname=ibus-qt pkgver=1.3.1 -pkgrel=4 +pkgrel=5 pkgdesc='IBus qt library and IBus qt input method plugin' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/community/kpartsplugin/PKGBUILD b/community/kpartsplugin/PKGBUILD index c0494e486..13f9135c8 100644 --- a/community/kpartsplugin/PKGBUILD +++ b/community/kpartsplugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60774 2011-12-17 17:24:00Z tredaelli $ +# $Id: PKGBUILD 69899 2012-04-25 21:22:15Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: birdflesh <antkoul at gmail dot com> # Contributor: Frikilinux <frikilinux at frikilinux.com.ar> pkgname=kpartsplugin -pkgver=20110823 -pkgrel=2 +pkgver=20120422 +pkgrel=1 pkgdesc="This plugin uses KDE's KParts to embed file viewers into non-KDE browsers" arch=('i686' 'x86_64') url="http://www.unix-ag.uni-kl.de/~fischer/kpartsplugin/" @@ -12,7 +12,7 @@ license=('GPL3' 'BSD') depends=('kdelibs') makedepends=('automoc4' 'cmake') source=("${url}${pkgname}-${pkgver}.tar.bz2" "LICENSE") -md5sums=('d134198ff2f05ba414719920030ea71b' +md5sums=('6f1126a5f9a84374b14d99086a935026' 'c4cc811349e40e9f34e77e27b902ad96') build(){ diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD index 3bb9cbc28..8f607b960 100755 --- a/community/libfbclient/PKGBUILD +++ b/community/libfbclient/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ +# $Id: PKGBUILD 69760 2012-04-23 09:15:22Z ibiru $ # Maintainer: Carlier Laurent <lordheavym@gmail.com> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgname=libfbclient pkgver=2.5.1.26351 -pkgrel=1 +pkgrel=2 pkgdesc="Client library for Firebird." arch=('i686' 'x86_64' 'mips64el') url="http://www.firebirdsql.org/" diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD index 4ea8e9eaa..20ca74847 100644 --- a/community/libgexiv2/PKGBUILD +++ b/community/libgexiv2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 67538 2012-03-13 11:15:40Z lcarlier $ +# $Id: PKGBUILD 69740 2012-04-23 09:07:53Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libgexiv2 -pkgver=0.3.1 +pkgver=0.4.1 pkgrel=2 pkgdesc="GObject-based wrapper around the Exiv2 library." arch=('i686' 'x86_64' 'mips64el') -url="http://trac.yorba.org/wiki/gexiv2" +url="http://redmine.yorba.org/projects/gexiv2" license=('GPL2') depends=('exiv2' 'glib2') options=('!libtool') source=(http://yorba.org/download/gexiv2/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('828894bb4bcb4625820b8c0c468417e9cd8c5c2f') +sha1sums=('b74cd19a4cf4a4a32a938ecb267974c29e630dc2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD index e890567e6..a945f315b 100644 --- a/community/lxpanel/PKGBUILD +++ b/community/lxpanel/PKGBUILD @@ -1,27 +1,26 @@ -# $Id: PKGBUILD 61193 2011-12-24 11:33:27Z bpiotrowski $ +# $Id: PKGBUILD 69844 2012-04-24 15:37:58Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxpanel -pkgver=0.5.8 -pkgrel=2 +pkgver=0.5.9 +pkgrel=1 pkgdesc="Panel of the LXDE Desktop" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://lxde.org/" groups=('lxde') -depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data') -source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz - battery.patch) -optdepends=(pcmanfm) +depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data' 'libwnck') +makedepends=('wireless_tools') +optdepends=('wireless_tools: netstat plugin') +source=(http://ftp.de.debian.org/debian/pool/main/l/$pkgname/${pkgname}_${pkgver}.orig.tar.xz) +md5sums=('c0b5864ea53113f4b1d4b8a46e9fb8ee') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/battery.patch" - - ./configure --sysconfdir=/etc --prefix=/usr + CFLAGS+=" -lgmodule-2.0" ./configure --sysconfdir=/etc --prefix=/usr make } @@ -29,7 +28,3 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('129fae75d1cd3983fd94542c573a70a1' - '5fadb4d5aca09c81138677e91f995d98') -md5sums=('129fae75d1cd3983fd94542c573a70a1' - '5fadb4d5aca09c81138677e91f995d98') diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index a558800ba..8542d8063 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 67899 2012-03-15 23:14:31Z ebelanger $ +# $Id: PKGBUILD 69762 2012-04-23 09:15:36Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=0.7.1 -pkgrel=15 -pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps." +pkgrel=16 +pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" arch=('i686' 'x86_64' 'mips64el') url="http://mapnik.org/" license=('LGPL') @@ -24,13 +24,15 @@ optdepends=('libxslt: Web Map Service' 'mod_wsgi: Web Map Service' ) makedepends=('scons' 'boost') # already in core ('pkg-config') -conflicts=('mapnik-svn') install="mapnik.install" -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8f65fda2a792518d6f6be8a85f62fc73') +source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'gcc47.patch') +md5sums=('8f65fda2a792518d6f6be8a85f62fc73' + 'ce7933dc20de7e07427a6a6b5d4fd002') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i "${srcdir}"/gcc47.patch #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64 sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct @@ -43,6 +45,7 @@ build() { DESTDIR="$pkgdir" scons } + package(){ cd "$srcdir/$pkgname-$pkgver" scons install diff --git a/community/mapnik/gcc47.patch b/community/mapnik/gcc47.patch new file mode 100644 index 000000000..0532e0c21 --- /dev/null +++ b/community/mapnik/gcc47.patch @@ -0,0 +1,11 @@ +--- mapnik-0.7.1/include/mapnik/factory.hpp~ 2010-03-22 16:40:04.000000000 +0000 ++++ mapnik-0.7.1/include/mapnik/factory.hpp 2012-04-05 15:55:13.460191219 +0000 +@@ -84,7 +84,7 @@ + { + return (pos->second)(file); + } +- return on_unknown_type(key); ++ return this->on_unknown_type(key); + } + }; + } diff --git a/community/midori/0001-Fix-libsoup-version-check-defines.patch b/community/midori/0001-Fix-libsoup-version-check-defines.patch new file mode 100644 index 000000000..2debc92fe --- /dev/null +++ b/community/midori/0001-Fix-libsoup-version-check-defines.patch @@ -0,0 +1,28 @@ +From c7c172f7ffc9316be5954c920654e1deb9f470b7 Mon Sep 17 00:00:00 2001 +From: Christian Dywan <christian@twotoasts.de> +Date: Mon, 16 Apr 2012 17:17:23 +0000 +Subject: Fix libsoup version check #defines + +Fixes: https://bugs.launchpad.net/midori/+bug/983137 +--- +diff --git a/wscript b/wscript +index db74324..c7a0c87 100644 +--- a/wscript ++++ b/wscript +@@ -260,11 +260,11 @@ def configure (conf): + check_pkg ('libsoup-2.4', '2.27.90') + conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4')) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 3): +- conf.define ('LIBSOUP_2_29_3', 1) ++ conf.define ('HAVE_LIBSOUP_2_29_3', 1) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91): +- conf.define ('LIBSOUP_2_29_91', 1) ++ conf.define ('HAVE_LIBSOUP_2_29_91', 1) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1): +- conf.define ('LIBSOUP_2_37_1', 1) ++ conf.define ('HAVE_LIBSOUP_2_37_1', 1) + check_pkg ('libxml-2.0', '2.6') + check_pkg ('sqlite3', '3.0', True, var='SQLITE') + +-- +cgit v0.9.0.3 diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index 22da899e8..8e1242d7b 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,40 +1,52 @@ -# $Id: PKGBUILD 69383 2012-04-15 05:22:45Z bpiotrowski $ +# $Id: PKGBUILD 69842 2012-04-24 15:19:18Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> +# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> pkgname=midori pkgver=0.4.5 -pkgrel=1 -pkgdesc="A lightweight web browser based on Gtk WebKit" -arch=('i686' 'x86_64') +pkgrel=2 +pkgdesc="Lightweight web browser based on Gtk WebKit" +arch=('x86_64' 'i686') url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" license=('LGPL2.1') install=midori.install depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss') makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' optdepends=('vala: for use in extensions') -source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -md5sums=('14288197a1e2251b7c0803e1448daa0e') +options=('!emptydirs') +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 + 0001-Fix-libsoup-version-check-defines.patch) +sha256sums=('7b57cf3ebb56eef586351f2ae9f71ec9683aedff0b79a071b70b811d9876ff84' + '0095c23247c62b6a4b3ab4312f68b49e2d0974ce3fd701a2ce0114817c7bd399') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" # python2 export PYTHON=/usr/bin/python2 sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf - ./configure --prefix=/usr --jobs=${MAKEFLAGS/-j/} \ - --enable-addons \ - --disable-hildon \ - --enable-unique \ - --enable-nls \ - --enable-docs \ - --enable-apidocs + # FS#29468 + patch -Np1 -i "$srcdir"/0001-Fix-libsoup-version-check-defines.patch + + ./configure \ + --prefix=/usr \ + --jobs=${MAKEFLAGS/-j/} \ + --enable-addons \ + --disable-hildon \ + --enable-unique \ + --enable-nls \ + --enable-docs \ + --enable-apidocs make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index b1d8186fb..824fdd478 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -3,18 +3,18 @@ # Contributor: Bartek Piotrowski <barthalion@gmail.com> pkgname=mplayer2 -_commit=3a39fc1 -pkgver="2.0.20111114+g${_commit}" -_snapshot="${pkgname}-${_commit}" -pkgrel=1 -pkgdesc="A movie player" +pkgver=20120414 +pkgrel=4 +pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.mplayer2.org/" -depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2' - 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' - 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa') -makedepends=('mesa' 'unzip' 'yasm' 'git') +install=$pkgname.install +depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig' + 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss' + 'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libtheora' 'libvdpau' + 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') +makedepends=('mesa' 'unzip' 'yasm') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index ac9609371..a7687df62 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 67364 2012-03-10 11:47:55Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 69884 2012-04-25 14:08:08Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Pierre-Paul Paquin <pierrepaulpaquin@gmail.com> # Contributor: xduugu (.desktop and install files) pkgname=mupdf -pkgver=0.9 -pkgrel=2 +pkgver=1.0 +pkgrel=1 pkgdesc="lightweight PDF viewer and toolkit written in portable C" arch=('i686' 'x86_64' 'mips64el') url="http://mupdf.com" @@ -15,38 +15,25 @@ license=('GPL3') depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext' 'desktop-file-utils') install=mupdf.install source=("http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz") -md5sums=('76640ee16a797a27fe49cc0eaa87ce3a') +md5sums=('d986ab98e2b035b7abd61afc474562b3') build() { CFLAGS+=" -fPIC" CXXFLAGS+=" -fPIC" - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir"/$pkgname-$pkgver-source make build=release prefix="$pkgdir/usr" } package() { - # Install - cd "$srcdir/$pkgname-$pkgver" - make build=release prefix="${pkgdir}/usr" install + cd "$srcdir"/$pkgname-$pkgver-source + make build=release prefix="$pkgdir/usr" install - # Rename executables - msg "Renaming executables" - cd "${pkgdir}/usr/bin" - for i in pdf*; do - mv "$i" "$i-mupdf"; - done + sed -i 's/mupdf.xpm/mupdf/' debian/mupdf.desktop + sed -i 's/application\/x-pdf/application\/x-pdf/' debian/mupdf.desktop - # Fix mupdf.desktop - cd "$srcdir/$pkgname-$pkgver" - sed -i "s/mupdf.xpm/mupdf/" debian/mupdf.desktop - sed -i "s/application\/x-pdf/application\/x-pdf/" debian/mupdf.desktop + install -Dm644 debian/mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop + install -Dm644 debian/mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm - # Install other stuff - cd "$srcdir/$pkgname-$pkgver/debian" - install -Dm644 mupdf.desktop "$pkgdir/usr/share/applications/mupdf.desktop" - install -Dm644 mupdf.xpm "$pkgdir/usr/share/pixmaps/mupdf.xpm" - - # Fix permissions - chmod 644 $pkgdir/usr/lib/{libmuxps.a,libfitz.a,libmupdf.a} + chmod 644 "$pkgdir"/usr/lib/libfitz.a } diff --git a/community/mupdf/mupdf.install b/community/mupdf/mupdf.install index 7f12704ae..b4632d36d 100644 --- a/community/mupdf/mupdf.install +++ b/community/mupdf/mupdf.install @@ -1,5 +1,4 @@ post_install() { - [ -x /usr/bin/update-desktop-database ] || return 0 update-desktop-database -q } diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index cb798bf21..1bcf9cf0a 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69550 2012-04-18 07:41:47Z arodseth $ +# $Id: PKGBUILD 69742 2012-04-23 09:08:05Z ibiru $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: jordz <jordz@archlinux.us> pkgname=nemiver pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="C/C++ debugger for GNOME" arch=('x86_64' 'i686') license=('GPL') diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 307397266..552811bc8 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69421 2012-04-16 09:40:51Z spupykin $ +# $Id: PKGBUILD 69838 2012-04-24 14:09:55Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -12,8 +12,8 @@ _user=http _group=http pkgname=nginx -pkgver=1.0.15 -pkgrel=1 +pkgver=1.2.0 +pkgrel=2 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl') @@ -34,7 +34,7 @@ backup=("etc/nginx/conf/fastcgi.conf" "etc/conf.d/nginx") source=("http://nginx.org/download/nginx-$pkgver.tar.gz" 'nginx') -md5sums=('17da4802209b83d9bebb0f0edd975dfc' +md5sums=('a02ef93d65a7031a1ea3256ad5eba626' '0e8032d3ba26c3276e8c7c30588d375f') build() { @@ -59,7 +59,9 @@ build() { --add-module=/usr/lib/passenger/ext/nginx \ --conf-path=${_conf_path}/nginx.conf \ --http-scgi-temp-path=${_tmp_path} \ - --http-uwsgi-temp-path=${_tmp_path} + --http-uwsgi-temp-path=${_tmp_path} \ + --with-pcre-jit \ + --with-http_realip_module #--with-http_mp4_module \ #--with-http_realip_module \ #--with-http_addition_module \ diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index aa4c06173..b51bf7aab 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 68082 2012-03-17 18:55:06Z spupykin $ +# $Id: PKGBUILD 69764 2012-04-23 09:16:01Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools pkgver=2012.03.13 _pkgsubver=651368 -pkgrel=1 -pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." -arch=('i686' 'x86_64' 'mips64el') +pkgrel=2 +pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" +arch=('i686' 'x86_64') url="http://open-vm-tools.sourceforge.net/" license=('LGPL') -depends=('open-vm-tools-modules' 'libdnet' 'icu' 'procps' 'glib2' 'uriparser' 'libsigc++' 'libxss') +depends=('open-vm-tools-modules' 'libdnet' 'icu' 'procps' 'uriparser' 'libsigc++' 'libxss') makedepends=('chrpath' 'doxygen' 'gtkmm' 'fuse' 'libxtst') optdepends=('gtkmm' 'libnotify' 'libxtst' 'fuse' 'libsm') options=('docs' '!libtool') install=$pkgname.install -source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}.tar.gz +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}.tar.gz scripts-network.patch scripts-network-FS19541.patch open-vm-tools-X11Bool.patch @@ -36,9 +36,7 @@ md5sums=('a664206443d5de53f5f8ee8d5fe6c2d7' build() { cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" - [ $NOEXTRACT -eq 1 ] || { - sed -i 's#CFLAGS="$CFLAGS -Werror"##' configure configure.ac - } + [ -f Makefile ] || ./configure --prefix=/usr --without-kernel-modules make } diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index e4b09ffb7..884a5e45c 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 68318 2012-03-21 13:43:42Z lcarlier $ +# $Id: PKGBUILD 69766 2012-04-23 09:16:08Z ibiru $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=openttd -pkgver=1.2.0rc3 -_realpkgver=1.2.0-RC3 +pkgver=1.2.0 pkgrel=1 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +12,11 @@ depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo2' 'hicolor-icon-theme' 'desktop- install=openttd.install optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') -source=("http://binaries.openttd.org/releases/${_realpkgver}/${pkgname}-${_realpkgver}-source.tar.xz") -md5sums=('c1ac9bbe6ec4e71a5938280e4cc9741f') +source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") +md5sums=('7f5181fdd5119336ccbe08f47eab78c1') build() { - cd ${pkgname}-${_realpkgver} + cd ${pkgname}-${pkgver} ./configure \ --prefix-dir=/usr \ @@ -33,7 +32,7 @@ build() { } package() { - cd ${pkgname}-${_realpkgver} + cd ${pkgname}-${pkgver} make install } diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index b6a2e92e3..909f7daf3 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 67927 2012-03-16 10:14:41Z spupykin $ +# $Id: PKGBUILD 69768 2012-04-23 09:16:14Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=4.1.0 +pkgver=4.2.0 #_rel=stable _rel=devel -pkgrel=2 +pkgrel=1 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" arch=('x86_64' 'i686' 'mips64el') url="http://www.parrotcode.org/" license=('GPL') -depends=('gmp' 'gdbm' 'readline' 'icu' 'openssl' 'libffi') +depends=('icu' 'openssl' 'libffi') makedepends=('perl-json') optdepends=('freeglut') -options=(!emptydirs !makeflags) -source=("ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/parrot-$pkgver.tar.gz") -md5sums=('23c37c82aeac2d5bf9fd00a7873dab0d') +options=(!makeflags) +source=("ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.gz") +sha256sums=('69ee93d9f81babcff67b747cc614358958a32f274e407b65771ca5a056d4c3d4') build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,29 +24,26 @@ build() { sed -i 's#auto::sha1##' lib/Parrot/Configure/Step/List.pm sed -i 's#auto::git_describe##' lib/Parrot/Configure/Step/List.pm - [ $NOEXTRACT -eq 1 ] || perl Configure.pl --prefix=/usr --parrot_is_shared + perl Configure.pl --prefix=/usr \ + --parrot_is_shared \ + --disable-rpath find -type f -name Makefile | while read F; do grep "$srcdir" $F && sed -i \ - "s#-Wl,-rpath=$srcdir/parrot-$pkgver/blib/lib##" $F || true + "s#-Wl,-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F grep "$srcdir" $F && sed -i \ - "s#-rpath=$srcdir/parrot-$pkgver/blib/lib##" $F || true + "s#-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F done + + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(pwd)/blib/lib" + make all parrot_utils docs html } package() { cd "$srcdir/$pkgname-$pkgver" - OLD_LIB_PATH=$LD_LIBRARY_PATH - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$srcdir/parrot-$pkgver/blib/lib - make -j1 all parrot_utils docs html RPATH_BLIB= - - export LD_LIBRARY_PATH=`pwd`/blib/lib - make -j1 DESTDIR="$pkgdir" install-dev + make DESTDIR="$pkgdir" install-dev - sed -i "s#$srcdir#/usr/src#" $pkgdir/usr/lib/parrot/$pkgver/tools/lib/Parrot/Config/Generated.pm - - export LD_LIBRARY_PATH=$OLD_LIB_PATH + sed -i "s#$srcdir#/usr/src#" \ + $pkgdir/usr/lib/parrot/$pkgver/tools/lib/Parrot/Config/Generated.pm } - -# vim:set ts=2 sw=2 et: diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index f1603d01c..8b75abcdd 100644 --- a/community/pigeonhole/PKGBUILD +++ b/community/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.1.4 +_dcpkgver=2.1.5 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.3.0 -pkgrel=5 +pkgrel=6 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" diff --git a/community/pion-net/PKGBUILD b/community/pion-net/PKGBUILD index 222ec87c7..fd362da67 100644 --- a/community/pion-net/PKGBUILD +++ b/community/pion-net/PKGBUILD @@ -1,33 +1,26 @@ -# $Id: PKGBUILD 67204 2012-03-05 08:58:47Z ibiru $ +# $Id: PKGBUILD 69770 2012-04-23 09:16:19Z ibiru $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: David Watzke <david@watzke.cz> pkgname=pion-net -pkgver=4.0.7 -pkgrel=3 +pkgver=4.0.11 +pkgrel=1 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" url="http://www.pion.org/projects/pion-network-library" arch=('i686' 'x86_64') license=('custom:Boost') depends=('boost-libs' 'openssl' 'log4cpp') makedepends=('boost') -source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2" - "$pkgname-4.0.5-build.patch") -md5sums=('761c8af8dc54102b637f8d91d162f987' - 'd75ea2af90163a81d2bc71fda00f0c00') +source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2") +md5sums=('e5cf42a02681c5d73e7be6784d99fece') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/$pkgname-4.0.5-build.patch" - # override configure bug (forces debug even when nobody asked for it) - sed -i "s/ -ggdb//g;s/ -DNDEBUG//g" configure - - ./configure --prefix=/usr --disable-doxygen-doc --with-log4cpp + sed -i "s/ -ggdb//g" configure - find -name Makefile -print0 | xargs -0 \ - sed -i -r '/^C(XX)?FLAGS/ s/$/ -DBOOST_FILESYSTEM_VERSION=2/' Makefile + ./configure --prefix=/usr --disable-doxygen-doc # override Makefile bug sed -i "/docs:/ s/doxygen-doc//" Makefile diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 811e77238..28e00f972 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69168 2012-04-09 22:12:26Z spupykin $ +# $Id: PKGBUILD 69786 2012-04-23 09:37:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.4.10 +pkgver=2.4.11 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') @@ -18,8 +18,8 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('71938de99cbb4fdefd74d7571831fa28' - '9726d06d0a0c60cb5d55a31b3dc1e55d' +md5sums=('ccd193d80196855343840db6110bf58d' + 'f8fb4b00ee3636c7dc7c173e2f6a4e76' '9e2d75b7a9dc421122d673fe520ef17f') build() { diff --git a/community/redis/redis.d b/community/redis/redis.d index 3294963ed..afd001fd5 100644 --- a/community/redis/redis.d +++ b/community/redis/redis.d @@ -12,6 +12,9 @@ PIDFILE=/var/run/redis.pid WORKDIR=/var/lib/redis CONF="/etc/redis.conf" +PID=$(cat $PIDFILE) +[ -d /proc/${PID} ] || rm -f $PIDFILE + case "$1" in start) stat_busy "Starting $daemon_name" diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index 1d50429b8..8c3ed34d6 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68963 2012-04-06 14:50:59Z ttopper $ +# $Id: PKGBUILD 69819 2012-04-23 17:44:21Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=roxterm -pkgver=2.5.3 +pkgver=2.6.2 pkgrel=1 pkgdesc="Tabbed, VTE-based terminal emulator" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm') makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg') install=roxterm.install source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2") -sha1sums=('cd129f98982305f0c0d38228530c449253aa3327') -md5sums=('0fb38dd5ae034345ad6615ad98c4e3aa') +sha1sums=('eca312666a1ff1412df2cddf93a12631c01d1a3a') +md5sums=('5e5dc51b3341855fdb392f736476d89d') build() { diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 0e965efba..8711dda85 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,49 +1,33 @@ -# $Id: PKGBUILD 58472 2011-11-12 22:05:25Z lcarlier $ +# $Id: PKGBUILD 69744 2012-04-23 09:08:15Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.11.6 +pkgver=0.12.2 pkgrel=1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" license=('LGPL2.1') -depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw' - 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf') -makedepends=('intltool') -# 'vala' +depends=('libgee' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw' 'rest' + 'desktop-file-utils' 'dconf' 'hicolor-icon-theme') +makedepends=('intltool' 'vala') install=shotwell.install -source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2" - "http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2" - "fix-with-libraw-0.4.patch") -md5sums=('bbbf2843eb98b6f0ef1dfcfb934e15cf' - 'bf35262cc611de447147d01cbac33767' - '488787b6d2cbc7348bc88348b78b6005') +source=("http://yorba.org/download/shotwell/0.12/shotwell-${pkgver}.tar.bz2") +md5sums=('ce3a3204ca3c1dd451ac43e3b80c28d9') build() { - cd "${srcdir}/vala-0.12.1" - ./configure --prefix=$srcdir/vala --enable-vapigen - make - make install - export PATH=$srcdir/vala/bin:$PATH - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../fix-with-libraw-0.4.patch - ./configure --prefix=/usr \ - --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ - --disable-schemas-install \ + --disable-schemas-compile \ --disable-desktop-update \ --disable-icon-update - make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - rm -f $pkgdir/usr/share/glib-2.0/schemas/gschemas.compiled } diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD index f1c053ce3..afde6eb8a 100644 --- a/community/simple-scan/PKGBUILD +++ b/community/simple-scan/PKGBUILD @@ -2,20 +2,20 @@ # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=simple-scan -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc='Simple scanning utility' arch=('i686' 'x86_64' 'mips64el') url='http://launchpad.net/simple-scan' license=('GPL3') depends=('sane' 'dconf' 'gtk3' 'colord' 'hicolor-icon-theme') -makedepends=('gnome-doc-utils' 'intltool') +makedepends=('yelp-tools' 'intltool') install=simple-scan.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('10fba94b60cd5159d54d3491f228ac9fe83ac0ab02b983d7cd8390aa26cf2ecc') +source=(https://launchpad.net/$pkgname/${pkgver:0:3}/$pkgver/+download/$pkgname-$pkgver.tar.gz) +sha256sums=('e1ed8f90f95300c7b75249d0e6abbc06185db2afd4d44be4b8d98822d25d4ece') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure \ --prefix=/usr \ --disable-schemas-compile @@ -23,6 +23,6 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD index bdb8cbb72..7ddc1d49a 100644 --- a/community/sword/PKGBUILD +++ b/community/sword/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68590 2012-03-28 20:56:27Z arodseth $ +# $Id: PKGBUILD 69772 2012-04-23 09:16:25Z ibiru $ # Maintainer: Alexander Rødseth # Contributor: Andrea Scarpino # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -6,7 +6,7 @@ pkgname=sword pkgver=1.6.2 -pkgrel=8 +pkgrel=7 pkgdesc="Library for Bible study programs" arch=('x86_64' 'i686' 'mips64el') url="http://www.crosswire.org/sword/" @@ -29,8 +29,7 @@ build() { CXXFLAGS=-fpermissive cmake "../$pkgname-$pkgver" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DSWORD_GLOBAL_CONF_DIR=/etc + -DCMAKE_BUILD_TYPE=Release make } diff --git a/community/tasks/PKGBUILD b/community/tasks/PKGBUILD index e843a55bf..d75d7d3bc 100644 --- a/community/tasks/PKGBUILD +++ b/community/tasks/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 61455 2011-12-31 18:09:39Z spupykin $ +# $Id: PKGBUILD 69748 2012-04-23 09:08:34Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: lp76 <l.peduto@gmail.com> pkgname=tasks pkgver=0.20 -pkgrel=1 +pkgrel=2 pkgdesc="A simple to do list application that uses libecal" arch=(i686 x86_64 mips64el) url="http://pimlico-project.org/tasks.html" license=('GPL') -depends=('evolution-data-server>=3.2.0' 'xdg-utils' 'gtk2') +depends=('evolution-data-server>=3.4.0' 'xdg-utils' 'gtk2') makedepends=('intltool') install=tasks.install #source=(http://pimlico-project.org/sources/tasks/$pkgname-$pkgver.tar.gz) diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index b244920cd..84aeb3912 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67575 2012-03-13 12:37:07Z spupykin $ +# $Id: PKGBUILD 69788 2012-04-23 09:37:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=32.0.1 +pkgver=32.0.2 pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('64c439a40743dffbf39b7b4a156d784c' +md5sums=('0d6ff6a4601a4aaaa7f24a05c9228e0e' '377ace3363124f4c086de0babb820761') build() { diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index 0616951eb..a85ea7973 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 64535 2012-02-15 23:50:18Z svenstaro $ +# $Id: PKGBUILD 69896 2012-04-25 19:15:46Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift pkgver=2011.10.22 -pkgrel=4 -pkgdesc="An open source driving simulation made with drift racing in mind" -arch=('i686' 'x86_64' 'mips64el') +pkgrel=6 +pkgdesc="Open source driving simulation made with drift racing in mind" +arch=('i686' 'x86_64') url="http://vdrift.net/" license=('GPL') depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data') @@ -17,7 +17,9 @@ md5sums=('6f8806ab1be303e9e1e47522c9eee890') install=vdrift.install build() { - cd "$srcdir"/$pkgname-${pkgver//./-} + cd "$srcdir" + + cd $pkgname-${pkgver//./-} # select arch if [ `uname -m` = "x86_64" ]; then @@ -56,6 +58,8 @@ package() { "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png install -Dm644 data/textures/icons/vdrift-64x64.png \ "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png + install -Dm644 data/textures/icons/vdrift-64x64.png \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" rm -r $pkgdir/usr/share/vdrift } diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index 0f41f7909..6a291309d 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 68367 2012-03-23 06:59:41Z svenstaro $ +# $Id: PKGBUILD 69897 2012-04-25 19:17:33Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> pkgname=widelands -pkgver=16 -_realver=build16 -pkgrel=6 +pkgver=17 +_realver=build17 +pkgrel=1 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64' 'mips64el') url="http://widelands.org/" license=('GPL') -makedepends=('cmake' 'boost' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2') -source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2 - widelands-0.16-libpng15.patch - 6233_6232.diff +depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2' 'widelands-data') +makedepends=('cmake' 'boost' 'ggz-client-libs') +source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2" $pkgname.desktop $pkgname.png $pkgname.sh) -md5sums=('3d8c28e145b73c64d8ed1625319d25a2' - 'e492620b071cbd1db04280173653a67c' - '9f91bff91a6867cc3ecdea407007d781' +md5sums=('bdc9bc0aa631af1aa7fb450507611a58' '15820bf099fd6f16251fe70a75c534bb' '3dfda7e9ca76ca00dd98d745d0ceb328' '7cae50aba5ed0cd2cfeea79124637b46') @@ -28,8 +25,7 @@ md5sums=('3d8c28e145b73c64d8ed1625319d25a2' build() { cd $srcdir/$pkgname-$_realver-src - patch -Np0 < $srcdir/widelands-0.16-libpng15.patch - patch -Np0 < $srcdir/6233_6232.diff + sed -i "1 i #include <unistd.h>" src/main.cc mkdir -p build/compile && cd build/compile @@ -42,8 +38,6 @@ build() { } package() { - depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2' 'widelands-data>=16') - cd $srcdir/$pkgname-$_realver-src/build/compile make DESTDIR="$pkgdir" install diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD index e81b71cea..ead5b9e68 100644 --- a/community/wings3d/PKGBUILD +++ b/community/wings3d/PKGBUILD @@ -5,15 +5,15 @@ pkgname=wings3d _pkgname=wings pkgver=1.4.1 -pkgrel=5 +pkgrel=6 pkgdesc="3D modeling program" arch=('x86_64' 'i686') url="http://www.wings3d.com/" license=('GPL') depends=('esdl' 'bash' 'desktop-file-utils') makedepends=('setconf' 'gendesk') -optdepends=('povray: rendering support via POV-Ray' - 'kerkythea: rendering support via Kerkythea') +optdepends=('povray: rendering support via POV-Ray') +# 'kerkythea: rendering support via Kerkythea' replaces=('wings' 'wings-devel') install=$pkgname.install source=("http://downloads.sourceforge.net/wings/$_pkgname-$pkgver.tar.bz2" diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD index f084b5547..cdc371a1d 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 66108 2012-02-23 01:07:34Z spupykin $ +# $Id: PKGBUILD 69790 2012-04-23 09:38:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=xboard -pkgver=4.5.2 -pkgrel=4 -pkgdesc="A graphical user interfaces for chess" +pkgver=4.6.2 +pkgrel=1 +pkgdesc="Graphical user interfaces for chess" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/xboard/" license=('GPL3') depends=('libxaw' 'gnuchess' 'texinfo' 'xdg-utils' 'xorg-fonts-75dpi' 'xorg-fonts-100dpi') +makedepends=('gendesk') install=${pkgname}.install -source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz - 'xboard.desktop') -md5sums=('2fa92fceeda344ef935bc97bef5f9fc5' - '1d9d4a7864465a703fe4a215e83f4806') +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('6e6d119fac60d68139d7836426212efb') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}" + gendesk + + cd "${pkgname}-${pkgver}" sed -i 's/fairymax/gnuchess/g' xboard.h xboard.conf.in ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc make @@ -27,7 +29,10 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -Dm644 ${srcdir}/${pkgname}.desktop \ ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -Dm644 ${srcdir}/${pkgname}.png \ + ${pkgdir}/usr/share/pixmaps/${pkgname}.png } diff --git a/community/xboard/xboard.desktop b/community/xboard/xboard.desktop index ff79ab684..4bdfdbe15 100644 --- a/community/xboard/xboard.desktop +++ b/community/xboard/xboard.desktop @@ -1,9 +1,10 @@ [Desktop Entry] +Encoding=UTF-8 Type=Application -Version=1.0 -Name=XBoard -Comment=An X Window System graphical chessboard +Name=Xboard +Comment=A graphical user interfaces for chess Exec=xboard -Icon=xboard +Icon=xboard.png Terminal=false -Categories=Game;BoardGame +StartupNotify=false +Categories=Application; diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD index 52fc29143..6a2ab49a2 100644 --- a/community/yaws/PKGBUILD +++ b/community/yaws/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68192 2012-03-18 22:20:01Z arodseth $ +# $Id: PKGBUILD 69782 2012-04-23 09:18:43Z ibiru $ # Maintainer: Vesa Kaihlavirta # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=yaws pkgver=1.92 -pkgrel=1 +pkgrel=2 pkgdesc='Yet Another Web Server -- The pure Erlang HTTP server/framework' arch=('x86_64' 'i686' 'mips64el') url='http://yaws.hyber.org/' @@ -22,7 +22,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var for file in www/cgi.yaws www/cgi-bin/foo.py; do # python2 fix - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file + sed -i '0,/on/s//on2/' "$file" done make } diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD index b71dd9630..2fee0ffbe 100644 --- a/community/yaz/PKGBUILD +++ b/community/yaz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61282 2011-12-28 01:58:33Z seblu $ +# $Id: PKGBUILD 69774 2012-04-23 09:16:32Z ibiru $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -6,7 +6,7 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=yaz -pkgver=4.2.24 +pkgver=4.2.29 pkgrel=1 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ url="http://www.indexdata.dk/yaz" depends=('openssl' 'libxslt' 'icu') options=('!libtool') source=("http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('204486e174159e70c4ce6341e7af3b0a') +md5sums=('584bcf12401f182a42091616c6cf7e0a') build() { cd "$srcdir/$pkgname-$pkgver" |