summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/buoh/PKGBUILD25
-rw-r--r--community/buoh/buoh.install2
-rw-r--r--community/freemat/PKGBUILD4
-rw-r--r--community/gambas2/PKGBUILD4
-rw-r--r--community/gambas3/PKGBUILD4
-rw-r--r--community/gedit-plugins/PKGBUILD4
-rw-r--r--community/gnustep-base/PKGBUILD4
-rw-r--r--community/gtranslator/PKGBUILD4
-rw-r--r--community/libmemcached/PKGBUILD6
-rw-r--r--community/librep/PKGBUILD4
-rw-r--r--community/parrot/PKGBUILD14
-rw-r--r--community/picard/PKGBUILD11
-rw-r--r--community/picard/typeheader.patch25
-rw-r--r--community/redis/PKGBUILD6
-rw-r--r--community/redis/redis.d7
-rw-r--r--community/smalltalk/PKGBUILD4
-rw-r--r--community/widelands/PKGBUILD8
-rw-r--r--core/glib2/PKGBUILD6
-rw-r--r--core/libffi/PKGBUILD12
-rw-r--r--core/openssl/PKGBUILD5
-rw-r--r--extra/eog-plugins/PKGBUILD4
-rw-r--r--extra/eog/PKGBUILD4
-rw-r--r--extra/freenx/PKGBUILD85
-rw-r--r--extra/freenx/freenx-server-0.7.3-nxipp.patch17
-rw-r--r--extra/freenx/freenx.install70
-rw-r--r--extra/gedit/PKGBUILD4
-rw-r--r--extra/gjs/PKGBUILD4
-rw-r--r--extra/gnome-documents/PKGBUILD4
-rw-r--r--extra/gnome-shell/PKGBUILD4
-rw-r--r--extra/gobject-introspection/PKGBUILD4
-rw-r--r--extra/graphicsmagick/PKGBUILD6
-rw-r--r--extra/gtk-xfce-engine/PKGBUILD8
-rw-r--r--extra/ifplugd/PKGBUILD17
-rw-r--r--extra/ifplugd/ifplugd107
-rw-r--r--extra/ifplugd/ifplugd.action17
-rw-r--r--extra/libgpod/PKGBUILD7
-rw-r--r--extra/libmp4v2/PKGBUILD18
-rw-r--r--extra/libpeas/PKGBUILD4
-rw-r--r--extra/libtorrent-rasterbar/PKGBUILD4
-rw-r--r--extra/llvm/PKGBUILD9
-rw-r--r--extra/mutter/PKGBUILD4
-rw-r--r--extra/nx-common/PKGBUILD54
-rw-r--r--extra/nx/PKGBUILD116
-rw-r--r--extra/nx/nx-x11.ld.so.conf.d1
-rw-r--r--extra/pulseaudio/PKGBUILD6
-rw-r--r--extra/pygobject/PKGBUILD4
-rw-r--r--extra/pygobject2/PKGBUILD4
-rw-r--r--extra/python/PKGBUILD4
-rw-r--r--extra/racket/PKGBUILD6
-rw-r--r--extra/rhythmbox/PKGBUILD4
-rw-r--r--extra/ruby/PKGBUILD2
-rw-r--r--extra/seed/PKGBUILD4
-rw-r--r--extra/squid/PKGBUILD6
-rw-r--r--extra/sushi/PKGBUILD4
-rw-r--r--extra/totem/PKGBUILD4
-rw-r--r--extra/tumbler/PKGBUILD6
-rw-r--r--extra/xfce4-mount-plugin/PKGBUILD6
57 files changed, 522 insertions, 269 deletions
diff --git a/community/buoh/PKGBUILD b/community/buoh/PKGBUILD
index 8819f2589..4691dd908 100644
--- a/community/buoh/PKGBUILD
+++ b/community/buoh/PKGBUILD
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD 66594 2012-02-26 13:42:22Z lfleischer $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 70031 2012-04-28 12:10:05Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=buoh
pkgver=0.8.2
-pkgrel=5
-pkgdesc="A reader for online strips comics"
+pkgrel=6
+pkgdesc="Reader for online strips comics"
arch=('i686' 'x86_64' 'mips64el')
url="http://buoh.steve-o.org/"
license=('GPL')
-depends=('libgnomeui' 'libsoup>=2.4.0' 'gconf' 'hicolor-icon-theme')
-makedepends=('gettext' 'intltool' 'pkgconfig')
+depends=('gtk2' 'libsoup>=2.4.0' 'gconf' 'hicolor-icon-theme')
+makedepends=('intltool')
+options=('!emptydirs')
install=buoh.install
-source=("http://buoh.steve-o.org/downloads/${pkgname}-${pkgver}.tar.bz2"
+source=("http://buoh.steve-o.org/downloads/$pkgname-$pkgver.tar.bz2"
buoh-libsoup24.patch)
md5sums=('50474a8712ad20ab36d8f8058a4647fb'
'c44f0e1828492a5d7d8efee764558fb4')
@@ -20,16 +22,19 @@ sha1sums=('29d702b485a901868f65116e753cb515b3e2a2c5'
'012badf13e33818268b744e106bdcccfd8fc66ed')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$srcdir/$pkgname-$pkgver"
patch -p1 < ../buoh-libsoup24.patch
autoconf
- ./configure --prefix=/usr --sysconfdir=/usr/share --disable-schemas-install
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --disable-schemas-install \
+ --with-gconf-schema-file-dir=/usr/share/gconf/schemas --without-libgnomeui
make AM_CFLAGS=-lxml2
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$srcdir/$pkgname-$pkgver"
+
make DESTDIR="$pkgdir" install
}
diff --git a/community/buoh/buoh.install b/community/buoh/buoh.install
index 2c1fcdf8a..44175ce06 100644
--- a/community/buoh/buoh.install
+++ b/community/buoh/buoh.install
@@ -2,7 +2,6 @@ pkgname=buoh
post_install() {
usr/sbin/gconfpkg --install ${pkgname}
- update-desktop-database -q
gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
}
@@ -19,6 +18,5 @@ pre_remove() {
}
post_remove() {
- update-desktop-database -q
gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
}
diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD
index 6110b2aea..815214d2f 100644
--- a/community/freemat/PKGBUILD
+++ b/community/freemat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64323 2012-02-11 23:21:03Z allan $
+# $Id: PKGBUILD 70011 2012-04-28 09:24:04Z allan $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=freemat
pkgver=4.1
-pkgrel=2
+pkgrel=3
pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
arch=('i686' 'x86_64' 'mips64el')
url="http://freemat.sourceforge.net"
diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index c43b314b8..53693e857 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69004 2012-04-07 16:55:48Z lcarlier $
+# $Id: PKGBUILD 70013 2012-04-28 09:24:06Z allan $
# Maintainer : Laurent Carlier <lordheavym@gmail.com>
# Contributor: Biru Ionut <ionut@archlinux.ro>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
pkgver=2.23.1
-pkgrel=9
+pkgrel=10
pkgdesc="A free development environment based on a Basic interpreter."
arch=('i686' 'x86_64')
url="http://gambas.sourceforge.net"
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index ceb786751..3e0e8e0b2 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69722 2012-04-23 07:27:51Z lcarlier $
+# $Id: PKGBUILD 70015 2012-04-28 09:24:08Z allan $
# Maintainer: Laurent Carlier <lordheavym@gmail.com>
pkgbase=gambas3
@@ -13,7 +13,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
'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.1
-pkgrel=1
+pkgrel=2
pkgdesc="A free development environment based on a Basic interpreter."
arch=('i686' 'x86_64' 'mips64el')
url="http://gambas.sourceforge.net/"
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index 8432fa488..b978e43b1 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69728 2012-04-23 09:06:52Z ibiru $
+# $Id: PKGBUILD 70017 2012-04-28 09:24:10Z allan $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Hugo Doria <hugo@archlinux.org>
@@ -7,7 +7,7 @@
pkgname=gedit-plugins
pkgver=3.4.0
-pkgrel=1
+pkgrel=2
pkgdesc="Plugins for gedit"
arch=('x86_64' 'i686' 'mips64el')
license=('GPL')
diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD
index 826a5cc2f..446334bb4 100644
--- a/community/gnustep-base/PKGBUILD
+++ b/community/gnustep-base/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68862 2012-04-04 09:31:15Z allan $
+# $Id: PKGBUILD 70019 2012-04-28 09:24:11Z allan $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Sebastian Sareyko <public@nooms.de>
pkgname=gnustep-base
pkgver=1.24.0
-pkgrel=2
+pkgrel=3
pkgdesc="The GNUstep base package"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnustep.org/"
diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index 5b612932f..e0899ca41 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69738 2012-04-23 09:07:48Z ibiru $
+# $Id: PKGBUILD 70021 2012-04-28 09:24:13Z allan $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
# Contributor: Christer Solskogen (solskogen@carebears.mine.nu)
pkgname=gtranslator
pkgver=2.91.3
-pkgrel=2
+pkgrel=3
pkgdesc="An enhanced gettext po file editor for the GNOME"
arch=('i686' 'x86_64' 'mips64el')
url="http://projects.gnome.org/gtranslator/"
diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD
index d49693998..4da593be4 100644
--- a/community/libmemcached/PKGBUILD
+++ b/community/libmemcached/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 69280 2012-04-12 09:17:37Z foutrelis $
+# $Id: PKGBUILD 70077 2012-04-29 03:10:00Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
pkgname=libmemcached
-pkgver=1.0.6
+pkgver=1.0.7
pkgrel=1
pkgdesc="C and C++ client library to the memcached server"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('glibc' 'libsasl' 'libevent')
makedepends=('perl')
options=('!libtool')
source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-sha256sums=('1403b24fe8d32a8e5ae4c39aadb8ad9c72f17b2a3244943eb0d8fc4821f02c70')
+sha256sums=('3efa86c9733eaad55d7119cb16769424e2aa6c22b3392e8f973946fce6678d81')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/librep/PKGBUILD b/community/librep/PKGBUILD
index 151440742..8390f87de 100644
--- a/community/librep/PKGBUILD
+++ b/community/librep/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68538 2012-03-27 07:09:16Z arodseth $
+# $Id: PKGBUILD 70025 2012-04-28 09:24:16Z allan $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: stefan-husmann@t-online.de
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
pkgname=librep
pkgver=0.92.2
-pkgrel=1
+pkgrel=2
pkgdesc="Lisp system for Sawfish"
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index 909f7daf3..e26e18a67 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69768 2012-04-23 09:16:14Z ibiru $
+# $Id: PKGBUILD 70027 2012-04-28 09:24:17Z allan $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
pkgname=parrot
-pkgver=4.2.0
-#_rel=stable
-_rel=devel
+pkgver=4.3.0
+_rel=stable
+#_rel=devel
pkgrel=1
pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages"
arch=('x86_64' 'i686' 'mips64el')
@@ -14,9 +14,9 @@ license=('GPL')
depends=('icu' 'openssl' 'libffi')
makedepends=('perl-json')
optdepends=('freeglut')
-options=(!makeflags)
-source=("ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('69ee93d9f81babcff67b747cc614358958a32f274e407b65771ca5a056d4c3d4')
+options=('!makeflags')
+source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2)
+sha256sums=('5c3f5ba2de06f6adb53b7835374a4f3e0601ec63e8a1d1dba6c6a07e12cc2990')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD
index 9feb1be34..2646dbf7f 100644
--- a/community/picard/PKGBUILD
+++ b/community/picard/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 62594 2012-01-22 09:34:17Z bisson $
+# $Id: PKGBUILD 70039 2012-04-28 15:51:53Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Maintainer: Mateusz Herych <heniekk@gmail.com>
# Contributor: sysrq
pkgname=picard
pkgver=0.16
-pkgrel=4
+pkgrel=5
pkgdesc='Official MusicBrainz tagger'
url='http://musicbrainz.org/doc/MusicBrainz_Picard'
license=('GPL')
@@ -13,13 +13,16 @@ arch=('i686' 'x86_64' 'mips64el')
depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg')
optdepends=('libdiscid: CD lookup'
'chromaprint: fingerprinting')
-source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('274071410550ee29051bb0137d72602921a015f9')
+source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'typeheader.patch')
+sha1sums=('274071410550ee29051bb0137d72602921a015f9'
+ '0bd871632c28ef656af7ae89a8e752120f2cd7bd')
install=install
build() {
cd "${srcdir}/picard-${pkgver}"
+ patch -p1 -i ../typeheader.patch
python2 setup.py config
}
diff --git a/community/picard/typeheader.patch b/community/picard/typeheader.patch
new file mode 100644
index 000000000..b34852673
--- /dev/null
+++ b/community/picard/typeheader.patch
@@ -0,0 +1,25 @@
+diff -Naur old/picard/webservice.py new/picard/webservice.py
+--- old/picard/webservice.py 2011-10-23 19:15:29.000000000 +0200
++++ new/picard/webservice.py 2012-04-28 17:43:17.562422696 +0200
+@@ -149,8 +149,11 @@
+ url.setPassword(self.config.setting["password"])
+ request = QtNetwork.QNetworkRequest(url)
+ request.setRawHeader("User-Agent", "MusicBrainz-Picard/%s" % version_string)
+- if method == "POST" and host == self.config.setting["server_host"]:
+- request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/xml; charset=utf-8")
++ if data is not None:
++ if method == "POST" and host == self.config.setting["server_host"]:
++ request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/xml; charset=utf-8")
++ else:
++ request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/x-www-form-urlencoded")
+ send = self._request_methods[method]
+ reply = send(request, data) if data is not None else send(request)
+ key = (host, port)
+@@ -370,6 +373,7 @@
+ def _encode_acoustid_args(self, args):
+ filters = []
+ args['client'] = ACOUSTID_KEY
++ args['clientversion'] = version_string
+ args['format'] = 'xml'
+ for name, value in args.items():
+ value = str(QUrl.toPercentEncoding(value))
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 28e00f972..4116f6fd6 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69786 2012-04-23 09:37:03Z spupykin $
+# $Id: PKGBUILD 70007 2012-04-28 09:18:17Z 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.11
-pkgrel=1
+pkgrel=2
pkgdesc="Advanced key-value store"
arch=('i686' 'x86_64' 'mips64el')
url="http://redis.io/"
@@ -19,7 +19,7 @@ source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
"redis.d"
"redis.logrotate")
md5sums=('ccd193d80196855343840db6110bf58d'
- 'f8fb4b00ee3636c7dc7c173e2f6a4e76'
+ '9d58bcc2bc0e193353206c608e71f5d6'
'9e2d75b7a9dc421122d673fe520ef17f')
build() {
diff --git a/community/redis/redis.d b/community/redis/redis.d
index afd001fd5..4babbaaa5 100644
--- a/community/redis/redis.d
+++ b/community/redis/redis.d
@@ -12,9 +12,14 @@ PIDFILE=/var/run/redis.pid
WORKDIR=/var/lib/redis
CONF="/etc/redis.conf"
-PID=$(cat $PIDFILE)
+# Check if process exists
+PID=$(cat $PIDFILE 2>/dev/null)
[ -d /proc/${PID} ] || rm -f $PIDFILE
+# Grab the server password, if exists
+REDISPASS=`egrep -o '^requirepass ([^#]+)' $CONF | cut -d\ -f 2`
+[ -n "$REDISPASS" ] && CLIEXEC="$CLIEXEC -a $REDISPASS"
+
case "$1" in
start)
stat_busy "Starting $daemon_name"
diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD
index c5cb45bb7..33c81da15 100644
--- a/community/smalltalk/PKGBUILD
+++ b/community/smalltalk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69236 2012-04-10 21:23:38Z arodseth $
+# $Id: PKGBUILD 70029 2012-04-28 09:24:19Z allan $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Kaiting Chen <kaitocracy@gmail.com>
# Contributor: mrshpot <mrshpot at gmail dot com>
@@ -6,7 +6,7 @@
pkgname=smalltalk
pkgver=3.2.4
-pkgrel=6
+pkgrel=7
pkgdesc='Implementation of Smalltalk-80'
url='http://smalltalk.gnu.org/'
license=('GPL' 'LGPL')
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index 6a291309d..caacfc079 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69897 2012-04-25 19:17:33Z svenstaro $
+# $Id: PKGBUILD 70033 2012-04-28 14:02:07Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Arkham <arkham at archlinux dot us>
# Contributor: Christoph Zeiler <rabyte*gmail>
@@ -6,13 +6,13 @@
pkgname=widelands
pkgver=17
_realver=build17
-pkgrel=1
+pkgrel=2
pkgdesc="A realtime strategy game with emphasis on economy and transport"
arch=('i686' 'x86_64' 'mips64el')
url="http://widelands.org/"
license=('GPL')
-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')
+depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua' 'glew' 'python2' 'widelands-data')
+makedepends=('cmake' 'boost')
source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2"
$pkgname.desktop
$pkgname.png
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 08d6c4710..46603ac2c 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 157012 2012-04-23 09:23:05Z ibiru $
+# $Id: PKGBUILD 157381 2012-04-28 09:25:44Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=glib2
pkgver=2.32.1
-pkgrel=2
+pkgrel=3
pkgdesc="Common C routines used by GTK+ and other libs"
url="http://www.gtk.org/"
arch=(i686 x86_64 'mips64el')
license=('LGPL')
depends=('pcre' 'libffi')
-makedepends=('pkgconfig' 'python2')
+makedepends=('pkg-config' 'python2')
optdepends=('python2: for gdbus-codegen')
options=('!libtool' '!docs' '!emptydirs')
source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD
index d89596d7d..725290584 100644
--- a/core/libffi/PKGBUILD
+++ b/core/libffi/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 139471 2011-10-02 01:24:24Z ibiru $
+# $Id: PKGBUILD 157383 2012-04-28 09:25:57Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libffi
-pkgver=3.0.10
+pkgver=3.0.11
pkgrel=1
pkgdesc="A portable, high level programming interface to various calling conventions"
arch=('i686' 'x86_64' 'mips64el')
url="http://sourceware.org/libffi"
license=('MIT')
depends=('glibc')
+checkdepends=('dejagnu')
options=('!libtool')
install=libffi.install
source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
-md5sums=('79390673f5d07a8fb342bc09b5055b6f')
+md5sums=('f69b9693227d976835b4857b1ba7d0e3')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,6 +21,11 @@ build() {
make
}
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make check
+}
+
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 64fc2220d..d34178ed1 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156488 2012-04-19 14:22:45Z bisson $
+# $Id: PKGBUILD 157379 2012-04-28 09:02:47Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=openssl
-_ver=1.0.1a
+_ver=1.0.1b
# use a pacman compatible version scheme
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
#pkgver=$_ver
@@ -51,6 +51,7 @@ build() {
esac
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
+ # workaround for PR#2771: OPENSSL_NO_TLS1_2_CLIENT
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared zlib enable-md2 ${optflags} \
"${openssltarget}" \
diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD
index 2a8287705..05211e594 100644
--- a/extra/eog-plugins/PKGBUILD
+++ b/extra/eog-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156744 2012-04-23 09:04:31Z ibiru $
+# $Id: PKGBUILD 157387 2012-04-28 09:26:19Z allan $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=eog-plugins
pkgver=3.4.0
-pkgrel=1
+pkgrel=2
pkgdesc="Plugins for Eye of Gnome"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnome.org/"
diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD
index adfc70358..820a47f2e 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156742 2012-04-23 09:04:28Z ibiru $
+# $Id: PKGBUILD 157385 2012-04-28 09:26:16Z allan $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=eog
pkgver=3.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="Eye of Gnome: An image viewing and cataloging program"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD
index c55c55f31..8e1476ada 100644
--- a/extra/freenx/PKGBUILD
+++ b/extra/freenx/PKGBUILD
@@ -1,25 +1,39 @@
-# $Id: PKGBUILD 140055 2011-10-06 06:24:35Z tpowa $
+# $Id: PKGBUILD 157437 2012-04-28 09:58:42Z andyrtr $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
#Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
+
pkgname=freenx
pkgver=0.7.3
-pkgrel=10
+pkgrel=11
pkgdesc="Free Software (GPL) Implementation of the NX Server"
arch=(i686 x86_64 'mips64el')
url="http://freenx.berlios.de"
license=('GPL')
-depends=('nxserver' 'gnu-netcat' 'inetutils' 'openssh' 'expect' 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg')
-backup=(opt/NX/etc/node.conf)
+depends=('nx-common' 'nx-x11' 'nxagent' 'nxproxy' 'gnu-netcat' 'inetutils' 'openssh' 'expect' 'python'
+ 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg')
+optdepends=('cups: adds printing support')
+makedepends=('imake')
+options=('!makeflags')
+conflicts=('nxserver')
+provides=('nxserver')
+backup=(etc/nxserver/node.conf)
install=freenx.install
source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz
keymap.patch
nxagent-startup.patch
freenx-latest-svn.patch
- remove-dialog.patch)
+ remove-dialog.patch
+ freenx-server-0.7.3-nxipp.patch)
+md5sums=('856f597e139018f7ed62713c9d6c9ed5'
+ 'f0867659c925f6363fb2b7661f349248'
+ '30dc16d8e2093ff71d5834a169ad9d00'
+ '788f30322783cf2c2dc833e2e4d5e8ad'
+ 'cae1773312506eeefe6a8de07c492bd8'
+ 'b3244c52a6bafc6d9b528eb4d4426e36')
build() {
# patch and install nxserver
- cd $startdir/src/$pkgname-server-$pkgver
+ cd $srcdir/$pkgname-server-$pkgver
# add latest svn fixes
patch -Np3 -i ../freenx-latest-svn.patch
# patch from inside nx
@@ -28,49 +42,54 @@ build() {
patch -Np0 -i ${srcdir}/keymap.patch
# patch nxagent startup to avoid login issues
patch -Np0 -i ${srcdir}/nxagent-startup.patch
+ # check for cups existance and then symlinks the backend
+ patch -Np1 -i ${srcdir}/freenx-server-0.7.3-nxipp.patch
# remove broken dialog function
patch -Np0 -i ${srcdir}/remove-dialog.patch
sed -i -e 's,authorized_keys2,authorized_keys,g' nxloadconfig
- sed -i -e 's,/usr/NX,/opt/NX,g' nxloadconfig
+ sed -i -e 's,\/usr\/NX,\/usr\/lib/nx,g' nxloadconfig node.conf.sample
sed -i -e 's,netcat,nc,g' nxloadconfig
sed -i -e 's/utmp/nx/g' nxsetup
sed -i -e 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig
sed -i -e 's,COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile",COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile",g' nxloadconfig
- sed -i -e 's,COMMAND_MD5SUM="openssl md5",COMMAND_MD5SUM="md5sum",g' nxloadconfig
+ sed -i -e 's,COMMAND_MD5SUM="openssl md5",COMMAND_MD5SUM="md5sum",g' nxloadconfig node.conf.sample
sed -i -e 's|AGENT_EXTRA_OPTIONS_X=""|AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11/rgb -fp /usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 -xkbdir /usr/share/X11/xkb"|g' nxloadconfig
sed -i -e 's/ENABLE_AUTORECONNECT_BEFORE_140="1"/ENABLE_AUTORECONNECT_BEFORE_140="0"/g' nxloadconfig
sed -i -e 's,/etc/init.d/ssh,/etc/rc.d/sshd,g' nxsetup
sed -i -e 's,libXcomp.so,libXcomp.so.3,g' nxloadconfig
sed -i -e 's,libXcompext.so,libXcompext.so.3,g' nxloadconfig
sed -i -e 's,libXrender.so.1.2,libXrender.so.1.2.2:$APPLICATION_LIBRARY_PATH/libXcompsh.so.3:$APPLICATION_LIBRARY_PATH/libXcompshad.so.3,g' nxloadconfig
+ sed -i -e 's:NX_ETC_DIR\=$NX_DIR\/etc:NX_ETC_DIR=\/etc\/nxserver:g' nxloadconfig
+ sed -i -e 's:NX_SESS_DIR=$NX_DIR\/var\/db:NX_SESS_DIR=\/var\/lib\/nxserver\/db:g' nxloadconfig
+ sed -i -e 's:NX_HOME_DIR=$NX_DIR:NX_HOME_DIR=\/var\/lib\/nxserver:g' nxloadconfig
+ sed -i -e 's:NOMACHINE_NX_HOME_DIR="/usr/lib/nx/home/nx":NOMACHINE_NX_HOME_DIR="/var/lib/nxserver/home/nx":g' nxloadconfig node.conf.sample
+ sed -i -e 's:\/usr\/NX:\/usr\/lib\/nx:g' nxdialog
+
# fix key generation
sed -i -e 's,AUTOMATIC="no",AUTOMATIC="yes",g' nxsetup
+
+ make
}
package() {
- cd $startdir/src/$pkgname-server-$pkgver
- install -D -m755 nxnode $startdir/pkg/opt/NX/bin/nxnode
- install -D -m755 nxserver $startdir/pkg/opt/NX/bin/nxserver
- install -D -m755 nxsetup $startdir/pkg/opt/NX/bin/nxsetup
- install -D -m755 nxkeygen $startdir/pkg/opt/NX/bin/nxkeygen
- install -D -m755 nxnode-login $startdir/pkg/opt/NX/bin/nxnode-login
- install -D -m755 nxloadconfig $startdir/pkg/opt/NX/bin/nxloadconfig
- install -D -m755 nxdialog $startdir/pkg/opt/NX/bin/nxdialog
- install -D -m755 nxviewer_helper $startdir/pkg/opt/NX/bin/nxviever_helper
- install -D -m755 nxcups-gethost $startdir/pkg/opt/NX/bin/nxcups-gethost
- install -D -m755 nxdesktop_helper $startdir/pkg/opt/NX/bin/nxdesktop_helper
- # provided by nxclient!
- #install -D -m755 nxprint $startdir/pkg/opt/NX/bin/nxprint
- install -D -m755 node.conf.sample $startdir/pkg/opt/NX/etc/node.conf
- # install nxhelper
- cd nxserver-helper
- make
- install -D -m755 nxserver-helper $startdir/pkg/opt/NX/bin/nxserver-helper
- # create nxserver homedir
- mkdir -m700 -p $startdir/pkg/opt/NX/home/nx
+ cd $srcdir/$pkgname-server-$pkgver
+
+ make install DESTDIR="${pkgdir}"
+
+ # create symlinks
+ install -dm755 ${pkgdir}/usr/bin
+ cd ${pkgdir}/usr/bin
+ for file in ${pkgdir}/usr/lib/nx/bin/*; do
+ ln -sv /usr/lib/nx/bin/`basename $file` .
+ done
+
+ mv $pkgdir/etc/nxserver/node.conf.sample $pkgdir/etc/nxserver/node.conf
+
+ # create some missing nxserver directories
+ mkdir -m700 -p $pkgdir/var/lib/nxserver/{home/nx,db}
+ mkdir -m700 -p $pkgdir/usr/lib/nx/share
+
+ # remove files that are part of nxclient
+ rm -f ${pkgdir}/usr/lib/nx/bin/nxprint
+ rm -f ${pkgdir}/usr/bin/nxprint
}
-md5sums=('856f597e139018f7ed62713c9d6c9ed5'
- 'f0867659c925f6363fb2b7661f349248'
- '30dc16d8e2093ff71d5834a169ad9d00'
- '788f30322783cf2c2dc833e2e4d5e8ad'
- 'cae1773312506eeefe6a8de07c492bd8')
diff --git a/extra/freenx/freenx-server-0.7.3-nxipp.patch b/extra/freenx/freenx-server-0.7.3-nxipp.patch
new file mode 100644
index 000000000..81b286593
--- /dev/null
+++ b/extra/freenx/freenx-server-0.7.3-nxipp.patch
@@ -0,0 +1,17 @@
+diff -up freenx-server-0.7.3/nxsetup~ freenx-server-0.7.3/nxsetup
+--- freenx-server-0.7.3/nxsetup~ 2011-12-30 23:04:53.515194711 +0200
++++ freenx-server-0.7.3/nxsetup 2011-12-30 23:05:55.499954085 +0200
+@@ -366,11 +366,10 @@ EOF
+
+ echo "done"
+
+- if [ -d "$CUPS_BACKEND" ]
++ if [ -d "$CUPS_BACKEND" ] && [ ! -f "$CUPS_IPP_BACKEND" ]
+ then
+ echo -n "Setting up cups nxipp backend ..."
+- cp -af "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND"
+- chmod 755 "$CUPS_IPP_BACKEND"
++ ln -sf "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND"
+ echo "done"
+ fi
+ }
diff --git a/extra/freenx/freenx.install b/extra/freenx/freenx.install
index 93a28656f..0f3260166 100644
--- a/extra/freenx/freenx.install
+++ b/extra/freenx/freenx.install
@@ -1,27 +1,59 @@
-# arg 1: the new package version
post_install() {
-# setting up freenx
-echo 'Generating keys ...'
-/opt/NX/bin/nxsetup --install --uid 85 --gid 85 2>&1 >/dev/null
-/bin/cat <<THEEND
-ATTENTION FREENX:
-For correct setup please take a look at the wiki:
-http://wiki.archlinux.org/index.php/FreeNX
-THEEND
+ # Make sure the group and user "nx" exists on this system and have the correct values
+ if grep -q "^nx:" /etc/group &> /dev/null ; then
+ groupmod -g 85 -n nx nx &> /dev/null
+ else
+ groupadd -g 85 nx &> /dev/null
+ fi
+
+ if grep -q "^nx:" /etc/passwd 2> /dev/null ; then
+ usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null
+ else
+ useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null
+ fi
+
+ # setting up freenx
+ echo 'Generating keys ...'
+ /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null
+
+ echo "ATTENTION FREENX:"
+ echo "For correct setup please take a look at the wiki:"
+ echo "http://wiki.archlinux.org/index.php/FreeNX"
}
post_upgrade() {
-# setting up freenx
-echo 'Rerunning nxsetup ...'
-/opt/NX/bin/nxsetup --install --uid 85 --gid 85 2>&1 >/dev/null
-/bin/cat <<THEEND
-ATTENTION FREENX:
-For correct setup please take a look at the wiki:
-http://wiki.archlinux.org/index.php/FreeNX
-THEEND
+ # Make sure the group and user "nx" exists on this system and have the correct values
+ if grep -q "^nx:" /etc/group &> /dev/null ; then
+ groupmod -g 85 -n nx nx &> /dev/null
+ else
+ groupadd -g 85 nx &> /dev/null
+ fi
+
+ if grep -q "^nx:" /etc/passwd 2> /dev/null ; then
+ usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null
+ else
+ useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null
+ fi
+
+ # setting up freenx
+ echo "Rerunning nxsetup ..."
+ /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null
+
+ if [ "`vercmp $2 0.7.3-10.1`" -lt 0 ]; then
+ # important upgrade notice
+ echo "*** config file location has been moved ***"
+ echo "Please apply your local settings from /opt/NX/etc/node.conf.pacsave"
+ echo "into /etc/nxserver/node.conf. A new key set is required."
+ echo "Please copy to your clients the new client key:"
+ echo "\"/var/lib/nxserver/home/nx/.ssh/client.id_dsa.key\""
+ echo "When you have FreeNX server running clean up with \"rm -rf /opt/NX\"."
+ fi
}
+
# arg 1: the old package version
pre_remove() {
- /opt/NX/bin/nxsetup --uninstall --purge 2>&1 >/dev/null
- usr/sbin/groupdel nx &>/dev/null
+ /usr/lib/nx/bin/nxsetup --uninstall --purge 2>&1 >/dev/null
+# usr/sbin/groupdel nx &>/dev/null
+ userdel nx &> /dev/null
+ groupdel nx &> /dev/null || /bin/true
}
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index a426b882a..5e599d745 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156780 2012-04-23 09:05:29Z ibiru $
+# $Id: PKGBUILD 157391 2012-04-28 09:26:29Z allan $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=gedit
pkgver=3.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="A text editor for GNOME"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD
index 69e96300e..f3726ded3 100644
--- a/extra/gjs/PKGBUILD
+++ b/extra/gjs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156786 2012-04-23 09:05:36Z ibiru $
+# $Id: PKGBUILD 157393 2012-04-28 09:26:32Z allan $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=gjs
pkgver=1.32.0
-pkgrel=1
+pkgrel=2
pkgdesc="Javascript Bindings for GNOME"
arch=('i686' 'x86_64' 'mips64el')
url="http://live.gnome.org/Gjs"
diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD
index 8a87f9501..8d3edbfda 100644
--- a/extra/gnome-documents/PKGBUILD
+++ b/extra/gnome-documents/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156816 2012-04-23 09:06:38Z ibiru $
+# $Id: PKGBUILD 157395 2012-04-28 09:26:35Z allan $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=gnome-documents
pkgver=0.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="Documents Manager for GNOME"
arch=(i686 x86_64 mips64el)
url="http://www.gnome.org"
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index a52368458..3e9294262 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156849 2012-04-23 09:07:31Z ibiru $
+# $Id: PKGBUILD 157397 2012-04-28 09:26:38Z allan $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Flamelab <panosfilip@gmail.com
pkgname=gnome-shell
pkgver=3.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="The next generation GNOME Shell"
arch=('i686' 'x86_64' 'mips64el')
url="http://live.gnome.org/GnomeShell"
diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD
index f570b8e22..3f3a13519 100644
--- a/extra/gobject-introspection/PKGBUILD
+++ b/extra/gobject-introspection/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156865 2012-04-23 09:07:51Z ibiru $
+# $Id: PKGBUILD 157399 2012-04-28 09:26:41Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gobject-introspection
pkgver=1.32.1
-pkgrel=1
+pkgrel=2
pkgdesc="Introspection system for GObject-based libraries"
url="http://live.gnome.org/GObjectInstrospection"
arch=('x86_64' 'i686' 'mips64el')
diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index bb17c7865..5c1435cd3 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 151505 2012-02-26 21:44:47Z bisson $
+# $Id: PKGBUILD 157625 2012-04-29 02:08:46Z bisson $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Anton Leontiev <bunder@t-25.ru>
pkgname=graphicsmagick
-pkgver=1.3.14
+pkgver=1.3.15
pkgrel=1
pkgdesc='Image processing system'
url='http://www.graphicsmagick.org/'
@@ -16,7 +16,7 @@ depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz'
'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl')
options=('!libtool')
source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
-sha1sums=('307fb59e60685721c365da4c2f593523743ca599')
+sha1sums=('d5df4000d5531fad3ede9e008f9c8dc2d085d546')
build() {
cd "${srcdir}/GraphicsMagick-${pkgver}"
diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD
index 47b44451a..86002a190 100644
--- a/extra/gtk-xfce-engine/PKGBUILD
+++ b/extra/gtk-xfce-engine/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 154599 2012-03-30 12:26:06Z foutrelis $
+# $Id: PKGBUILD 157455 2012-04-28 15:51:09Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: tobias <tobias funnychar archlinux.org>
pkgbase=gtk-xfce-engine
pkgname=('gtk2-xfce-engine' 'gtk3-xfce-engine')
-pkgver=2.99.2
+pkgver=3.0.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://www.xfce.org/"
@@ -12,8 +12,8 @@ license=('GPL2')
groups=('xfce4')
makedepends=('gtk2' 'gtk3')
options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/$pkgbase/2.99/$pkgbase-$pkgver.tar.bz2)
-sha256sums=('81301df31b2bd8b345b40331fa9f1d5deeb6e3e18fa1a60cd23c0fa9b44de2ee')
+source=(http://archive.xfce.org/src/xfce/$pkgbase/3.0/$pkgbase-$pkgver.tar.bz2)
+sha256sums=('90e08fce8cce452656c4090f94afb7aa35a0a92597412f319526b7899d54838d')
build() {
cd "$srcdir/$pkgbase-$pkgver"
diff --git a/extra/ifplugd/PKGBUILD b/extra/ifplugd/PKGBUILD
index 0a0fe9e1b..1e7d6ad04 100644
--- a/extra/ifplugd/PKGBUILD
+++ b/extra/ifplugd/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 150402 2012-02-17 12:01:52Z allan $
+# $Id: PKGBUILD 157472 2012-04-28 18:54:17Z dreisner $
# Contributor: Manolis Tzanidakis
# Contributor: kevin <kevin@archlinux.org>
# Maintainer:
pkgname=ifplugd
pkgver=0.28
-pkgrel=8
+pkgrel=10
pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal."
arch=('i686' 'x86_64' 'mips64el')
url="http://0pointer.de/lennart/projects/ifplugd"
license=('GPL2')
-depends=('libdaemon' 'bash')
+depends=('libdaemon' 'bash' 'net-tools')
backup=('etc/ifplugd/ifplugd.conf' 'etc/ifplugd/ifplugd.action')
options=('!makeflags')
source=($url/${pkgname}-${pkgver}.tar.gz 'ifplugd' 'ifplugd.action' 'ifplugd-0.28-interface.patch' 'ifdown.01-route.sh' 'ifup.01-route.sh' 'ifup.02-ntpdate.sh')
-md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3' '70d66121ae5163348855236951e069a2'\
- 'e91a3d77d707ae79fbc10146848032dc' '54eb22844b5aeed161c0b80aa9008570'\
- 'd6ce6c7bd481a0b3944c944c5b277c0b' 'c35f0a637911b747f8dc3bd3c6156a1b'\
- 'f8690ee18a5ca72555585ee96826c2cf')
+md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3'
+ 'ef27f40434ca85ccaf57a7e388eb001e'
+ '6f98767c4ea2cf0580f73ced81efd21a'
+ '54eb22844b5aeed161c0b80aa9008570'
+ 'd6ce6c7bd481a0b3944c944c5b277c0b'
+ 'c35f0a637911b747f8dc3bd3c6156a1b'
+ 'f8690ee18a5ca72555585ee96826c2cf')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/ifplugd/ifplugd b/extra/ifplugd/ifplugd
index 44019d0ee..667fc1f53 100644
--- a/extra/ifplugd/ifplugd
+++ b/extra/ifplugd/ifplugd
@@ -5,47 +5,64 @@
. /etc/rc.conf
. /etc/rc.d/functions
+shopt -s extglob
+
# env vars
-NAME=ifplugd
-CFG=/etc/ifplugd/ifplugd.conf
-IFPLUGD=/usr/sbin/ifplugd
-PID=`pidof -o %PPID $IFPLUGD`
+daemonname=ifplugd
+cfg=/etc/ifplugd/ifplugd.conf
+PID=$(pidof -o %PPID ifplugd)
# source configuration file
-[ -f $CFG ] && . $CFG
+[[ -r $cfg ]] && . "$cfg"
# discover interfaces to monitor
-# (replacing INTERFACES with NET_IFS, since AL
+# (replacing INTERFACES with net_ifs, since AL
# already uses it in /etc/rc.conf)
-[ -z "$NET_IFS" ] &&
- NET_IFS=$(sed -ne 's/.*\<\(eth[0-9]*\):.*/\1/p' /proc/net/dev)
+if [[ -z $net_ifs ]]; then
+ net_ifs=(/sys/class/net/!(lo))
+ net_ifs=("${net_ifs[@]##*/}")
+fi
-case "$1" in
+case $1 in
start)
- stat_busy "Starting $NAME"
- [ -z "$PID" ] && ( for IF in $NET_IFS ; do
- A="`eval echo \$\{ARGS_${IF}\}`"
- [ -z "$A" ] && A="$ARGS"
- $IFPLUGD -i $IF $A
- echo -n " $IF"
- done )
- if [ $? -gt 0 ]; then
+ stat_busy "Starting $daemonname: ${net_ifs[*]}"
+
+ for nic in "${net_ifs[@]}"; do
+ # only start if a PID doesn't already exist
+ if [[ ! -f /var/run/ifplugd.$nic.pid ]]; then
+ args=ARGS_$nic
+ [[ -z ${!args} ]] && args=$ARGS || args=${!args}
+ ifplugd -i "$nic" $args
+
+ # use presence of PID file to check for start success
+ [[ -f /var/run/ifplugd.$nic.pid ]] || (( ++err ))
+ fi
+ done
+ unset nic
+
+ if (( err )); then
stat_fail
+ exit 1
else
- add_daemon $NAME
+ add_daemon $daemonname
stat_done
fi
;;
stop)
- stat_busy "Stopping $NAME"
- [ ! -z "$PID" ] && ( for IF in $NET_IFS ; do
- $IFPLUGD -k -i $IF
- echo -n " $IF"
- done )
- if [ $? -gt 0 ]; then
+ stat_busy "Stopping $daemonname: ${net_ifs[*]}"
+
+ for nic in /var/run/ifplugd.*.pid; do
+ [[ -f $nic ]] || { (( ++err )); break; }
+ nic=${nic%.pid}
+ nic=${nic##*.}
+ ifplugd -k -i "$nic" || (( ++err ))
+ done
+
+ if (( err )); then
stat_fail
+ exit 1
else
- rm_daemon $NAME
+ rm_daemon $daemonname
stat_done
fi
;;
@@ -55,35 +72,41 @@ case "$1" in
$0 start
;;
status)
- for IF in $NET_IFS; do
- $IFPLUGD -c -i $IF
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -c -i "$nic"
done
+ unset nic
;;
suspend)
- stat_busy "Suspending $NAME"
- for IF in $NET_IFS; do
- $IFPLUGD -S -i $IF
- echo -n " $IF"
- done
- if [ $? -gt 0 ]; then
+ stat_busy "Suspending $daemonname: ${net_ifs[*]}"
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -S -i $nic || (( ++err ))
+ done
+ unset nic
+
+ if (( err )); then
stat_fail
+ exit 1
else
stat_done
- fi
+ fi
;;
resume)
- stat_busy "Resuming $NAME"
- for IF in $NET_IFS; do
- $IFPLUGD -R -i $IF
- echo -n " $IF"
+ stat_busy "Resuming $daemonname ${net_ifs[*]}"
+
+ for nic in "${net_ifs[@]}"; do
+ ifplugd -R -i $nic || (( ++err ))
done
- if [ $? -gt 0 ]; then
+ unset nic
+
+ if (( err )); then
stat_fail
+ exit 1
else
stat_done
- fi
- ;;
+ fi
+ ;;
*)
- echo "usage: $0 {start|stop|restart|status|suspend|resume}"
+ echo "usage: $0 {start|stop|restart|status|suspend|resume}"
esac
exit 0
diff --git a/extra/ifplugd/ifplugd.action b/extra/ifplugd/ifplugd.action
index 23b74c60d..07895bcad 100644
--- a/extra/ifplugd/ifplugd.action
+++ b/extra/ifplugd/ifplugd.action
@@ -1,28 +1,29 @@
-#!/bin/sh
+#!/bin/bash
#
# ifplugd.action script for Arch Linux
+#
. /etc/rc.conf
. /etc/rc.d/functions
-plugscript(){ #argumets are ifup|ifdown, interface_name
+plugscript() { # arguments are ifup|ifdown, interface_name
for script in /etc/ifplugd/$1.d/*.sh; do
- [ -x $script ] && $script $2
+ [[ -x $script ]] && "$script" $2
done
return 0
}
-case "$2" in
+case $2 in
up)
- /etc/rc.d/network ifup $1
- plugscript ifup $1
+ /etc/rc.d/network ifup "$1"
+ plugscript ifup "$1"
;;
down)
- plugscript ifdown $1
+ plugscript ifdown "$1"
/etc/rc.d/network ifdown $1
;;
*)
- echo "Wrong arguments" > /dev/stderr
+ echo "Wrong arguments" >&2
;;
esac
diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD
index 6f7f63f6b..7844a0d1d 100644
--- a/extra/libgpod/PKGBUILD
+++ b/extra/libgpod/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 155743 2012-04-06 00:05:54Z tomegun $
+# $Id: PKGBUILD 157452 2012-04-28 13:14:16Z ibiru $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=libgpod
pkgver=0.8.2
-pkgrel=4
+pkgrel=5
pkgdesc="A shared library to access the contents of an iPod"
arch=(i686 x86_64 'mips64el')
license=('LGPL')
depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice')
makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2')
-optdepends=('gtk-sharp-2: Mono bindings')
+optdepends=('gtk-sharp-2: Mono bindings'
+ 'python2-gobject2: python bindings')
url="http://www.gtkpod.org/libgpod/"
source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
options=('!libtool' '!emptydirs')
diff --git a/extra/libmp4v2/PKGBUILD b/extra/libmp4v2/PKGBUILD
index 0069876b1..9fd5f6c13 100644
--- a/extra/libmp4v2/PKGBUILD
+++ b/extra/libmp4v2/PKGBUILD
@@ -1,32 +1,32 @@
-# $Id: PKGBUILD 157108 2012-04-23 23:49:53Z tomegun $
+# $Id: PKGBUILD 157441 2012-04-28 10:45:14Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=libmp4v2
pkgver=1.9.1
-pkgrel=3
+pkgrel=4
pkgdesc="MPEG-4 library"
arch=('i686' 'x86_64' 'mips64el')
license=('MPL')
url="http://code.google.com/p/mp4v2/"
depends=('gcc-libs')
options=('!libtool')
-#source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2")
-source=("http://mp4v2.googlecode.com/files/mp4v2-trunk-r479.tar.bz2")
+source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2")
+#source=("http://mp4v2.googlecode.com/files/mp4v2-trunk-r479.tar.bz2")
build() {
-# cd ${srcdir}/mp4v2-${pkgver}
- cd ${srcdir}/mp4v2-trunk-r479
+ cd ${srcdir}/mp4v2-${pkgver}
+# cd ${srcdir}/mp4v2-trunk-r479
./configure --prefix=/usr
make
}
package() {
-# cd ${srcdir}/mp4v2-${pkgver}
- cd ${srcdir}/mp4v2-trunk-r479
+ cd ${srcdir}/mp4v2-${pkgver}
+# cd ${srcdir}/mp4v2-trunk-r479
make DESTDIR=${pkgdir} install
make DESTDIR=${pkgdir} install-man
}
-md5sums=('9ffd774fa88ad993e28236551511850b')
+md5sums=('986701929ef15b03155ac4fb16444797')
diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD
index 73cb7c3f6..5589cae0c 100644
--- a/extra/libpeas/PKGBUILD
+++ b/extra/libpeas/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156912 2012-04-23 09:08:54Z ibiru $
+# $Id: PKGBUILD 157401 2012-04-28 09:26:44Z allan $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=libpeas
pkgver=1.4.0
-pkgrel=1
+pkgrel=2
pkgdesc="A GObject-based plugins engine"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gtk.org/"
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 56d5eef06..9db1106ec 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156598 2012-04-21 13:33:33Z ibiru $
+# $Id: PKGBUILD 157451 2012-04-28 13:13:49Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
@@ -18,7 +18,7 @@ sha1sums=('3e461d9ede5fab3fb59be6a9f0cbc52121d536c4')
build() {
cd "$pkgname-$pkgver"
- ./configure --prefix=/usr \
+ PYTHON2=/usr/bin/python2 ./configure --prefix=/usr \
--enable-python-binding \
--with-libgeoip=system
make
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index 262416a74..9e73b73fa 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156168 2012-04-15 04:29:31Z heftig $
+# $Id: PKGBUILD 157403 2012-04-28 09:26:49Z allan $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -11,7 +11,7 @@
pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
pkgver=3.0
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64' 'mips64el')
url="http://llvm.org/"
license=('custom:University of Illinois/NCSA Open Source License')
@@ -34,6 +34,11 @@ sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477'
build() {
cd "$srcdir/$pkgname-$pkgver.src"
+ # Build without -ftree-pre as a workaround for clang segfaulting on x86_64
+ # https://bugzilla.redhat.com/show_bug.cgi?id=791365
+ CFLAGS+=' -fno-tree-pre'
+ CXXFLAGS+=' -fno-tree-pre'
+
# At the present, clang must reside inside the LLVM source code tree to build
# See http://llvm.org/bugs/show_bug.cgi?id=4840
rm -rf tools/clang
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index 5c88e297d..437ada2f5 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 156934 2012-04-23 09:09:23Z ibiru $
+# $Id: PKGBUILD 157405 2012-04-28 09:26:53Z allan $
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
pkgname=mutter
pkgver=3.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="A window manager for GNOME"
arch=(i686 x86_64)
license=('GPL')
diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD
index 2edd8e0f1..05b539888 100644
--- a/extra/nx-common/PKGBUILD
+++ b/extra/nx-common/PKGBUILD
@@ -1,59 +1,51 @@
-# $Id: PKGBUILD 153969 2012-03-21 06:21:07Z pierre $
+# $Id: PKGBUILD 157435 2012-04-28 09:58:39Z andyrtr $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
pkgname=nx-common
pkgver=3.5.0
-pkgrel=4
+pkgrel=5
pkgdesc="NoMachine NX common package for client and server"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://nomachine.com/"
-depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'bash')
-makedepends=('xorg-server-devel')
-source=( #Compression libs and proxy sources
- http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz
- http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
- http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
- nxcompsh-gcc43.patch
- nx-3.5.0-libpng15.patch)
-options=(!libtool)
-md5sums=('ad8c0f133122c6d07732ca69c8759410'
- '84ade443b79ea079380b754aba9d392e'
+depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') # 'bash'
+makedepends=('xorg-server-devel' 'nx-headers')
+source=(http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
+ http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
+ nxcompsh-gcc43.patch)
+options=('!libtool')
+md5sums=('84ade443b79ea079380b754aba9d392e'
'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
- 'b6c279654dac421fc3dd1a27d66ff53c'
- '2966353cabb96829eab291212ef078dc')
+ 'b6c279654dac421fc3dd1a27d66ff53c')
build() {
- # nxcomp
- cd ${srcdir}/nxcomp
- patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
-
- ./configure --prefix=/opt/NX
- make
# nxcompsh
cd ${srcdir}/nxcompsh
patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
-
- ./configure --prefix=/opt/NX
+ ./configure --prefix=/usr/lib/nx
make
+
# nxssh
cd ${srcdir}/nxssh
- ./configure --prefix=/opt/NX
+ sed -i "s:NX.h:nx/NX.h:g" clientloop.c packet.c proxy.c
+ ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib
make
}
package() {
- mkdir -p ${pkgdir}/opt/NX/bin
- mkdir -p ${pkgdir}/opt/NX/lib
+ install -dm755 ${pkgdir}/usr/{bin,lib/nx}
- # nxcomp
- cd ${srcdir}/nxcomp
- cp -a libXcomp.so* ${pkgdir}/opt/NX/lib
# nxcompsh
cd ${srcdir}/nxcompsh
- cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib
+ cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx
+ cd ${pkgdir}/usr/lib/
+ ln -sv /usr/lib/nx/libXcompsh.so{,.3,.3.5.0} .
+ # ^ really needed?
+
# nxssh
cd ${srcdir}/nxssh
- install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh
+ install -D -m755 nxssh ${pkgdir}/usr/lib/nx/bin/nxssh
+ cd ${pkgdir}/usr/bin
+ ln -sv /usr/lib/nx/bin/nxssh .
}
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
new file mode 100644
index 000000000..664358563
--- /dev/null
+++ b/extra/nx/PKGBUILD
@@ -0,0 +1,116 @@
+# $Id: PKGBUILD 157433 2012-04-28 09:58:35Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
+pkgver=3.5.0.12
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/"
+license=('GPL')
+options=('!makeflags')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
+ 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+ )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
+ nx-x11.ld.so.conf.d)
+md5sums=('a2011e034a318016cf2260c30a567301'
+ 'f2ec60c7e2d81bef2f7292d2b33681a6')
+
+build() {
+ cd "${srcdir}/nx-libs_$pkgver"
+ make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+ # fake install
+ mkdir $srcdir/fakeinstall
+ make DESTDIR="$srcdir/fakeinstall" install
+}
+
+package_libxcomp() {
+
+ pkgdesc="NX X compression library"
+ depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
+
+ install -dm755 ${pkgdir}/usr/lib/nx/lib
+ cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib
+ cd ${pkgdir}/usr/lib/
+ ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} .
+}
+
+package_nxproxy() {
+
+ pkgdesc="NX proxy"
+ depends=('libxcomp')
+
+ install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
+ cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin
+ cd ${pkgdir}/usr/lib/nx
+ ln -sv /usr/lib/nx/bin/nxproxy .
+
+ # the wrapper
+ cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin
+ chmod +x ${pkgdir}/usr/bin/nxproxy
+ cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1
+}
+
+package_nx-xcompext() {
+
+ pkgdesc="Xcompext/Xcompshad library for NX"
+ depends=('libxcomp' 'nx-x11')
+
+ install -dm755 ${pkgdir}/usr/lib/nx
+ cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 ${pkgdir}/usr/lib/nx
+ cd ${pkgdir}/usr/lib/nx
+ ln -sv libXcompext.so.3.5.0 libXcompext.so.3
+ ln -sv libXcompext.so.3.5.0 libXcompext.so
+ cd ${pkgdir}/usr/lib/
+ ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
+}
+
+package_nx-x11() {
+
+ pkgdesc="NX-X11 lib for the NX framework"
+ depends=('libxcomp')
+
+ install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/bin}
+ cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx
+
+ cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx/bin
+ cd ${pkgdir}/usr/lib/nx
+ ln -sv /usr/lib/nx/bin/nxauth .
+
+ # the wrapper
+ cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin
+ chmod +x ${pkgdir}/usr/bin/nxauth
+
+ install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf"
+}
+
+package_nxagent() {
+
+ pkgdesc="NX X server based on Xnest"
+ depends=('nx-xcompext')
+
+ install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin}
+ cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx/bin
+ cd ${pkgdir}/usr/lib/nx
+ ln -sv /usr/lib/nx/bin/nxagent .
+
+ # the wrapper
+ cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin
+ chmod +x ${pkgdir}/usr/bin/nxagent
+ # required nxcompshad libs
+ cp -a ${srcdir}/nx-libs_$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx
+ cd ${pkgdir}/usr/lib/nx
+ ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3
+ ln -sv libXcompshad.so.3.5.0 libXcompshad.so
+ cd ${pkgdir}/usr/lib/
+ ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
+}
+
+package_nx-headers() {
+
+ pkgdesc="NX headers"
+
+ install -dm755 ${pkgdir}/usr/include/nx
+ cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
+}
diff --git a/extra/nx/nx-x11.ld.so.conf.d b/extra/nx/nx-x11.ld.so.conf.d
new file mode 100644
index 000000000..5d15cb6e2
--- /dev/null
+++ b/extra/nx/nx-x11.ld.so.conf.d
@@ -0,0 +1 @@
+/usr/lib/nx/
diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index a380da235..c7873f444 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146236 2012-01-06 17:00:30Z heftig $
+# $Id: PKGBUILD 157462 2012-04-28 17:12:24Z heftig $
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
# Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -8,7 +8,7 @@ pkgbase=pulseaudio
pkgname=(pulseaudio libpulse)
pkgdesc="A featureful, general-purpose sound server"
pkgver=1.1
-pkgrel=1
+pkgrel=3
arch=(i686 x86_64 mips64el)
url="http://pulseaudio.org/"
license=(GPL LGPL)
@@ -42,7 +42,7 @@ build() {
}
package_pulseaudio() {
- depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc
+ depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb udev fftw orc
libsamplerate)
optdepends=('avahi: zeroconf support'
'bluez: bluetooth support'
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 4faada42b..db9df4f35 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156960 2012-04-23 09:10:04Z ibiru $
+# $Id: PKGBUILD 157407 2012-04-28 09:26:56Z allan $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgbase=pygobject
pkgname=(python-gobject python2-gobject pygobject-devel)
pkgver=3.2.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="https://live.gnome.org/PyGObject"
license=('LGPL')
diff --git a/extra/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD
index a66600d53..b8aa6dfb5 100644
--- a/extra/pygobject2/PKGBUILD
+++ b/extra/pygobject2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139421 2011-10-01 19:01:05Z ibiru $
+# $Id: PKGBUILD 157409 2012-04-28 09:27:01Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=pygobject2
pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
pkgver=2.28.6
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64' 'mips64el')
url="http://www.pygtk.org/"
license=('LGPL')
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 0b5a21ac3..aefd1ba8e 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 156459 2012-04-18 12:20:59Z stephane $
+# $Id: PKGBUILD 157411 2012-04-28 09:27:08Z allan $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=python
pkgver=3.2.3
-pkgrel=1
+pkgrel=3
_pybasever=3.2
pkgdesc="Next generation of the python high-level scripting language"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index a18d2421d..5f1b90ce5 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148573 2012-02-03 20:15:23Z eric $
+# $Id: PKGBUILD 157415 2012-04-28 09:27:18Z allan $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=racket
pkgver=5.2.1
-pkgrel=1
+pkgrel=2
pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development"
arch=('i686' 'x86_64' 'mips64el')
url="http://racket-lang.org/"
@@ -14,7 +14,7 @@ options=('!libtool' '!strip')
install=racket.install
source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \
drracket.desktop)
-sha1sums=('a4ea408818236f8eaf937291dd641fd73a997793'
+sha1sums=('b51cdd8b9825edb60e5c2c80472cec8220918cd1'
'a20808f6b250225704856f82a544681a962a299d')
build() {
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index 0539510f8..2b947339b 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156962 2012-04-23 09:10:07Z ibiru $
+# $Id: PKGBUILD 157417 2012-04-28 09:27:22Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=rhythmbox
pkgver=2.96
-pkgrel=2
+pkgrel=3
pkgdesc="An iTunes-like music playback and management application"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 0eb1a83c1..2a8603f5e 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=ruby
pkgver=1.9.3_p194
-pkgrel=1
+pkgrel=2
pkgdesc='An object-oriented language for quick and easy programming'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.ruby-lang.org/en/'
diff --git a/extra/seed/PKGBUILD b/extra/seed/PKGBUILD
index bc02377ba..9dabdad34 100644
--- a/extra/seed/PKGBUILD
+++ b/extra/seed/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139429 2011-10-01 19:01:18Z ibiru $
+# $Id: PKGBUILD 157423 2012-04-28 09:27:33Z allan $
#Maintainer : Ionut Biru <ibiru@archlinux.org>
#Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=seed
pkgver=3.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="Library and interpreter for JavaScript with GObject type system bindings."
arch=('i686' 'x86_64' 'mips64el')
url="http://live.gnome.org/Seed/"
diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD
index 762e2c2af..f6aaa75b4 100644
--- a/extra/squid/PKGBUILD
+++ b/extra/squid/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 151208 2012-02-25 07:43:33Z pierre $
+# $Id: PKGBUILD 157558 2012-04-29 00:21:17Z eric $
# Maintainer: Kevin Piche <kevin@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=squid
pkgver=3.1.19
-pkgrel=1
+pkgrel=2
pkgdesc="A full-featured Web proxy cache server."
arch=('i686' 'x86_64' 'mips64el')
url="http://www.squid-cache.org"
-depends=('openssl' 'pam' 'cron' 'perl' 'libtool')
+depends=('openssl' 'pam' 'cron' 'perl' 'libltdl')
makedepends=('libcap')
license=('GPL')
backup=('etc/squid/squid.conf' 'etc/squid/mime.conf' 'etc/conf.d/squid')
diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD
index 4c12fd746..c0a7e7b23 100644
--- a/extra/sushi/PKGBUILD
+++ b/extra/sushi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156968 2012-04-23 09:10:15Z ibiru $
+# $Id: PKGBUILD 157425 2012-04-28 09:27:36Z allan $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=sushi
pkgver=0.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="A quick previewer for Nautilus"
arch=(i686 x86_64)
url="http://www.gnome.org"
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 39ef02531..b1adc4e06 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 156988 2012-04-23 09:10:41Z ibiru $
+# $Id: PKGBUILD 157429 2012-04-28 09:27:53Z allan $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgbase=totem
pkgname=('totem' 'totem-plugin')
pkgver=3.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
url="http://www.gnome.org"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD
index 41a6bd83d..2817c7856 100644
--- a/extra/tumbler/PKGBUILD
+++ b/extra/tumbler/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 154454 2012-03-28 18:48:51Z foutrelis $
+# $Id: PKGBUILD 157532 2012-04-28 22:21:55Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Jan Jezek <honzin.jezek@gmail.com>
pkgname=tumbler
-pkgver=0.1.24
+pkgver=0.1.25
pkgrel=1
pkgdesc="D-Bus service for applications to request thumbnails"
arch=('i686' 'x86_64' 'mips64el')
@@ -22,7 +22,7 @@ optdepends=('ffmpegthumbnailer: for video thumbnails'
'freetype2: for font thumbnails')
options=('!libtool')
source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2)
-sha256sums=('18fe74900851211cbd10eff4e9e487229284d1701aa60f0c3d35cdd457c72566')
+sha256sums=('02d5de508d8c18692a25a832a9280c2043f6b7c90dd3fcbd87f5955337015546')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-mount-plugin/PKGBUILD b/extra/xfce4-mount-plugin/PKGBUILD
index e32504ee4..a9fb4d1ec 100644
--- a/extra/xfce4-mount-plugin/PKGBUILD
+++ b/extra/xfce4-mount-plugin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157202 2012-04-25 17:31:31Z eric $
+# $Id: PKGBUILD 157457 2012-04-28 16:24:13Z eric $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
pkgname=xfce4-mount-plugin
-pkgver=0.6.2
+pkgver=0.6.3
pkgrel=1
pkgdesc="Plugin for the Xfce4 panel to mount and unmount volumes"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('intltool')
options=('!libtool')
install=${pkgname}.install
source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('dbbf8e29c50ec1cd9ba0fa65f7255ca0788a372e')
+sha1sums=('bbc031f8518dc873d3a3ef42b3e228eeb0c9bb86')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"