diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:44:47 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:44:47 -0300 |
| commit | c3b94090a6330f678ade2f767e76ab7802d3463e (patch) | |
| tree | e3d2321dce46bfdbc070fcee19e2852566510fe8 /extra | |
| parent | 652c41cc5fd8dc5f23ef6a6c93f488911e1054c7 (diff) | |
| parent | 33feb015eb09eee76827f359e685fce981d88111 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
community/flumotion/PKGBUILD
community/gnash/PKGBUILD
community/kadu/PKGBUILD
community/mythplugins/PKGBUILD
community/performous/PKGBUILD
community/sleuthkit/PKGBUILD
community/virtualbox/PKGBUILD
community/wbar/PKGBUILD
core/attr/PKGBUILD
core/binutils/PKGBUILD
core/heimdal/PKGBUILD
core/sqlite3/PKGBUILD
extra/acpid/PKGBUILD
extra/apache-ant/PKGBUILD
extra/aria2/PKGBUILD
extra/boost/PKGBUILD
extra/bs/PKGBUILD
extra/bzr/PKGBUILD
extra/cvsps/PKGBUILD
extra/dosbox/PKGBUILD
extra/ettercap-gtk/PKGBUILD
extra/fetchmail/PKGBUILD
extra/gnome-desktop-sharp/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gptfdisk/PKGBUILD
extra/gqmpeg/PKGBUILD
extra/gstreamer0.10-base/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk-theme-switch2/PKGBUILD
extra/icecast/PKGBUILD
extra/kdeedu/PKGBUILD
extra/kmldonkey/PKGBUILD
extra/kmplayer/PKGBUILD
extra/libbtctl/PKGBUILD
extra/libftdi/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpst/PKGBUILD
extra/libx86/PKGBUILD
extra/lsdvd/PKGBUILD
extra/mc/PKGBUILD
extra/monotone/PKGBUILD
extra/multitail/PKGBUILD
extra/nbsmtp/PKGBUILD
extra/nickle/PKGBUILD
extra/nppangband/PKGBUILD
extra/numlockx/PKGBUILD
extra/pidgin/PKGBUILD
extra/poppler/PKGBUILD
extra/python-gtkglext/PKGBUILD
extra/scim/PKGBUILD
extra/socat/PKGBUILD
extra/speedcrunch/PKGBUILD
extra/transmission/PKGBUILD
extra/vbetool/PKGBUILD
extra/vlc/PKGBUILD
extra/xchat-gnome/xchat-gnome.install
libre/kernel26-libre/PKGBUILD
libre/pacman/PKGBUILD
libre/xchat-gnome-libre/PKGBUILD
libre/xchat-gnome-libre/gtk2-2.20.patch
libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
libre/xchat-gnome-libre/xchat-gnome.install
multilib/nspluginwrapper/PKGBUILD
testing/libgweather/libgweather.install
testing/mesa/PKGBUILD
Diffstat (limited to 'extra')
222 files changed, 2631 insertions, 2516 deletions
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index 1541ff19c..5f0c6e93a 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 121312 2011-04-30 14:57:48Z ibiru $ +# $Id: PKGBUILD 124664 2011-05-23 20:15:43Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.10 +pkgver=0.6.12 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64) @@ -11,7 +11,7 @@ depends=('dbus-glib' 'polkit') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2) -md5sums=('e43d0ea4c0cb9291e60f800d9c2d0ba4') +md5sums=('2fcf38a65d574dd2fe6ba182ff4de053') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD index a836d69f8..f6cefe7b7 100644 --- a/extra/acpid/PKGBUILD +++ b/extra/acpid/PKGBUILD @@ -1,42 +1,43 @@ -# $Id: PKGBUILD 65410 2010-01-28 20:47:17Z ibiru $ -# Maintainer: Thayer Williams <thayer@archlinux.org> +# $Id: PKGBUILD 124267 2011-05-18 16:31:02Z andrea $ +# Maintainer: +# Contributor: xduugu # Contributor: Manolis Tzanidakis -# Contributor: Judd Vinet <jvinet@zeroflux.org> +# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us pkgname=acpid -pkgver=1.0.10 -pkgrel=3 -pkgdesc="A daemon for delivering ACPI power management events" -arch=('i686' 'x86_64' 'mips64el') -url="http://acpid.sourceforge.net" +pkgver=2.0.10 +pkgrel=1 +pkgdesc="A daemon for delivering ACPI power management events with netlink support" +arch=('i686' 'x86_64') +url="http://tedfelix.com/linux/acpid-netlink.html" license=('GPL') -depends=(glibc) -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - acpid - acpid.conf.d - anything - handler.sh) +depends=('bash') +source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz" + 'acpid' + 'anything' + 'handler.sh' + 'acpid.conf.d') +replaces=('acpid2') backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid') build() { - cd $srcdir/$pkgname-$pkgver - /usr/bin/make || return 1 - /bin/install -d -m0755 $pkgdir/usr/bin || return 1 - /usr/bin/make INSTPREFIX=$pkgdir \ - MAN8DIR=$pkgdir/usr/share/man/man8 install || return 1 + cd "${srcdir}"/$pkgname-$pkgver + make +} - # install our supplementary scripts - /bin/install -D -m0755 $srcdir/acpid $pkgdir/etc/rc.d/acpid || return 1 - /bin/install -D -m0644 $srcdir/acpid.conf.d $pkgdir/etc/conf.d/acpid || return 1 - /bin/install -D -m0644 $srcdir/anything $pkgdir/etc/acpi/events/anything || return 1 - /bin/install -D -m0755 $srcdir/handler.sh $pkgdir/etc/acpi/handler.sh || return 1 +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install - # set world readable bit on the acpid binary - /bin/chmod 755 $pkgdir/usr/sbin/acpid || return 1 -} + install -Dm755 "$srcdir/acpid" "$pkgdir/etc/rc.d/acpid" + install -Dm644 "$srcdir/anything" "$pkgdir/etc/acpi/events/anything" + install -Dm755 "$srcdir/handler.sh" "$pkgdir/etc/acpi/handler.sh" + install -Dm644 "$srcdir/acpid.conf.d" "$pkgdir/etc/conf.d/acpid" -md5sums=('61156ef32015c56dc0f2e3317f4ae09e' - 'd9ca7f71f520238a0448fab105a23fe9' - '91fdb3709c878eed757d192a420251a1' + chmod 755 "${pkgdir}"/usr/sbin/acpid +} +md5sums=('d5dd88bcfaa4a0bf51905e95115da6df' + '955490c4db5233ec44461db694b873a4' '2d37b98d6e74bab815604b8b48c6cfd4' - '0e8dd13793b1baa79a745f4034888367') + '7b2e4c299af5eb87e1a81c07b6916c97' + '929c6d2e91295c22ed9ec6212d7eabef') diff --git a/extra/acpid/acpid b/extra/acpid/acpid index 9a4ab8ac7..9177c8207 100644 --- a/extra/acpid/acpid +++ b/extra/acpid/acpid @@ -19,7 +19,7 @@ case "$1" in ;; stop) stat_busy "Stopping acpid" - [ ! -z "$PID" ] && kill $PID &> /dev/null + [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else diff --git a/extra/acpid/acpid.conf.d b/extra/acpid/acpid.conf.d index 25c9cc1ef..b60103a2d 100644 --- a/extra/acpid/acpid.conf.d +++ b/extra/acpid/acpid.conf.d @@ -3,4 +3,3 @@ # ACPID_ARGS="" - diff --git a/extra/acpid/handler.sh b/extra/acpid/handler.sh index ad31d1aa9..518a62dea 100644 --- a/extra/acpid/handler.sh +++ b/extra/acpid/handler.sh @@ -26,7 +26,7 @@ case "$1" in ;; ac_adapter) case "$2" in - AC) + AC|ACAD|ADP0) case "$4" in 00000000) echo -n $minspeed >$setspeed diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 7b5d011c9..1e5037778 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122924 2011-05-07 10:20:40Z andrea $ +# $Id: PKGBUILD 124793 2011-05-24 13:10:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi pkgver=1.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org/akonadi' diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index ea8f93893..7a8cf3780 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123337 2011-05-10 13:19:54Z giovanni $ +# $Id: PKGBUILD 124068 2011-05-16 14:49:29Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10552 +pkgver=10561 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('b3685a792e92c2900dbb3eaeba7cc65d') +md5sums=('1f8957c35e8bd2496aa83b5ba318f9bd') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index e8f8112bc..e161588d0 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122589 2011-05-04 18:41:26Z ibiru $ +# $Id: PKGBUILD 124683 2011-05-23 21:00:48Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgname=anjuta -pkgver=3.0.1.0 -pkgrel=2 +pkgver=3.0.2.0 +pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,7 +16,7 @@ url="http://anjuta.sourceforge.net/" install=anjuta.install source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) options=('!libtool' '!emptydirs') -sha256sums=('dbda189f453e0f9baecb35e85d59df92613668f7f4be08207d635cff3abb7261') +sha256sums=('5dce2cf455f9feeea31aea6bce5bae1dbd35793ba8c8009675608dae4d67bac0') build() { cd "${srcdir}/anjuta-${pkgver}" diff --git a/extra/apache-ant/PKGBUILD b/extra/apache-ant/PKGBUILD deleted file mode 100644 index 313b6a754..000000000 --- a/extra/apache-ant/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 107828 2011-01-27 04:37:07Z paul $ -# Contributor: Andrew Wright <andreww@photism.org> -# Maintainer: Paul Mattal <paul@archlinux.org> - -pkgname=apache-ant -pkgver=1.8.2 -pkgrel=1 -pkgdesc="A java-based build tool." -arch=('i686' 'x86_64' 'mips64el') -license=('APACHE') -url="http://ant.apache.org/" -depends=('java-runtime') -optdepends=('junit: to jave junit on the classpath in javac tasks') -source=(http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2 - ${pkgname}.sh - ant_diagnostics.patch) -md5sums=('9e9ae9fc7352960191489a1286fb0928' - '593ee6ebd9b8ec321534a028e686880f' - 'cbaab423be40a6e63f0fde901b91eb50') - -build() { - # install profile.d script - install -dm755 ${pkgdir}/etc/profile.d || return 1 - install -m755 ${srcdir}/${pkgname}.sh ${pkgdir}/etc/profile.d/ || return 1 - - # Get the ANT_HOME env var - source ${srcdir}/${pkgname}.sh || return 1 - - cd ${srcdir}/${pkgname}-${pkgver} - install -dm755 ${pkgdir}/${ANT_HOME}/{bin,lib} || return 1 - - install -m644 ./lib/*.jar ${pkgdir}/${ANT_HOME}/lib || return 1 - cp -Rp ./etc ${pkgdir}/${ANT_HOME} || return 1 - - # Do not copy Windows .bat/.cmd files - find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \ - -exec install -m755 {} ${pkgdir}/${ANT_HOME}/bin \; || return 1 - - # symlink to junit so it's on the javac build path for ant - # matches behavior on ubuntu 9 and makes sense for compatibility - # http://bugs.archlinux.org/task/15229 - cd $startdir/pkg/usr/share/java/apache-ant/lib || return 1 - ln -s ../../junit.jar . || return 1 - cd - || return 1 - - # The license says the NOTICE file should be redistributed for derivative - # works, so lets supply it. - install -dm755 ${pkgdir}/usr/share/licenses/${pkgname} || return 1 - install -m644 LICENSE NOTICE ${pkgdir}/usr/share/licenses/${pkgname} || return 1 -} - diff --git a/extra/apache-ant/ant_diagnostics.patch b/extra/apache-ant/ant_diagnostics.patch deleted file mode 100644 index 38148b45c..000000000 --- a/extra/apache-ant/ant_diagnostics.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/src/main/org/apache/tools/ant/Diagnostics.java -+++ b/src/main/org/apache/tools/ant/Diagnostics.java -@@ -179,7 +179,10 @@ - * @param clazz the class to get the information from.
- * @since Ant 1.8.0
- */
-- private static URL getClassLocation(Class clazz) {
-+ private static URL getClassLocation(Class clazz) { -+ if (clazz.getProtectionDomain().getCodeSource() == null) { -+ return null; -+ }
- return clazz.getProtectionDomain().getCodeSource().getLocation();
- }
-
-@@ -241,7 +244,7 @@ - }
- Transformer transformer = null;
- try {
-- transformer = transformerFactory.newTransformer();
-+ transformer = transformerFactory.newTransformer(); - } catch (Exception e) {
- // ignore
- ignoreThrowable(e);
diff --git a/extra/apache-ant/apache-ant.sh b/extra/apache-ant/apache-ant.sh deleted file mode 100644 index ab602fb28..000000000 --- a/extra/apache-ant/apache-ant.sh +++ /dev/null @@ -1,3 +0,0 @@ -export ANT_HOME=/usr/share/java/apache-ant -export PATH=$PATH:$ANT_HOME/bin - diff --git a/extra/aria2/PKGBUILD b/extra/aria2/PKGBUILD deleted file mode 100644 index e34ede3f5..000000000 --- a/extra/aria2/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 117352 2011-03-31 07:19:05Z eric $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=aria2 -pkgver=1.11.1 -pkgrel=1 -pkgdesc="Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink" -arch=('i686' 'x86_64' 'mips64el') -url="http://aria2.sourceforge.net/" -license=('GPL') -depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates') -source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2) -md5sums=('da785645a6d92450b0a54f384202ba6b') -sha1sums=('b3b37cc7363305d55e86dcd74a73dc493ecfa530') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/arj/PKGBUILD b/extra/arj/PKGBUILD index d62daea42..bf0a734bf 100644 --- a/extra/arj/PKGBUILD +++ b/extra/arj/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 49803 2009-08-16 14:37:35Z jgc $ -# Maintainer: Travis Willard <travisw@wmpub.ca> +# $Id: PKGBUILD 124090 2011-05-16 15:11:39Z andrea $ +# Maintainer: +# Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Gergely Tamas <dice@mfa.kfki.hu> pkgname=arj pkgver=3.10.22 -pkgrel=5 +pkgrel=6 pkgdesc="Free and portable clone of the ARJ archiver" url="http://arj.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') +options=('!makeflags') depends=('glibc') -makedepends=('autoconf') -options=(!makeflags) -source=(http://downloads.sourceforge.net/sourceforge/arj/$pkgname-$pkgver.tar.gz +source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" 001_arches_align.patch 002_no_remove_static_const.patch 003_64_bit_clean.patch @@ -22,33 +22,28 @@ md5sums=('f263bf3cf6d42a8b7e85b4fb514336d3' '395dfa8cc500ffae648777f8f241be88' '56b3cf96ec485b0d824761457417fcc0' '4630a7254dfc6c8d8c7e696aa4a58f4a') -sha1sums=('e8470f480e9eee14906e5485a8898e5c24738c8b' - '7f8904f8c89bacbbeec8c431d627efbb8da2f259' - '919a3c02a1e039803502c21175d69f7703d13026' - 'd506338e34b40ef5cac6ec14c858fd651a354aaf' - '4c9481a4b196c4f56fb44fcd3b9362222d6cbe58') build() { cd "${srcdir}/${pkgname}-${pkgver}" # Add gentoo patches - patch -Np1 -i "${srcdir}/001_arches_align.patch" || return 1 - patch -Np1 -i "${srcdir}/002_no_remove_static_const.patch" || return 1 - patch -Np1 -i "${srcdir}/003_64_bit_clean.patch" || return 1 - patch -Np1 -i "${srcdir}/arj-3.10.22-custom-printf.patch" || return 1 + patch -p1 -i "${srcdir}/001_arches_align.patch" + patch -p1 -i "${srcdir}/002_no_remove_static_const.patch" + patch -p1 -i "${srcdir}/003_64_bit_clean.patch" + patch -p1 -i "${srcdir}/arj-3.10.22-custom-printf.patch" - # Build! cd gnu - aclocal || return 1 - autoconf || return 1 + aclocal + autoconf rm -f config.{guess,sub} - _autover=$(automake --version | head -n1 | awk '{ print $4 }') - cp /usr/share/automake-${_autover}/config.{guess,sub} . || return 1 - ./configure --prefix=/usr || return 1 + cp /usr/share/automake-1.11/config.{guess,sub} . + ./configure --prefix=/usr cd .. - make prepare || return 1 - make || return 1 + make prepare + make +} - # Install! - make DESTDIR="${pkgdir}" install || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD index e0034efe3..bc394106c 100644 --- a/extra/at-spi2-atk/PKGBUILD +++ b/extra/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120714 2011-04-26 05:27:06Z jgc $ +# $Id: PKGBUILD 124722 2011-05-24 07:05:08Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-atk -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ install=at-spi2-atk.install options=('!libtool') groups=('gnome') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('d78a88067a53db479d3c7c1ce31f095b1d4962e44e653800a12599ade397dafc') +sha256sums=('4b958d3701afd0c8f83ecf297750032f06a07491007d85173997ce7371688725') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD index f826d6763..c3dd97d41 100644 --- a/extra/at-spi2-core/PKGBUILD +++ b/extra/at-spi2-core/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 120767 2011-04-26 14:35:02Z ibiru $ +# $Id: PKGBUILD 124714 2011-05-24 07:02:56Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-core -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') groups=('gnome') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('f0880d816a554c0560e9f6aea786614e8ab439e17189d383a83ed7eebd9e328b') +sha256sums=('15e13433d1923c96139c109568295313de636a83dbb3700c8467fcb9c5e4e6ce') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 0991e44fb..833881841 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119918 2011-04-16 22:59:51Z bisson $ +# $Id: PKGBUILD 124404 2011-05-20 15:01:13Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=2.5.0 +pkgver=2.5.1 pkgrel=1 pkgdesc='Lightweight, GTK2-based advanced audio player focused on audio quality' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL3') depends=('gtk2' 'libmcs' 'dbus-glib' 'libguess' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('unzip: zipped skins support') source=("http://distfiles.atheme.org/$pkgname-$pkgver.tgz") -sha1sums=('df76909c83a69b42197dab0702e0846295eceb1f') +sha1sums=('886e1cde03069b3dee15a6df04e3e8f5934018f1') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD index 0e97d0b5c..93d71053f 100644 --- a/extra/avogadro/PKGBUILD +++ b/extra/avogadro/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 120742 2011-04-26 09:43:00Z andrea $ +# $Id: PKGBUILD 124796 2011-05-24 13:18:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> pkgname=avogadro pkgver=1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="An advanced molecular editor based on Qt" arch=('i686' 'x86_64' 'mips64el') url="http://avogadro.openmolecules.net/wiki/Main_Page" license=('GPL2') -depends=('eigen' 'openbabel' 'python2-qt' 'boost-libs' 'glew' 'python2-numpy') +depends=('eigen' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') makedepends=('cmake' 'boost') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('92c2702c1980f70fb6d87a1a58147911') diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD index 3f97b8415..587b7abff 100644 --- a/extra/banshee/PKGBUILD +++ b/extra/banshee/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 122335 2011-05-03 22:31:33Z ibiru $ +# $Id: PKGBUILD 124622 2011-05-23 14:30:18Z ibiru $ # Contributor: György Balló <ballogy@freestart.hu> pkgname=banshee pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Music management and playback for GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://banshee.fm/" license=('MIT') -depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'ipod-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp') +depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp') makedepends=('intltool' 'gnome-doc-utils') optdepends=('gstreamer0.10-good-plugins: Extra media codecs' 'gstreamer0.10-ugly-plugins: Extra media codecs' diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD index bb06cf506..5d3424581 100644 --- a/extra/bftpd/PKGBUILD +++ b/extra/bftpd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 95186 2010-10-16 23:03:07Z thomas $ +# $Id: PKGBUILD 123903 2011-05-14 09:54:29Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=bftpd -pkgver=3.1 +pkgver=3.4 pkgrel=1 pkgdesc="Small, easy-to-configure FTP server" arch=(i686 x86_64 'mips64el') @@ -10,30 +10,44 @@ url="http://bftpd.sourceforge.net/" license=('GPL') depends=('glibc' 'pam') install=bftpd.install -backup=(etc/bftpd.conf etc/logrotate.d/bftpd etc/pam.d/bftpd) +backup=(etc/bftpd.conf + etc/logrotate.d/bftpd + etc/pam.d/bftpd + etc/xinetd.d/bftpd) source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz - bftpd.rc bftpd.logrotate bftpd.pam) -md5sums=('1aeda6f3da2b10dcf5dca1b1d8466c48' + bftpd.rc + bftpd.logrotate + bftpd.pam + bftpd.xinetd) +md5sums=('dcee04b5fad8c918e86c49712424fcdd' '56a1bf7738a6db2b2cff89e611f4f11a' '853680dad0df39d0b4d2fb43d4be430a' - '96f82c38f3f540b53f3e5144900acf17') + '96f82c38f3f540b53f3e5144900acf17' + 'ff70fd962666f4d74749a1c68167a966') build() { - cd ${srcdir}/$pkgname + cd "${srcdir}"/$pkgname + # The bftpd author keeps screwing up the release tarballs + rm -f config.{cache,status} ./configure --prefix=/usr --enable-pam --mandir=/usr/share/man - make || return 1 + make } package() { - cd ${srcdir}/$pkgname - install -d -m755 ${pkgdir}/usr/{sbin,share/man/man8} - install -d -m755 ${pkgdir}/var/run/bftpd - install -d -m755 ${pkgdir}/var/log - install -D -m644 ${srcdir}/bftpd.logrotate ${pkgdir}/etc/logrotate.d/bftpd || return 1 - install -D -m755 ${srcdir}/bftpd.rc ${pkgdir}/etc/rc.d/bftpd || return 1 - make DESTDIR=${pkgdir} install || return 1 - rm -f ${pkgdir}/var/log/bftpd.log - rmdir ${pkgdir}/var/log - mkdir -p ${pkgdir}/etc/pam.d - cp ${srcdir}/bftpd.pam ${pkgdir}/etc/pam.d/bftpd || return 1 + cd "${srcdir}"/$pkgname + install -d -m755 "${pkgdir}"/usr/{sbin,share/man/man8} + install -d -m755 "${pkgdir}"/var/log + install -D -m644 "${srcdir}"/bftpd.logrotate "${pkgdir}"/etc/logrotate.d/bftpd + install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd + make DESTDIR="${pkgdir}" install + # Remove log file and /var/run from the package + rm -f "${pkgdir}"/var/log/bftpd.log + rmdir "${pkgdir}"/var/{run/bftpd,run,log,} + # Install PAM file + mkdir -p "${pkgdir}"/etc/pam.d + cp "${srcdir}"/bftpd.pam "${pkgdir}"/etc/pam.d/bftpd + # Install xinetd file + install -D -m644 "${srcdir}"/bftpd.xinetd "${pkgdir}"/etc/xinetd.d/bftpd + # Fix default in config file + sed 's|#ROOTDIR="/path/for/anonymous/user"|# bftpd interprets ROOTDIR="%h" (the default), as ROOTDIR="/" for the anonymous user, override it\n ROOTDIR="/srv/ftp"|' -i "${pkgdir}"/etc/bftpd.conf } diff --git a/extra/bftpd/bftpd.xinetd b/extra/bftpd/bftpd.xinetd new file mode 100644 index 000000000..68c931243 --- /dev/null +++ b/extra/bftpd/bftpd.xinetd @@ -0,0 +1,11 @@ +service ftp +{ + socket_type = stream + wait = no + user = root + server = /usr/sbin/bftpd + server_args = -i + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +} diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD index 8878c6f26..173ddd0f4 100644 --- a/extra/bind/PKGBUILD +++ b/extra/bind/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 122962 2011-05-07 14:45:29Z bisson $ +# $Id: PKGBUILD 124551 2011-05-22 22:52:52Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> @@ -8,7 +8,7 @@ pkgname=bind # Use a period and not a hyphen before the patch level for proper versioning. pkgver=9.8.0.P1 _pkgver=9.8.0-P1 -pkgrel=1 +pkgrel=3 pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols' arch=('i686' 'x86_64' 'mips64el') @@ -17,12 +17,11 @@ license=('custom:ISC') provides=('dns-server') backup=('etc/logrotate.d/named' 'etc/conf.d/named' - 'etc/named.conf' - 'etc/rndc.key') -depends=('openssl' 'libxml2') + 'etc/named.conf') +depends=('openssl' 'krb5' 'libxml2') options=('!makeflags' '!libtool') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz" - 'ftp://ftp.rs.internic.net/domain/db.cache' + 'root.hint::ftp://ftp.rs.internic.net/domain/db.cache' 'so_bsdcompat.patch' 'notools.patch' 'named' @@ -35,7 +34,7 @@ sha1sums=('aa8f308f218e437ac4bad616e0ae83a9b9c40c29' 'ee52947062c1582858187716b776afa3613608fb' '2f737f4e81186447ac2ef370fa8dcea0b3abec31' '5277cf4d6fbc5728c55b51c77c9347d28393fb7c' - '02b0e20a542663d27af4faa4d2e397ae2764276e' + '46232e9db243c6c05e170a1781d7a7f413be5d03' '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' '7848edbfb9a848843f57c11c02b0289eefd42d00' '9ffb5c3f72390a517aeae557e32349d5d278cb63' @@ -51,9 +50,17 @@ build() { patch -p1 -i "${srcdir}"/notools.patch ./configure \ - --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-libtool --enable-static=no --disable-linux-caps \ - --with-openssl=yes --with-libxml2=yes + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-linux-caps \ + --with-openssl \ + --with-gssapi \ + --with-libxml2 \ + --with-libtool \ + --with-dlz-dlopen \ + make } @@ -62,19 +69,18 @@ package() { make DESTDIR="${pkgdir}" install - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - + rmdir "${pkgdir}/var/run" install -d "${pkgdir}"/usr/share/doc/bind - install ./doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/ + install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/ + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -D -m755 ../named "${pkgdir}"/etc/rc.d/named install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named - install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf + install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf - install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named - install -d -m755 -o 40 -g 40 "${pkgdir}"/var/run/named - install -m640 -o 0 -g 40 ../db.cache "${pkgdir}"/var/named/root.hint - install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/ - install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named/ + install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named + install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named/ + install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/ + install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named/ } diff --git a/extra/bind/named b/extra/bind/named index 3be558f27..7907f9983 100755 --- a/extra/bind/named +++ b/extra/bind/named @@ -1,12 +1,16 @@ #!/bin/bash -NAMED_ARGS= -[ -f /etc/conf.d/named ] && . /etc/conf.d/named - . /etc/rc.conf . /etc/rc.d/functions +. /etc/conf.d/named + +[[ -d /var/run/named ]] || mkdir -p /var/run/named +chown named:named /var/run/named + +PIDFILE=/var/run/named/named.pid +PID=$(cat $PIDFILE 2>/dev/null) +readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; } -PID=`pidof -o %PPID /usr/sbin/named` case "$1" in start) stat_busy "Starting BIND" diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 77394d336..7237e301b 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 114691 2011-03-15 13:50:13Z andrea $ +# $Id: PKGBUILD 124783 2011-05-24 12:31:42Z ibiru $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> @@ -6,17 +6,17 @@ pkgbase=boost pkgname=('boost-libs' 'boost') -pkgver=1.46.0 +pkgver=1.46.1 _boostver=${pkgver//./_} -pkgrel=4 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=1 +arch=('i686' 'x86_64') url="http://www.boost.org/" makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz 4994-compile-fix-for-Python32-v2.patch boost-1.46.0-spirit.patch) license=('custom') -md5sums=('820393d5746553c192db7b81ba0e53fe' +md5sums=('341e5d993b19d099bf1a548495ea91ec' 'cb59e8adbf2a45ef9264a2f4ab92b849' '9d6e2f13fef23bf27d7bdddc104e182a') diff --git a/extra/bs/PKGBUILD b/extra/bs/PKGBUILD deleted file mode 100644 index 51b32a0b0..000000000 --- a/extra/bs/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 69354 2010-02-20 11:19:53Z allan $ -# Maintainer: -# Contributor damir <damir@archlinux.org> - -pkgname=bs -pkgver=2.7 -pkgrel=2 -pkgdesc="The classic game of Battleships against the computer. Ncurses." -arch=('i686' 'x86_64' 'mips64el') -url="http://www.catb.org/~esr/bs/" -license=('GPL2') -depends=('ncurses') -source=($url/$pkgname-$pkgver.tar.gz) -md5sums=('5786c6006e503d100e65139dadb5d5a7') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 -} - -package() { - cd $srcdir/$pkgname-$pkgver - install -Dm755 bs $pkgdir/usr/bin/bs - install -Dm644 bs.6 $pkgdir/usr/share/man/man6/bs.6 -} diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD index cd55d811d..7ae96eb77 100644 --- a/extra/bzr/PKGBUILD +++ b/extra/bzr/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 119485 2011-04-11 18:46:01Z eric $ +# $Id: PKGBUILD 124960 2011-05-25 12:48:29Z andrea $ # Maintainer : # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=bzr -pkgver=2.3.1 +pkgver=2.3.3 pkgrel=1 pkgdesc="A decentralized revision control system (bazaar)" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.bazaar-vcs.org" +arch=('i686' 'x86_64') +url="http://bazaar.canonical.com/en/" license=('GPL') depends=('python2') optdepends=('python-paramiko: for sftp support') -source=(http://launchpad.net/bzr/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) -md5sums=('1a4367ce59a2880f321ecb882e195856') -sha1sums=('49b9dfb5a01ffd87a120f8a7abf4833a482ba245') +source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") +md5sums=('a8ca30af0431c691ce7e71a74497e31d') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,7 +22,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 # bash-completion install -D -m644 contrib/bash/bzr "${pkgdir}/etc/bash_completion.d/bzr" diff --git a/extra/cairomm/PKGBUILD b/extra/cairomm/PKGBUILD index 498fb790f..faa47880f 100644 --- a/extra/cairomm/PKGBUILD +++ b/extra/cairomm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 109789 2011-02-12 19:30:52Z ibiru $ +# $Id: PKGBUILD 124057 2011-05-16 10:35:03Z jgc $ # Maintainer: Kevin <kevin@archlinux.org> # Contributor: criminy <criminy@gmail.com> pkgname=cairomm -pkgver=1.9.8 +pkgver=1.10.0 pkgrel=1 pkgdesc="C++ bindings to Cairo vector graphics library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('cairo' 'libsigc++') makedepends=('pkgconfig') source=(http://www.cairographics.org/releases/${pkgname}-${pkgver}.tar.gz) options=('!libtool' '!emptydirs') -md5sums=('6d5ce1138dbb09c58038ab6f766d5e88') +sha1sums=('f08bf8a331067f0d1e876523f07238fba6b26b99') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index 3637d7ef4..e6e328a7b 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121163 2011-04-29 06:26:08Z andyrtr $ +# $Id: PKGBUILD 124918 2011-05-25 08:15:13Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=claws-mail pkgver=3.7.9 -pkgrel=2 +pkgrel=3 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -20,12 +20,17 @@ replaces=('sylpheed-claws') provides=('claws') options=(!libtool) install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3') +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 + claws-notify-crash.patch) +md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3' + '9a2903449f679344b5f5f51c91825b45') build() { cd ${srcdir}/${pkgname}-${pkgver} + + patch -Np0 -i $srcdir/claws-notify-crash.patch sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py + ./configure --prefix=/usr --disable-static \ --enable-enchant \ --enable-gnutls \ diff --git a/extra/claws-mail/claws-notify-crash.patch b/extra/claws-mail/claws-notify-crash.patch new file mode 100644 index 000000000..e1d4eb686 --- /dev/null +++ b/extra/claws-mail/claws-notify-crash.patch @@ -0,0 +1,18 @@ +Index: src/main.c +=================================================================== +RCS file: //claws/src/main.c,v +retrieving revision 1.115.2.237 +retrieving revision 1.115.2.238 +diff -u -r1.115.2.237 -r1.115.2.238 +--- src/main.c 10 Apr 2011 17:19:04 -0000 1.115.2.237 ++++ src/main.c 30 Apr 2011 19:27:15 -0000 1.115.2.238 +@@ -331,7 +331,7 @@ + gtk_widget_show(hack); + } + +- xdisplay = gdk_display_get_default(); ++ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); + sn_display = sn_display_new(xdisplay, + sn_error_trap_push, + sn_error_trap_pop); + diff --git a/extra/curl/PKGBUILD b/extra/curl/PKGBUILD index d731a2ea4..736416bb2 100644 --- a/extra/curl/PKGBUILD +++ b/extra/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 120474 2011-04-24 01:23:51Z angvp $ +# $Id: PKGBUILD 123955 2011-05-14 18:55:23Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> @@ -6,12 +6,12 @@ pkgname=curl pkgver=7.21.6 -pkgrel=1 +pkgrel=2 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64' 'mips64el') url="http://curl.haxx.se" license=('MIT') -depends=('zlib' 'openssl' 'bash' 'ca-certificates') +depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2') options=('!libtool') source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2 curlbuild.h) diff --git a/extra/cvsps/PKGBUILD b/extra/cvsps/PKGBUILD index 9f3526178..5caa4b2f1 100644 --- a/extra/cvsps/PKGBUILD +++ b/extra/cvsps/PKGBUILD @@ -1,19 +1,24 @@ -# $Id: PKGBUILD 49847 2009-08-16 18:36:23Z jgc $ -# Maintainer: Jeff 'codemac' Mickey <jeff@archlinux.org> +# $Id: PKGBUILD 124095 2011-05-16 15:14:02Z andrea $ +# Maintainer: +# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> pkgname=cvsps pkgver=2.1 -pkgrel=2 -pkgdesc="Generating 'patchset' information from a CVS repository." +pkgrel=3 +pkgdesc="Generating 'patchset' information from a CVS repository" url="http://www.cobite.com/cvsps/" license=('GPL') -arch=('x86_64' 'i686' 'mips64el') +arch=('i686' 'x86_64') depends=('zlib') -source=(http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=("http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('bde2110ed9f5d14de8f8cb04e9d596fe') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make prefix=/usr || return 1 - make prefix="${pkgdir}/usr" install || return 1 + make prefix=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install } diff --git a/extra/dosbox/PKGBUILD b/extra/dosbox/PKGBUILD deleted file mode 100644 index b1132c8ef..000000000 --- a/extra/dosbox/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 80630 2010-05-20 16:06:03Z ibiru $ -# Maintainer : -# Contributor: James Rayner <james@archlinux.org> -# Contributor: Ben <ben@benmazer.net> - -pkgname=dosbox -pkgver=0.74 -pkgrel=1 -pkgdesc="An emulator with builtin DOS for running DOS Games" -arch=('i686' 'x86_64' 'mips64el') -url="http://dosbox.sourceforge.net/" -license=('GPL') -depends=('sdl_net' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs') -makedepends=('mesa') -source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" - 'dosbox.png' 'dosbox.desktop') -md5sums=('b9b240fa87104421962d14eee71351e8' - '2aac25fc06979e375953fcc36824dc5e' - '85169ca599028bee8e29e0b3b7b34dd8') - -build(){ - cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's/png_check_sig/png_sig_cmp/' configure || return 1 - ./configure --prefix=/usr \ - --sysconfdir=/etc/dosbox || return 1 - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - - install -Dm644 ${srcdir}/${pkgname}.png \ - ${pkgdir}/usr/share/pixmaps/${pkgname}.png || return 1 - install -Dm644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1 -} diff --git a/extra/dosbox/dosbox.desktop b/extra/dosbox/dosbox.desktop deleted file mode 100644 index dbaf05ced..000000000 --- a/extra/dosbox/dosbox.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=dosbox Emulator -GenericName=Emulator -Comment=An emulator to run old DOS games -Icon=dosbox -Exec=dosbox -Terminal=false -Categories=Emulator;Application; diff --git a/extra/dosbox/dosbox.png b/extra/dosbox/dosbox.png Binary files differdeleted file mode 100644 index b8a917986..000000000 --- a/extra/dosbox/dosbox.png +++ /dev/null diff --git a/extra/ecasound/PKGBUILD b/extra/ecasound/PKGBUILD index 4c0c420ee..05eb23efb 100644 --- a/extra/ecasound/PKGBUILD +++ b/extra/ecasound/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88360 2010-08-23 02:57:44Z schiv $ +# $Id: PKGBUILD 124853 2011-05-24 19:44:26Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ecasound -pkgver=2.7.2 +pkgver=2.8.1 pkgrel=1 pkgdesc="A software package designed for multitrack audio processing" arch=('i686' 'x86_64' 'mips64el') @@ -25,8 +25,7 @@ optdepends=('python2: ecamonitor, ECI API' options=('!libtool') changelog=$pkgname.changelog source=(http://ecasound.seul.org/download/$pkgname-$pkgver.tar.gz) -md5sums=('40498ceed9cc7622ee969c427f13921c') -sha1sums=('6d5236155e1a1f9a9bc9e63f989baebfb1645a49') +md5sums=('d9ded0074a8eeb59dd507c248220d010') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/ecasound/ecasound.changelog b/extra/ecasound/ecasound.changelog index cfa010ca5..a735f70c1 100644 --- a/extra/ecasound/ecasound.changelog +++ b/extra/ecasound/ecasound.changelog @@ -1,3 +1,8 @@ +2011-05-14 Ray Rashif <schiv@archlinux.org> + + * ecasound 2.8.0 + * upstream release + 2010-08-22 Ray Rashif <schiv@archlinux.org> * ecasound 2.7.2-1 diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 731a5e78a..a8a00c533 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122127 2011-05-02 09:20:52Z heftig $ +# $Id: PKGBUILD 124817 2011-05-24 15:39:18Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=3.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index a42ae2bd2..ed67782cb 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 120614 2011-04-25 18:12:59Z ibiru $ +# $Id: PKGBUILD 124631 2011-05-23 15:09:42Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ options=('!libtool') groups=('gnome-extra') install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4e29feb9f1100db2b4183b6f3aeccca85b0c89e7806c28adff0cb365b55c3809') +sha256sums=('8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD index d59b6c7f7..bef0d5518 100644 --- a/extra/eog-plugins/PKGBUILD +++ b/extra/eog-plugins/PKGBUILD @@ -1,14 +1,16 @@ -# $Id: PKGBUILD 120414 2011-04-23 21:13:06Z ibiru $ +# $Id: PKGBUILD 124756 2011-05-24 07:54:16Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=eog-plugins pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64') url="http://www.gnome.org/" license=('GPL2') depends=('eog' 'libpeas' 'libchamplain' 'libexif') makedepends=('intltool') +install=eog-plugins.install +options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) sha256sums=('87cced9baf3c8ba84dcad95d774686694f5cb140a187a7bad3891bc50bc4c7bd') diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index 44b11b962..4d6f58f5c 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 120830 2011-04-26 16:59:37Z ibiru $ +# $Id: PKGBUILD 124886 2011-05-24 21:41:31Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('gnome-desktop' 'libexif' 'lcms' 'desktop-file-utils' 'exempi' - 'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme') + 'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf') makedepends=('gtk-doc' 'intltool') install=eog.install groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('97e40b0e0b618a53dffa83e30ff9add1563d54356e6ab1d588d510cedbc148d2') +sha256sums=('96fa5af97baba0bce8dec376d7cd49512768505f473b11b2cf61881f6be8cb60') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ettercap-gtk/PKGBUILD b/extra/ettercap-gtk/PKGBUILD deleted file mode 100644 index fcbe61fe4..000000000 --- a/extra/ettercap-gtk/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 103538 2010-12-21 10:37:25Z andrea $ -# Maintainer: Hugo Doria <hugo@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=ettercap-gtk -pkgver=NG_0.7.3 -_origname=ettercap -_origver=NG-0.7.3 -pkgrel=8 -pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK" -arch=('i686' 'x86_64' 'mips64el') -url="http://ettercap.sourceforge.net/" -license=('GPL') -depends=('ettercap' 'gtk2' 'libtool') -makedepends=('libnet') -options=('!libtool') -source=(http://downloads.sourceforge.net/${_origname}/${_origname}-${_origver}.tar.gz - 'ettercap.desktop' - 'fix-segmentation-fault.patch') -md5sums=('28fb15cd024162c55249888fe1b97820' - '6ef18fdd114297d4ed9e5104d309f071' - 'e9cc99f13fd23edaba6cddffc4d0ef34') - -build() { - cd ${srcdir}/${_origname}-${_origver} - unset LDFLAGS - - # FS#21628 - patch -Np1 -i ${srcdir}/fix-segmentation-fault.patch - - libtoolize --force --copy - aclocal - autoconf - ./configure --prefix=/usr --sysconfdir=/etc --enable-plugins - sed -i 's/LTDL_SHLIB_EXT/\".so\"/' src/ec_plugins.c - make -} - -package() { - install -Dm755 ${srcdir}/${_origname}-${_origver}/src/ettercap \ - ${pkgdir}/usr/bin/ettercap-gtk - install -Dm644 ${srcdir}/ettercap.desktop \ - ${pkgdir}/usr/share/applications/ettercap.desktop -} diff --git a/extra/ettercap-gtk/ettercap.desktop b/extra/ettercap-gtk/ettercap.desktop deleted file mode 100644 index 1ac24e381..000000000 --- a/extra/ettercap-gtk/ettercap.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=Ettercap GTK -Exec=/usr/bin/ettercap-gtk --gtk -Terminal=false -Type=Application -Categories=Network;System;Security;GTK; diff --git a/extra/ettercap-gtk/fix-segmentation-fault.patch b/extra/ettercap-gtk/fix-segmentation-fault.patch deleted file mode 100644 index 3f0c7bf79..000000000 --- a/extra/ettercap-gtk/fix-segmentation-fault.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 8cdf08d401d368d5678f9d9c2cf36ddbdef03aec -Author: Timothy Redaelli <timothy@redaelli.eu> -Date: Tue Jun 23 09:16:27 2009 +0000 - - Fix a crash in 64 bit CPUs - -diff --git a/src/protocols/ec_tcp.c b/src/protocols/ec_tcp.c -index ea0c997..be8f3e0 100644 ---- a/src/protocols/ec_tcp.c -+++ b/src/protocols/ec_tcp.c -@@ -116,7 +116,7 @@ FUNC_DECODER(decode_tcp) - tcp = (struct tcp_header *)DECODE_DATA; - - opt_start = (u_char *)(tcp + 1); -- opt_end = (u_char *)((int)tcp + tcp->off * 4); -+ opt_end = (u_char *)(tcp + tcp->off * 4); - - DECODED_LEN = (u_int32)(tcp->off * 4); - diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 2ccc6a4e9..1532bce40 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123362 2011-05-10 16:22:31Z ibiru $ +# $Id: PKGBUILD 124739 2011-05-24 07:25:52Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.0.0 -pkgrel=4 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 introspection-fix.patch) -sha256sums=('7c994a94200114ea7077d3348a03cbbad01c819ece2ec24b436b16e04386291b' +sha256sums=('03abb74620caaa255f2d1369b684bbf8f62e15a4bf2d9f2a45f58e1789295a97' '897b8c77c5cda31f4f8d860cd6a7ad8ad986dbf3cf26b56acf054cc650e94be1') build() { diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 195be21c6..040385490 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122571 2011-05-04 16:49:38Z ibiru $ +# $Id: PKGBUILD 124640 2011-05-23 17:24:46Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2.1 +pkgrel=1 pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop" arch=('i686' 'x86_64') depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') @@ -12,7 +12,7 @@ options=('!libtool') url="http://www.gnome.org" license=('GPL') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8592be94027a9848ac18670a0e86e48e857539cd2813eb345eda0ace19688dd0') +sha256sums=('1b14c57a835745ee2c0141a76a07d44688dfb2d758bf3b818fe1860b59451f9b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD index 3dcb196d7..db3854d78 100644 --- a/extra/evolution-exchange/PKGBUILD +++ b/extra/evolution-exchange/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122586 2011-05-04 18:25:32Z ibiru $ +# $Id: PKGBUILD 124646 2011-05-23 18:11:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-exchange -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Ximian Connector Exchange plugin for Evolution" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,7 +13,7 @@ makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') install=evolution-exchange.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4c020f7946f534e3245806f29f48dbc9ccb98afdbc92d7bb5b14a5410668ad02') +sha256sums=('84f5c638aee1f6ed49de0d0f331d3b29907f7b211bd6c70f37698dedcd3e5f5a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 42e98b3ca..557c4b855 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120599 2011-04-25 17:55:43Z ibiru $ +# $Id: PKGBUILD 124643 2011-05-23 17:54:16Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Integrated Workgroup and Personal Information Management for Gnome" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('d322241c38ece00e2ee7adf0c4d0583dc811c52d5a176ef93427b9b35c04487b') +sha256sums=('6fdf6a39a89bb04c406225984e5b730e86a370024f30ef9cf019840be9fbe59a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/fam/PKGBUILD b/extra/fam/PKGBUILD index 2a94fee02..031971dcd 100644 --- a/extra/fam/PKGBUILD +++ b/extra/fam/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 42581 2009-06-16 05:20:11Z tpowa $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 124073 2011-05-16 14:51:09Z andrea $ +# Maintainer: +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fam pkgver=2.7.0 -pkgrel=14 +pkgrel=15 pkgdesc="File Alteration Monitor" arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL') depends=('rpcbind' 'gcc-libs' 'bash') url="http://oss.sgi.com/projects/fam/" -backup=(etc/fam/fam.conf) +backup=('etc/fam/fam.conf') options=('!makeflags') # Don't !libtool source=(ftp://oss.sgi.com/projects/fam/download/stable/${pkgname}-${pkgver}.tar.gz fam-2.7.0-dnotify.patch @@ -23,25 +24,29 @@ md5sums=('1bf3ae6c0c58d3201afc97c6a4834e39' '47b41e0b0498793af004696a096d7da1' '2638b8ffacb9f03b6e438e08ea7b290a' 'fc0cabc0ac4f819680401eb3090c29c9' - '0b4dd9894ccc03f57787f9dfc0a7bd6f') + '92a37f9eb6ad0e60ded9c70e9ad93a88') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/fam-2.7.0-dnotify.patch || return 1 - patch -Np1 -i ${srcdir}/fam-2.7.0-largefiles.patch || return 1 - patch -Np0 -i ${srcdir}/fam-2.7.0-limits.patch || return 1 - patch -Np1 -i ${srcdir}/fam-2.7.0-buildfixes.patch || return 1 + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/fam-2.7.0-dnotify.patch + patch -p1 -i "${srcdir}"/fam-2.7.0-largefiles.patch + patch -p0 -i "${srcdir}"/fam-2.7.0-limits.patch + patch -p1 -i "${srcdir}"/fam-2.7.0-buildfixes.patch - chmod 755 configure || return 1 + chmod 755 configure - autoheader || return 1 - aclocal || return 1 - automake -a -c || return 1 - autoconf || return 1 - libtoolize --copy --force || return 1 + autoheader + aclocal + automake -a -c + autoconf + libtoolize --copy --force ./configure --prefix=/usr --sysconfdir=/etc/fam - make || return 1 - make DESTDIR=${pkgdir} install - install -D -m755 ../fam ${pkgdir}/etc/rc.d/fam + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + install -D -m755 "${srcdir}"/fam "${pkgdir}"/etc/rc.d/fam } diff --git a/extra/fam/fam b/extra/fam/fam index 53dd2a4a6..5fc54a6df 100755 --- a/extra/fam/fam +++ b/extra/fam/fam @@ -9,7 +9,7 @@ case "$1" in #Check for running portmap, start when not running ck_daemon rpcbind && /etc/rc.d/rpcbind start stat_busy "Starting File Alteration Monitor" - if [ ! -f /var/run/daemons/rpcbind ]; then + if ck_daemon rpcbind; then stat_fail echo "ERROR: rpcbind is not running" exit 1 diff --git a/extra/farsight2/PKGBUILD b/extra/farsight2/PKGBUILD index 32004706a..a93979c58 100644 --- a/extra/farsight2/PKGBUILD +++ b/extra/farsight2/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 111877 2011-03-01 15:02:05Z ibiru $ +# $Id: PKGBUILD 124193 2011-05-17 15:41:27Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: William Díaz <wdiaz@archlinux.us> pkgname=farsight2 -pkgver=0.0.26 -pkgrel=1 +pkgver=0.0.28 +pkgrel=2 pkgdesc="Audio/Video conference software for Instant Messengers" arch=('i686' 'x86_64' 'mips64el') url="http://farsight.freedesktop.org" license=('LGPL') -depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-python' 'python2' 'pygobject') -optdepends=('gstreamer0.10-good-plugins: for RTP plugin' - 'gstreamer0.10-bad-plugins: for RTP plugin') +depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good' 'gstreamer0.10-bad' 'gstreamer0.10-python' 'pygobject') +optdepends=('gstreamer0.10-ugly-plugins: h264 codec') options=('!libtool' '!emptydirs') source=(http://farsight.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('7756d910687dd2abd455fd68e83f125c') +md5sums=('38767e775067270754a32aaf8e3a7db1') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's#python-config#python2-config#' python/Makefile.in ./configure --prefix=/usr \ --with-package-name='Arch Linux farsight2 package' \ --with-package-origin='http://archlinux.org' \ diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index 3485bdb20..77bd376a2 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123419 2011-05-11 10:13:28Z bisson $ +# $Id: PKGBUILD 124340 2011-05-19 23:17:46Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=1.14 +pkgver=1.14.1 pkgrel=1 pkgdesc='Fast, lightweight image viewer which uses imlib2' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama') optdepends=('perl: feh-cam, webcam wrapper for feh') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('da8886b62aa46c8e85cbced73ef14d704ab66907') +sha1sums=('4d35b14c41cd8a753e6d8d334bab216c69361688') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD index 80316e094..796d84761 100644 --- a/extra/fetchmail/PKGBUILD +++ b/extra/fetchmail/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 102917 2010-12-13 01:30:42Z eric $ +# $Id: PKGBUILD 124586 2011-05-23 05:55:07Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=fetchmail pkgver=6.3.19 -pkgrel=1 +pkgrel=2 pkgdesc="A remote-mail retrieval utility" +arch=('i686' 'x86_64') url="http://fetchmail.berlios.de/" -arch=('i686' 'x86_64' 'mips64el') +license=('GPL') depends=('glibc' 'openssl' 'python2') -optdepends=('tk: fetchmailconf') +optdepends=('tk: for using fetchmailconf') +backup=('etc/conf.d/fetchmail') options=('!makeflags') -license=('GPL') install=fetchmail.install source=(http://download2.berlios.de/fetchmail/${pkgname}-${pkgver}.tar.bz2 fetchmail.rc fetchmail.conf) -md5sums=('64519711c8533f5a34d20c9ff620d880' '6742e99d65a827bc2b9d6bc8efe269e6'\ +md5sums=('64519711c8533f5a34d20c9ff620d880' + '89fdde15bf81b3a5c065949322b5d138' '8fcd6a22dfbc247755fdd050c5c5c4d3') -sha1sums=('fcc9b9299fe147d8f522cff93f8f619e5e1372b7' '13c7e3c538211c79c5b403f2bfa6712a2ad0ac30'\ - '30401729386d6f774c6c36ab8530842166de54a8') +sha1sums=('fcc9b9299fe147d8f522cff93f8f619e5e1372b7' + '910ec21ad0a619db67e4665189dc46d2a0634ea5' + '30401729386d6f774c6c36ab8530842166de54a8') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' fetchmailconf.py ./configure --prefix=/usr --with-ssl=/usr make } @@ -28,10 +32,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail" install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail" - - # "home" directory for pid file. - install -d -o 90 -g nobody -m700 "${pkgdir}/var/run/fetchmail" } diff --git a/extra/fetchmail/fetchmail.rc b/extra/fetchmail/fetchmail.rc index 7c25f72b2..6d453a223 100644 --- a/extra/fetchmail/fetchmail.rc +++ b/extra/fetchmail/fetchmail.rc @@ -8,13 +8,12 @@ PID=`pidof -o %PPID /usr/bin/fetchmail` case "$1" in start) stat_busy "Starting fetchmail" + [ ! -d /var/run/fetchmail ] && install -d -o fetchmail -g nobody -m700 /var/run/fetchmail [ -z "$PID" ] && su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail if [ $? -gt 0 ]; then stat_fail else - #Fetchmail does this for us: - #echo $PID > /var/run/fetchmail.pid add_daemon fetchmail stat_done fi diff --git a/extra/file-roller/PKGBUILD b/extra/file-roller/PKGBUILD index 0e4f9d9a6..a27c424d2 100644 --- a/extra/file-roller/PKGBUILD +++ b/extra/file-roller/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 122038 2011-05-01 20:05:25Z ibiru $ +# $Id: PKGBUILD 124730 2011-05-24 07:10:29Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=file-roller -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Archive manipulator for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'nautilus') makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm') -optdepends=('nautilus: nautilus shell extension' - 'unrar: the RAR uncompression program' +optdepends=('unrar: the RAR uncompression program' 'zip: creates PKZIP-compatible .zip files' 'unzip: unpacks .zip archives' 'p7zip: 7zip compression utility' @@ -22,7 +21,7 @@ options=('!libtool' '!emptydirs') install=file-roller.install url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('805f5fb77fa8c2f982a2cee0db1b56fbc335f63a1eed34e0bac228ce8349d3ce') +sha256sums=('a612f05c44f82328175ddca1b4a1da214d9c305797370b78435f490b250af3d1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD index f99068d86..55401aa90 100644 --- a/extra/fontforge/PKGBUILD +++ b/extra/fontforge/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 110943 2011-02-23 09:57:15Z bisson $ +# $Id: PKGBUILD 124359 2011-05-20 08:42:23Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fontforge pkgver=20110222 -pkgrel=1 +pkgrel=2 pkgdesc='Outline and bitmap font editor' arch=('i686' 'x86_64' 'mips64el') url='http://fontforge.sourceforge.net' @@ -23,11 +23,11 @@ build() { --prefix=/usr \ --mandir=/usr/share/man \ --enable-type3 \ - --enable-double \ --enable-devicetables \ --with-regular-link \ --with-python=python2 \ - --enable-pyextension + --enable-pyextension \ + make } diff --git a/extra/gcalctool/PKGBUILD b/extra/gcalctool/PKGBUILD index c397966ce..d242b0783 100644 --- a/extra/gcalctool/PKGBUILD +++ b/extra/gcalctool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120856 2011-04-26 21:28:12Z ibiru $ +# $Id: PKGBUILD 124701 2011-05-24 06:54:45Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gcalctool -pkgver=6.0.1 +pkgver=6.0.2 pkgrel=1 pkgdesc="GNOME Scientific calculator" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=(!emptydirs) url="http://www.gnome.org" install=gcalctool.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('be11a7c36a1ec20bd0b190e572aefedea13fb2cb8479b06673e182c7461cadfe') +sha256sums=('63190fde1be5202ab43774785b5521d8f11592c6a9e125673028c5ac235c9316') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD index 608c11bd0..1c05d49c0 100644 --- a/extra/gdl/PKGBUILD +++ b/extra/gdl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120644 2011-04-25 20:32:25Z ibiru $ +# $Id: PKGBUILD 124671 2011-05-23 20:42:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdl -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="GNOME Docking Library" arch=(i686 x86_64 mips64el) @@ -12,7 +12,7 @@ depends=('gtk3') makedepends=('pkgconfig' 'intltool' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e0c3d855c7f8b115ec10f34db1291cb09db48a24281c3f9242d8348b189d5b09') +sha256sums=('b4a0e7539a1133afca1b370818373fb8dcf29b50f12edbfaf6c1d5560977a308') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index bbb3b7622..323edc3c4 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 119944 2011-04-17 09:10:01Z ibiru $ +# $Id: PKGBUILD 124668 2011-05-23 20:39:21Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdm -pkgver=3.0.0 -pkgrel=3 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Gnome Display Manager (a reimplementation of xdm)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -10,7 +10,7 @@ url="http://www.gnome.org" backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf') groups=('gnome-extra') options=('!libtool') -depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit') +depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb') makedepends=('intltool' 'gnome-doc-utils' 'xorg-server') conflicts=('fast-user-switch-applet') replaces=('fast-user-switch-applet') @@ -20,24 +20,19 @@ source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname gdm-vt-allocation-hack.patch gdm.pam gdm-autologin.pam - gdm - fix_crasher_with_gtk307.patch) -sha256sums=('2d6443912272c0aa339a06b58d797cc11ce6b0854dadfcc027408f546da7aeff' + gdm) +sha256sums=('3e0d44d551230c02a00ce27e4d98a5ebd54aac81520949076ad3111658eb2a05' '92c5eb913b9556cffe9b5bb89e5c3435703e929addfb98145442f58af5d532c1' '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5' - '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' - '6d08951919dcb1f928dd67c0b5a5c209b32464c2374ee7d2369ed8e914d541c9') + '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/2.91_fix_external_program_directories.patch" patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch" - #https://bugzilla.gnome.org/show_bug.cgi?id=646498 - patch -Np1 -i "${srcdir}/fix_crasher_with_gtk307.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \ --with-at-spi-registryd-directory=/usr/lib/at-spi \ diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 42b189676..40699597b 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 120727 2011-04-26 07:34:29Z ibiru $ +# $Id: PKGBUILD 125557 2011-05-26 17:02:09Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.0.2 -pkgrel=1 +pkgver=3.0.3 +pkgrel=2 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' - 'iso-codes' 'libsm' 'desktop-file-utils' 'pygobject') +depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'pygobject' 'dconf') makedepends=('gnome-doc-utils' 'intltool') groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a91fcfe321d8d5d8fe5c6c11f3b05389febe396efa2172b5ea6cb79d2f16b2db') +sha256sums=('16764f0cf17fcd85f9c3f031bb151aa87ef1e727e8d19814a4746d376adca578') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/git/ChangeLog b/extra/git/ChangeLog index 8ed0884fe..76298e68f 100644 --- a/extra/git/ChangeLog +++ b/extra/git/ChangeLog @@ -1,4 +1,21 @@ -Simple version bumps are ommitted from the following ChangeLog. +Simple version bumps are omitted from the following ChangeLog. + +2011-05-05 Dan McGee <dan@archlinux.org> + Version 1.7.5.1-1 + * Byte compile emacs files (FS#20874) + * Respect CFLAGS/LDFLAGS (FS#23963) + +2011-04-27 Dan McGee <dan@archlinux.org> + Version 1.7.5-1 + * Add missing optdepends for git send-email (FS#20923) + +2011-01-05 Dan McGee <dan@archlinux.org> + Version 1.7.3.5-1 + * More flexible git-daemon RC scripts (FS#20575) + +2010-10-01 Allan McRae <allan@archlinux.org> + Version 1.7.3.1-2 + * Python 2/3 rebuild 2010-06-29 Dan McGee <dan@archlinux.org> Version 1.7.1.1-1 diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index d6d9396da..e67522047 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122647 2011-05-05 13:19:03Z dan $ +# $Id: PKGBUILD 124414 2011-05-20 16:19:11Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.5.1 +pkgver=1.7.5.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -75,11 +75,11 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('a49291116e3b0564e069ae989e4db6fb' - 'cb0ec1095fbdf5b4935d5c43194b976a' +md5sums=('f79ab8fe79b35346b499f131cbf381a4' + '43fc5538f137231f5c96e7da5eb6c934' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('a1d4a1c59300e68fbc493a2cbe9257048d4d6f4363924bf34f38c413a825f80c' - '9d8ab1487df85ca596f3f6718d6a7831868abd9b98035a65c71d7f45af4aac8e' +sha256sums=('65dbb9789a1ff8aa7e4f7e156b9ce36ef101810608ed55a297156348d70f9349' + '8521210a77809d189a3fe72e2bd13df50ecf8ec58e7098ec1655dfdb4086b6ca' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index f7c87770a..c789f208b 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 121199 2011-04-29 10:51:43Z ibiru $ +# $Id: PKGBUILD 124675 2011-05-23 20:43:54Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.28.6.1 -pkgrel=2 +pkgver=2.28.7 +pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -11,8 +11,8 @@ depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schema makedepends=('intltool') options=('!libtool') install=glib-networking.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*.*}/$pkgname-${pkgver}.tar.bz2) -sha256sums=('50f9aac36ce49b0e16f84a9f516cf59d0a1f9b3199634787fd9db7470ab6c65b') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) +sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD index cc82175f7..f1845aafe 100644 --- a/extra/glsof/PKGBUILD +++ b/extra/glsof/PKGBUILD @@ -1,38 +1,38 @@ -# $Id: PKGBUILD 123056 2011-05-07 20:58:12Z eric $ +# $Id: PKGBUILD 124019 2011-05-16 00:31:31Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glsof -pkgver=1.0.0 +pkgver=1.5 +_fmver=1.5 +_qver=1.0.0 pkgrel=1 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility" arch=('i686' 'x86_64' 'mips64el') url="http://glsof.sourceforge.net/" license=('GPL3') -depends=('java-runtime' 'lsof') +depends=('sh' 'java-runtime' 'lsof') +source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}.tar.gz) if [ "$CARCH" = "i686" ]; then - source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${pkgver}/filemonitor_linux32.tar.gz \ - http://downloads.sourceforge.net/sourceforge/glsof/queries-${pkgver}/queries_linux32.tar.gz \ + source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \ glsof-filemonitor glsof-queries) - md5sums=('7a541ee8c432b78f9bfd36dd1707fb8d' - '895bcec79edea97ebde36d7f5eaa3ee9' - '7e43c1120e15e65bd1a12d6f188be4a0' - '980da4b39e1e3f4fbed08018dfd3be7b') + md5sums=('6ca86f9f356e9cba02e4f0861eb1c464' + '895bcec79edea97ebde36d7f5eaa3ee9' + '7e43c1120e15e65bd1a12d6f188be4a0' + '980da4b39e1e3f4fbed08018dfd3be7b') elif [ "$CARCH" = "x86_64" ]; then - source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${pkgver}/filemonitor_linux64.tar.gz \ - http://downloads.sourceforge.net/sourceforge/glsof/queries-${pkgver}/queries_linux64.tar.gz \ + source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \ glsof-filemonitor glsof-queries) - md5sums=('9a6043b0b90fbc6de4db36967647dab0' - 'ed96ee2105428aa8b038f5fe13b8cd1d' - '7e43c1120e15e65bd1a12d6f188be4a0' - '980da4b39e1e3f4fbed08018dfd3be7b') + md5sums=('6ca86f9f356e9cba02e4f0861eb1c464' + 'ed96ee2105428aa8b038f5fe13b8cd1d' + '7e43c1120e15e65bd1a12d6f188be4a0' + '980da4b39e1e3f4fbed08018dfd3be7b') fi package() { cd "${srcdir}" install -D -m755 glsof-filemonitor "${pkgdir}/usr/bin/glsof-filemonitor" install -D -m755 glsof-queries "${pkgdir}/usr/bin/glsof-queries" - install -D -m644 filemonitor_linux??/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar" - install -D -m644 filemonitor_linux??/filemonitor.pdf "${pkgdir}/usr/share/doc/glsof/filemonitor.pdf" + install -D -m644 filemonitor/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar" install -D -m644 queries_linux??/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar" install -D -m644 queries_linux??/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf" } diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 1b7fd44d0..945af2f09 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122550 2011-05-04 14:36:21Z stephane $ +# $Id: PKGBUILD 124765 2011-05-24 09:14:06Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.0.1.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5') @@ -14,8 +14,8 @@ groups=('gnome') install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b191991d3932b363154e6cf2b5055bc711272065397daee2163b6fb04402ad79') +source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('477b09a060a75e3664bd9cc9aac6b780067e50198217e3e11dc64980e3414896') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-desktop-sharp/PKGBUILD b/extra/gnome-desktop-sharp/PKGBUILD index c8e883a28..34681fe3f 100644 --- a/extra/gnome-desktop-sharp/PKGBUILD +++ b/extra/gnome-desktop-sharp/PKGBUILD @@ -1,16 +1,14 @@ -# $Id: PKGBUILD 121043 2011-04-28 09:15:35Z heftig $ +# $Id: PKGBUILD 124614 2011-05-23 14:21:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=gnome-desktop-sharp +pkgbase=gnome-desktop-sharp +pkgname=('gnome-desktop-sharp' 'libgnome-desktop-sharp' 'gnome-print-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp') pkgver=2.26.0 -pkgrel=6 -pkgdesc="GNOME desktop bindings for C#" -arch=('i686' 'x86_64' 'mips64el') +pkgrel=7 +arch=('i686' 'x86_64') license=(LGPL) url="http://gtk-sharp.sourceforge.net" -depends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libwnck' 'gtkhtml' 'gtksourceview2') -makedepends=('monodoc' 'libgnomeprintui') -optdepends=('libgnomeprintui') +makedepends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libgnomeprintui' 'libwnck' 'gtkhtml' 'gtksourceview2' 'monodoc') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 gnome-desktop-sharp-lib-target.patch) @@ -18,18 +16,72 @@ md5sums=('4bc990900bb318b2ba0b0e7998bb47d1' '980cd3adf5e745f4caee0a172a51dcc3') build() { - # get rid of that .wapi errors; thanks to brice - export MONO_SHARED_DIR="$srcdir/wapi" - mkdir -p "$MONO_SHARED_DIR" + export MONO_SHARED_DIR="$srcdir/wapi" + mkdir -p "$MONO_SHARED_DIR" - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i $srcdir/gnome-desktop-sharp-lib-target.patch - ./configure --prefix=/usr --sysconfdir=/etc - make + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i $srcdir/gnome-desktop-sharp-lib-target.patch + ./configure --prefix=/usr --sysconfdir=/etc + make } -package() { - cd "$srcdir/$pkgname-$pkgver" - make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \ - DESTDIR="$pkgdir" install +package_gnome-desktop-sharp() { + pkgdesc="GNOME desktop bindings for C#" + depends=('libgnome-desktop-sharp' 'gnome-print-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp') +} + +package_libgnome-desktop-sharp() { + pkgdesc="Mono bindings for libgnome-desktop" + depends=('gtk-sharp-2' 'gnome-desktop2') + + cd "$srcdir/$pkgbase-$pkgver" + make -C gnomedesktop install DESTDIR="$pkgdir" +} + +package_gnome-print-sharp() { + pkgdesc="Mono bindings for libgnomeprint and libgnomeprintui" + depends=('art-sharp' 'libgnomeprintui') + + cd "$srcdir/$pkgbase-$pkgver" + make -C gnomeprint install DESTDIR="$pkgdir" +} + +package_gtkhtml-sharp() { + pkgdesc="Mono bindings for gtkhtml" + depends=('gtk-sharp-2' 'gtkhtml') + + cd "$srcdir/$pkgbase-$pkgver" + make -C gtkhtml install DESTDIR="$pkgdir" +} + +package_gtksourceview2-sharp() { + pkgdesc="Mono bindings for gtksourceview2" + depends=('gtk-sharp-2' 'gtksourceview2') + + cd "$srcdir/$pkgbase-$pkgver" + make -C gtksourceview install DESTDIR="$pkgdir" +} + +package_rsvg2-sharp() { + pkgdesc="Mono bindings for librsvg" + depends=('gtk-sharp-2' 'librsvg') + + cd "$srcdir/$pkgbase-$pkgver" + make -C rsvg install DESTDIR="$pkgdir" +} + +package_vte-sharp() { + pkgdesc="Mono bindings for libvte" + depends=('gtk-sharp-2' 'vte') + + cd "$srcdir/$pkgbase-$pkgver" + make -C vte install DESTDIR="$pkgdir" +} + +package_wnck-sharp() { + pkgdesc="Mono bindings for libwnck" + depends=('gtk-sharp-2' 'libwnck') + + cd "$srcdir/$pkgbase-$pkgver" + make -C wnck install DESTDIR="$pkgdir" } diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index 3ba0e1161..ce09ddf4c 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123357 2011-05-10 15:51:14Z ibiru $ +# $Id: PKGBUILD 124748 2011-05-24 07:38:40Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Library with common API for various GNOME modules" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') @@ -12,16 +12,12 @@ makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') url="http://www.gnome.org" groups=('gnome') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - randr-fix.patch) -sha256sums=('6d5e140a0d5f9bc131caff505bc4a2afa11e1839437f7fc3da73238b37a3f0a3' - '815a36c39d07eea48cb836bf25389c7057605239cb30b425d6c98763aeee4b89') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('0ac9b4a358c6d92d20283cf56a9817262ff3ce038013cbb5d98e4ab97aa2c9a3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/randr-fix.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --with-gnome-distributor="Arch Linux" \ diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD index ff10f5bea..cac447e29 100644 --- a/extra/gnome-games/PKGBUILD +++ b/extra/gnome-games/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 120383 2011-04-23 09:47:40Z ibiru $ +# $Id: PKGBUILD 124637 2011-05-23 17:10:50Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-games -pkgver=3.0.1.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed') +depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed' 'pygobject') makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') provides=('glchess') conflicts=('glchess') @@ -15,8 +15,8 @@ options=('!emptydirs' '!libtool') install=gnome-games.install url="http://www.gnome.org" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('dbbda8aa6960e36acff7537e49e033fc8037e6b3b3aa52d5f066cb67b34b4319') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('1b731d691806d89d411a6bfaaca05a441555adee2760b97bb80fb5ded8326cb1') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -38,4 +38,6 @@ package() { install -m755 -d "${pkgdir}/usr/share/gconf/schemas" gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-games ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + + sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' ${pkgdir}/usr/bin/gnome-sudoku } diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 6488fc2dd..cfa1dc390 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 120584 2011-04-25 17:40:10Z ibiru $ +#$Id: PKGBUILD 125542 2011-05-26 16:38:57Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.0.1 +pkgver=3.0.3 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64 'mips64el') @@ -10,11 +10,11 @@ license=('GPL' 'LGPL') depends=('gtk3' 'dconf') makedepends=('intltool' 'pkgconfig' 'python2') groups=('gnome') -options=('!libtool' '!emptydirs' '!makeflags') +options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-keyring.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1b296fc58fb189c9632fdd8a8a8a2dbb0af97db1529af87d73e21a96c4b78c03') +sha256sums=('a06c34e474d93da62bf96a816e58cb5730e181d6523730f041f34c58a0d5e94e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD index c2c7931bd..2ecec8404 100644 --- a/extra/gnome-panel/PKGBUILD +++ b/extra/gnome-panel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119512 2011-04-11 20:09:24Z ibiru $ +# $Id: PKGBUILD 124734 2011-05-24 07:14:49Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-panel -pkgver=3.0.0.1 -pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +pkgver=3.0.2 +pkgrel=1 +arch=('i686' 'x86_64') license=('GPL') pkgdesc="The GNOME Panel" url="http://www.gnome.org" @@ -15,14 +15,11 @@ groups=('gnome') replaces=('gnome-panel-bonobo') provides=("gnome-panel-bonobo=${pkgver}") options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2 - fix-crasher-launchers.patch) -sha256sums=('2014225215afc8a8a4363481c26f9a9443d3dfc944aa7bcb0c5224f723c0b98b' - '6724690bb2943f50ab296af6f1e1a7c10a91415ba150586b5623f20cc214ace0') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('25db8ec026c4bf47f0ef5cc7e2712f2aad175bd7fb8e4952ef5f8b200f17f196') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix-crasher-launchers.patch" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-panel \ diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD index c9161e142..61fa2a7a7 100644 --- a/extra/gnome-power-manager/PKGBUILD +++ b/extra/gnome-power-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117756 2011-04-04 17:41:50Z heftig $ +# $Id: PKGBUILD 124602 2011-05-23 10:33:56Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-power-manager -pkgver=3.0.0 +pkgver=3.0.2 pkgrel=1 pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system." arch=(i686 x86_64 'mips64el') @@ -13,9 +13,9 @@ depends=('libnotify' 'gconf' 'libcanberra' 'gnome-icon-theme' 'upower' makedepends=('intltool' 'gnome-doc-utils' 'gnome-control-center') options=(!emptydirs) install=gnome-power-manager.install -groups=(gnome-extra) +groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('20d8c147a50eef534e81edb033648e5e9cf7a3f733e80c5d6c946b571f7ae4e1') +sha256sums=('d0e00fdcfbc3bfb709f9ed82a14de325c51cf0bb86eeacefcda2dd7fcf6cbc2b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 14916a6dd..3d62ff5bb 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120864 2011-04-26 21:44:03Z ibiru $ +# $Id: PKGBUILD 124745 2011-05-24 07:33:54Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-session -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ install=gnome-session.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8a553569d500e84e5815e5b0b2eb1ac1bf4064ef9afb0e16f28d948978efbd25') +sha256sums=('4801a0cfdf351a1184780cc1c2bdd5cea6cd1ad31505d5fa8de4e56aa766ab96') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index c3270d70e..38617dc2e 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122583 2011-05-04 18:20:31Z ibiru $ +# $Id: PKGBUILD 124605 2011-05-23 10:48:57Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-settings-daemon -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -18,7 +18,7 @@ groups=('gnome') replaces=(gnome-settings-daemon-pulse) conflicts=(gnome-settings-daemon-pulse) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('51cdd0842b907e95c79d4e2b26f554e26fc626f7c2e6c3a14e3fc7954ca91117') +sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 34974115f..0c005f56e 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123600 2011-05-11 18:16:09Z ibiru $ +# $Id: PKGBUILD 125332 2011-05-25 22:41:23Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.0.1 -pkgrel=5 +pkgver=3.0.2 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeShell" @@ -19,28 +19,19 @@ install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 arch.patch - network_fixes_up_to_5090a4ccce.patch - shell-xfixes-cursor_missing_free.patch - st-private_fix_memory_leak.patch - st-private_correct_fix_memory_leak.patch - 0001-Don-t-crash-when-removing-nameless-user.patch) -sha256sums=('01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079' + bluetoothstatus-always-update-devices.patch + shell-recorder-missing-XFree.patch) +sha256sums=('a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95' 'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db' - '01bf41483d5d8935ed2dd6294ee04024f2d9bcb2ef13276b07331e485965c822' - 'c8b92768c869d0d77595da3466cc0dba3b6f067ea5fac048f32a918bbe98bbf6' - '8b80a0cec39c38a47521183a3030a782ab84bb6ea5e9cc58213589245288e718' - 'c676067fff399a87625187381db5331d82c44f6c14f51d409392851dbbeb5074' - '291d1fa51344325e3dabc0c1287750cde98605c30f079ffad9b3523a3aba860d') + 'f592752875085fceebdb27e65802e09c07edd7be57eec0da3edfcad5052be2ae' + '070edd5e720c063be41c158f39b7ef62a0d4a7f547ca0d23216104d5428ff971') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/arch.patch" - patch -Np1 -i "${srcdir}/network_fixes_up_to_5090a4ccce.patch" - patch -Np1 -i "${srcdir}/shell-xfixes-cursor_missing_free.patch" - patch -Np1 -i "${srcdir}/st-private_fix_memory_leak.patch" - patch -Np1 -i "${srcdir}/st-private_correct_fix_memory_leak.patch" - patch -Np1 -i "${srcdir}/0001-Don-t-crash-when-removing-nameless-user.patch" + patch -Np1 -i "${srcdir}/bluetoothstatus-always-update-devices.patch" + patch -Np1 -i "${srcdir}/shell-recorder-missing-XFree.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ diff --git a/extra/gnome-shell/bluetoothstatus-always-update-devices.patch b/extra/gnome-shell/bluetoothstatus-always-update-devices.patch new file mode 100644 index 000000000..0272169f5 --- /dev/null +++ b/extra/gnome-shell/bluetoothstatus-always-update-devices.patch @@ -0,0 +1,132 @@ +From 76fce94b66be7bdebbedcc3bce62898da51da15a Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampagna@src.gnome.org> +Date: Wed, 13 Apr 2011 17:08:45 +0000 +Subject: BluetoothStatus: always update devices + +Previously, we skipped rebuilding device items in case the device +had already been seen, but this caused the connected switch not to +be updated. Now it has been refactored to update in case the device +changes, and to create only when the device is completely new. + +https://bugzilla.gnome.org/show_bug.cgi?id=647565 +--- +diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js +index 070016a..cee2f90 100644 +--- a/js/ui/status/bluetooth.js ++++ b/js/ui/status/bluetooth.js +@@ -127,13 +127,6 @@ Indicator.prototype = { + } + }, + +- _deviceCompare: function(d1, d2) { +- return d1.device_path == d2.device_path && +- d1.bdaddr == d2.bdaddr && +- d1.can_connect == d2.can_connect && +- d1.capabilities == d2.capabilities; +- }, +- + _updateDevices: function() { + let devices = this._applet.get_devices(); + +@@ -142,12 +135,8 @@ Indicator.prototype = { + let item = this._deviceItems[i]; + let destroy = true; + for (let j = 0; j < devices.length; j++) { +- // we need to deep compare because BluetoothSimpleDevice is a boxed type +- // (but we take advantage of that, because _skip will disappear the next +- // time get_devices() is called) +- if (this._deviceCompare(item._device, devices[j])) { +- item.label.text = devices[j].alias; +- devices[j]._skip = true; ++ if (item._device.device_path == devices[j].device_path) { ++ this._updateDeviceItem(item, devices[j]); + destroy = false; + break; + } +@@ -162,7 +151,7 @@ Indicator.prototype = { + this._hasDevices = newlist.length > 0; + for (let i = 0; i < devices.length; i++) { + let d = devices[i]; +- if (d._skip) ++ if (d._item) + continue; + let item = this._createDeviceItem(d); + if (item) { +@@ -177,17 +166,55 @@ Indicator.prototype = { + this._deviceSep.actor.hide(); + }, + ++ _updateDeviceItem: function(item, device) { ++ if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) { ++ item.destroy(); ++ return; ++ } ++ ++ let prevDevice = item._device; ++ let prevCapabilities = prevDevice.capabilities; ++ let prevCanConnect = prevDevice.can_connect; ++ ++ // adopt the new device object ++ item._device = device; ++ device._item = item; ++ ++ // update properties ++ item.label.text = device.alias; ++ ++ if (prevCapabilities != device.capabilities || ++ prevCanConnect != device.can_connect) { ++ // need to rebuild the submenu ++ item.menu.removeAll(); ++ this._buildDeviceSubMenu(item, device); ++ } ++ ++ // update connected property ++ if (device.can_connect) ++ item._connectedMenuitem.setToggleState(device.connected); ++ }, ++ + _createDeviceItem: function(device) { + if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) + return null; + let item = new PopupMenu.PopupSubMenuMenuItem(device.alias); ++ ++ // adopt the device object, and add a back link + item._device = device; ++ device._item = item; + ++ this._buildDeviceSubMenu(item, device); ++ ++ return item; ++ }, ++ ++ _buildDeviceSubMenu: function(item, device) { + if (device.can_connect) { + item._connected = device.connected; +- let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected); ++ item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected); + +- menuitem.connect('toggled', Lang.bind(this, function() { ++ item._connectedMenuitem.connect('toggled', Lang.bind(this, function() { + if (item._connected > ConnectionState.CONNECTED) { + // operation already in progress, revert + menuitem.setToggleState(menuitem.state); +@@ -217,7 +244,7 @@ Indicator.prototype = { + } + })); + +- item.menu.addMenuItem(menuitem); ++ item.menu.addMenuItem(item._connectedMenuitem); + } + + if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) { +@@ -263,8 +290,6 @@ Indicator.prototype = { + default: + break; + } +- +- return item; + }, + + _updateFullMenu: function() { +-- +cgit v0.9 diff --git a/extra/gnome-shell/shell-recorder-missing-XFree.patch b/extra/gnome-shell/shell-recorder-missing-XFree.patch new file mode 100644 index 000000000..a7329166f --- /dev/null +++ b/extra/gnome-shell/shell-recorder-missing-XFree.patch @@ -0,0 +1,22 @@ +From 88df18345069c295e68d319606a11b7727b2bd4b Mon Sep 17 00:00:00 2001 +From: Maxim Ermilov <zaspire@rambler.ru> +Date: Tue, 24 May 2011 22:46:47 +0000 +Subject: shell-recorder: missing XFree + +https://bugzilla.gnome.org/show_bug.cgi?id=650934 +--- +diff --git a/src/shell-recorder.c b/src/shell-recorder.c +index 6555187..d297923 100644 +--- a/src/shell-recorder.c ++++ b/src/shell-recorder.c +@@ -412,6 +412,8 @@ recorder_fetch_cursor_image (ShellRecorder *recorder) + *(guint32 *)(data + i * stride + 4 * j) = cursor_image->pixels[i * cursor_image->width + j]; + + cairo_surface_mark_dirty (recorder->cursor_image); ++ ++ XFree (cursor_image); + } + + /* Overlay the cursor image on the frame. We draw the cursor image +-- +cgit v0.9 diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index b383bb180..04172d277 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117833 2011-04-04 18:12:02Z heftig $ +# $Id: PKGBUILD 124753 2011-05-24 07:53:49Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-system-monitor -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome-extra') install=gnome-system-monitor.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8d4b695ec165645c3d070f3296dc25cea4e3f1f4da7b4afa10ff1c166cc62d24') +sha256sums=('0fe6a263875b23a35fd17d8952e666e17801cb68bb664d6ce8cabcfd9ac0f972') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD index 0bc006cf1..12b8c7d90 100644 --- a/extra/gnome-themes-standard/PKGBUILD +++ b/extra/gnome-themes-standard/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 120589 2011-04-25 17:43:37Z ibiru $ +# $Id: PKGBUILD 124628 2011-05-23 14:48:53Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ groups=('gnome') replaces=('gnome-themes') conflicts=('gnome-themes') source=(http://download.gnome.org/sources/$pkgname/3.0/$pkgname-${pkgver}.tar.bz2) -sha256sums=('9630b12c02d8a05a328cb0bef111bb776b86639c9c582475943f71666ab82677') +sha256sums=('1def884063aa441860e20dd9925bb7c3b6f917bae44f77b1ada999940c463809') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index c8f8f333a..ab785b02e 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 116890 2011-03-26 01:00:08Z heftig $ +# $Id: PKGBUILD 124498 2011-05-22 15:36:35Z ibiru $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric -pkgver=1.10.14 +pkgver=1.10.15 pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/gnumeric/" license=('GPL') -depends=('goffice' 'gconf' 'desktop-file-utils') +depends=('goffice' 'gconf' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('intltool' 'python2' 'gnome-doc-utils' 'pygobject' 'psiconv') optdepends=('pygobject: for python plugin support' 'psiconv: for Psion 5 file support' @@ -17,7 +17,7 @@ optdepends=('pygobject: for python plugin support' install=gnumeric.install options=('libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b655fa76dd2e6654b8543fbcd92982e9fdcb4c0ae113aa577ce114109deb1587') +sha256sums=('4343a8e72bd19380d83ab5d4937388b2327e0dbb6187296e66dc7ca2d2b9025a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 146b627a4..475cfafca 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 123031 2011-05-07 16:07:34Z andyrtr $ +# $Id: PKGBUILD 123950 2011-05-14 15:29:59Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=2.12.4 +pkgver=2.12.5 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -10,9 +10,9 @@ license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" install=gnutls.install options=('!libtool' '!zipman') -depends=('gcc-libs>=4.4.3' 'libtasn1>=2.5' 'readline>=6.0' 'zlib' 'libgcrypt>=1.4.5') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'libgcrypt') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3e17fc8cb1cf8272067f6b66baf02810') +md5sums=('2d0bd5ae11534074fcd78da6ea384e64') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index a91420fd4..cc3b434f1 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 116834 2011-03-25 22:19:46Z heftig $ +# $Id: PKGBUILD 124493 2011-05-22 15:24:56Z ibiru $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=goffice -pkgver=0.8.14 +pkgver=0.8.15 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org" license=('GPL') options=('!libtool') -depends=('gconf' 'libgsf') +depends=('gtk2' 'gconf' 'libgsf') makedepends=('pkgconfig' 'intltool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6f86a5361ef49c60a4a87c0d5913b001f67782c2cc3eaa13c6557087bee976de') +sha256sums=('6a6ddf9821ff1547ef1977c276fa5a7c6842a1b4cb90c923d600283260aecf58') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index bfd548e0c..71cca0883 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112741 2011-03-06 12:56:57Z giovanni $ +# $Id: PKGBUILD 124848 2011-05-24 19:25:12Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=gparted -pkgver=0.8.0 -pkgrel=2 +pkgver=0.8.1 +pkgrel=1 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64' 'mips64el') url="http://gparted.sourceforge.net" @@ -21,18 +21,18 @@ optdepends=('e2fsprogs: for ext2/ext3 partitions' 'gpart: for recovering corrupt partition tables') install=gparted.install source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('29adfe33df34c03b7f800ce5374e957a') +md5sums=('ba3a434a259ae2ddcfc7f7488ee648ef') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - sed -i -e "s:Exec= /usr/sbin:Exec=gksu /usr/sbin:g" ${pkgdir}/usr/share/applications/gparted.desktop || return 1 + make DESTDIR="${pkgdir}" install + sed -i -e "s:Exec= /usr/sbin:Exec=gksu /usr/sbin:g" ${pkgdir}/usr/share/applications/gparted.desktop } diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index a4c3c3414..e5f2470f3 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 116996 2011-03-27 12:25:01Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org +# $Id: PKGBUILD 124135 2011-05-16 17:24:42Z foutrelis $ +# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Hokum <hokum_at_mail_dot_ru> + pkgname=gptfdisk pkgver=0.7.1 -pkgrel=1 -pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks." -arch=('i686' 'x86_64' 'mips64el') -url="http://www.rodsbooks.com/gdisk" +pkgrel=2 +pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" +arch=('i686' 'x86_64') +url="http://www.rodsbooks.com/gdisk/" +license=('GPL2') depends=('gcc-libs' 'util-linux' 'popt' 'icu') +provides=('gdisk') +conflicts=('gdisk') replaces=('gdisk') -license=('GPL2') -source=(http://www.rodsbooks.com/gdisk/$pkgname-$pkgver.tgz) +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tgz) +md5sums=('7c8d810df61e81c821bef399b832e89e') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" + make } package () { - cd $srcdir/$pkgname-$pkgver - install -D -m755 gdisk $pkgdir/sbin/gdisk - install -D -m755 sgdisk $pkgdir/sbin/sgdisk - install -D -m755 fixparts $pkgdir/sbin/fixparts - install -D -m644 gdisk.8 $pkgdir/usr/share/man/man8/gdisk.8 - install -D -m644 sgdisk.8 $pkgdir/usr/share/man/man8/sgdisk.8 - install -D -m644 README $pkgdir/usr/share/gdisk/README - install -D -m644 NEWS pkgdir/usr/share/gdisk/NEWS + cd "$srcdir/$pkgname-$pkgver" + + install -d "$pkgdir"/{sbin,usr/share/{man/man8,gdisk}} + install -t "$pkgdir/sbin" gdisk sgdisk fixparts + install -m644 -t "$pkgdir/usr/share/man/man8" {gdisk,sgdisk}.8 + install -m644 -t "$pkgdir/usr/share/gdisk" README NEWS } -md5sums=('7c8d810df61e81c821bef399b832e89e') + +# vim:set ts=2 sw=2 et: diff --git a/extra/gqmpeg/PKGBUILD b/extra/gqmpeg/PKGBUILD deleted file mode 100644 index 752a7e717..000000000 --- a/extra/gqmpeg/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 64726 2010-01-22 01:20:44Z eric $ -# Maintainer: damir <damir@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=gqmpeg -pkgver=0.91.1 -pkgrel=4 -pkgdesc="A frontend to mpg123 with extensive themeability and playlist support" -arch=('i686' 'x86_64' 'mips64el') -url="http://gqmpeg.sourceforge.net/" -license=('GPL2') -depends=('bash' 'gtk2' 'imlib' 'mpg123') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('e22eda86fc3e59108c8d04abc37b3e56') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install -} diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD index aa53373a3..f1bb35503 100644 --- a/extra/gstreamer0.10-base/PKGBUILD +++ b/extra/gstreamer0.10-base/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 117562 2011-04-04 10:54:18Z jgc $ +# $Id: PKGBUILD 124029 2011-05-16 08:07:30Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=('gstreamer0.10-base') pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins') -pkgver=0.10.32 -pkgrel=4 -arch=('i686' 'x86_64' 'mips64el') +pkgver=0.10.34 +pkgrel=1 +arch=('i686' 'x86_64') license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10>=0.10.32' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'udev' 'gobject-introspection') +makedepends=('pkgconfig' 'gstreamer0.10>=0.10.34' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') options=(!libtool !emptydirs) url="http://gstreamer.freedesktop.org/" source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.bz2) -md5sums=('2920af2b3162f3d9fbaa7fabc8ed4d38') +sha256sums=('7f347a60cd4317c7ea44c23e52d6e6233d2fa278b3fe3df7cbefe2bc2e253989') build() { cd "${srcdir}/gst-plugins-base-${pkgver}" @@ -28,7 +28,7 @@ build() { package_gstreamer0.10-base() { pkgdesc="GStreamer Multimedia Framework Base plugin libraries" - depends=('gstreamer0.10>=0.10.32' 'orc' 'libxv' 'udev') + depends=('gstreamer0.10>=0.10.34' 'orc' 'libxv') cd "${srcdir}/gst-plugins-base-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD index 88edd412f..9b5ddb8ac 100644 --- a/extra/gstreamer0.10-good/PKGBUILD +++ b/extra/gstreamer0.10-good/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 119465 2011-04-11 17:28:14Z jgc $ +# $Id: PKGBUILD 124034 2011-05-16 08:41:06Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-good pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') -pkgver=0.10.28 +pkgver=0.10.29 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.32' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack') +makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev') url="http://gstreamer.freedesktop.org/" options=(!libtool !emptydirs) source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2) -md5sums=('6ef1588921f59d85c44ee2e49a3c97a0') +sha256sums=('466a64dcb580d4feef701abfc90656abb3558a2e3fc1e40e43977034bebc354c') build() { cd "${srcdir}/gst-plugins-good-${pkgver}" @@ -29,9 +29,8 @@ build() { } package_gstreamer0.10-good() { - depends=('gstreamer0.10-base>=0.10.32' 'bzip2') + depends=('gstreamer0.10-base>=0.10.34' 'bzip2') pkgdesc="GStreamer Multimedia Framework Good plugin libraries" - conflicts=('gstreamer0.10-bad<=0.10.17') cd "${srcdir}/gst-plugins-good-${pkgver}" make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install @@ -39,7 +38,7 @@ package_gstreamer0.10-good() { } package_gstreamer0.10-good-plugins() { - depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse') + depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev') pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)" groups=('gstreamer0.10-plugins') replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index e83b2f165..4ab9fea99 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 117108 2011-03-28 19:26:10Z ibiru $ +# $Id: PKGBUILD 124039 2011-05-16 08:56:43Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') -pkgver=0.10.17 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') +pkgver=0.10.18 +pkgrel=1 +arch=('i686' 'x86_64') license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.32' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') +makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') url="http://gstreamer.freedesktop.org/" options=(!libtool) source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2) -md5sums=('504ed6508c3a8f035a2002ed69d68506') +md5sums=('04a7009a4efea2844075949c111f5e4d') build() { cd "${srcdir}/gst-plugins-ugly-${pkgver}" @@ -25,7 +25,7 @@ build() { package_gstreamer0.10-ugly() { pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries" - depends=('gstreamer0.10-base>=0.10.32') + depends=('gstreamer0.10-base>=0.10.34') cd "${srcdir}/gst-plugins-ugly-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/gstreamer0.10/PKGBUILD b/extra/gstreamer0.10/PKGBUILD index b875f69ee..8a6739537 100644 --- a/extra/gstreamer0.10/PKGBUILD +++ b/extra/gstreamer0.10/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 109030 2011-02-05 14:26:26Z andyrtr $ +# $Id: PKGBUILD 124024 2011-05-16 07:21:10Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer0.10 -pkgver=0.10.32 +pkgver=0.10.34 pkgrel=1 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://gstreamer.freedesktop.org/" -depends=('libxml2>=2.7.8' 'glib2>=2.24.1') -optdepends=('sh: for feedback script') +depends=('libxml2' 'glib2') +optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') options=('!libtool') source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.bz2) -md5sums=('442bc3d37b8511a73379143e7531d726') +sha256sums=('85348f70dc4b70ad1beb05c9a59a64175c5058f4ee5273f89230a3c1d11b26a3') build() { cd "${srcdir}/gstreamer-${pkgver}" diff --git a/extra/gtk-theme-switch2/PKGBUILD b/extra/gtk-theme-switch2/PKGBUILD deleted file mode 100644 index 32f61813f..000000000 --- a/extra/gtk-theme-switch2/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 75632 2010-04-02 01:24:28Z dgriffiths $ -# Contributor: Eddie Lozon <almostlucky@attbi.com> -# Contributor: Jason Chu <jason@archlinux.org> -# Contributor: Thayer Williams <thayer@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=gtk-theme-switch2 -pkgver=2.1.0 -pkgrel=1 -pkgdesc="Gtk2 theme switcher" -url="http://muhri.net/nav.php3?node=gts" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -depends=('gtk2') -source=(http://ftp.de.debian.org/debian/pool/main/g/gtk-theme-switch/gtk-theme-switch_${pkgver}.orig.tar.gz) -md5sums=('a9e7e62701cd4fba4d277dc210cd4317') - -build() { - cd ${srcdir}/gtk-theme-switch-${pkgver} - - make || return 1 -} - -package() { - cd ${srcdir}/gtk-theme-switch-${pkgver} - - install -Dm755 gtk-theme-switch2 \ - ${pkgdir}/usr/bin/gtk-theme-switch2 || return 1 - install -Dm644 gtk-theme-switch2.1 \ - ${pkgdir}/usr/share/man/man1/gtk-theme-switch2.1 || return 1 -} diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 5550647fc..4cff80b52 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122547 2011-05-04 14:30:27Z stephane $ +# $Id: PKGBUILD 125375 2011-05-26 12:54:23Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.0.9 +pkgver=3.0.10 pkgrel=2 pkgdesc="The GTK+ Toolkit (v3)" arch=('i686' 'x86_64') @@ -14,12 +14,15 @@ options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.bz2 - settings.ini) -sha256sums=('88a9dda6f2a23155ac3d7aca6b414ca3b55e2817b46bcc87733f1a407e16678c' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') + settings.ini + only_draw_resize_grip_if_its_window_exists.patch) +sha256sums=('a217ed31aed9843810eabb241239e0f2c5ca0e14bd91687cf4180b3e346abc30' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' + 'fa2bd8085cae6cdb4f3b8baae11d3c0b38afec2eb4503f5bacabf87aee15313a') build() { cd "${srcdir}/gtk+-${pkgver}" + patch -Np1 -i "${srcdir}/only_draw_resize_grip_if_its_window_exists.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch new file mode 100644 index 000000000..a6514b550 --- /dev/null +++ b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch @@ -0,0 +1,28 @@ +From 847df205ede7f624c2bc4c4498495352cc865423 Mon Sep 17 00:00:00 2001 +From: Benjamin Otte <otte@redhat.com> +Date: Mon, 23 May 2011 13:46:59 +0000 +Subject: window: Only draw resize grip if its window exists + +Don't rely on priv->resize_grip_visible as the code comment in the +variable declaration indicates. +This fixes warnings with GtkPlug, which can cause resize_grip_visible to +be TRUE but grid_window to be NULL - running tests/teststatusicon +reproduces this. + +This broke with 0cf31b35eb10cb5bc08048ecdc141c949efec4cc +--- +diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c +index b97418a..b1caa9b 100644 +--- a/gtk/gtkwindow.c ++++ b/gtk/gtkwindow.c +@@ -7304,7 +7304,7 @@ gtk_window_draw (GtkWidget *widget, + if (GTK_WIDGET_CLASS (gtk_window_parent_class)->draw) + ret = GTK_WIDGET_CLASS (gtk_window_parent_class)->draw (widget, cr); + +- if (priv->resize_grip_visible && ++ if (priv->grip_window && + gtk_cairo_should_draw_window (cr, priv->grip_window)) + { + GdkRectangle rect; +-- +cgit v0.9 diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index fb98d197d..eec9417b7 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120698 2011-04-25 23:34:40Z ibiru $ +# $Id: PKGBUILD 125532 2011-05-26 16:26:30Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.0.1 +pkgver=3.0.3 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.bz2) -sha256sums=('4e76f037184d56767e09df909490f10ee417a5265febae8a4d23255a902ae20a') +sha256sums=('582765d4ff9ec2141eaaa96d52596bee71af798bf5bc1e5fed686c60331b6de7') build() { cd "${srcdir}/$_pkgbasename-${pkgver}" diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 40322ce77..48ee41746 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120775 2011-04-26 14:51:23Z ibiru $ +# $Id: PKGBUILD 124634 2011-05-23 15:36:42Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.8.1 +pkgver=1.8.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -13,7 +13,7 @@ makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('7d305320d881d914d88286a72a311587ea33fbe5075101729cb5766f01832ff7') +sha256sums=('0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD index 8fe42ce6e..aa432f086 100644 --- a/extra/help2man/PKGBUILD +++ b/extra/help2man/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 116002 2011-03-22 15:28:48Z giovanni $ +# $Id: PKGBUILD 124968 2011-05-25 13:58:20Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> pkgname=help2man -pkgver=1.39.2 +pkgver=1.39.4 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/help2man/" license=('GPL') depends=('perl-locale-gettext') +install=help2man.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('36659da3ba7a9a51813e1c4848900a28') +md5sums=('6b1160697451ba87067231d172285840') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/help2man/help2man.install b/extra/help2man/help2man.install new file mode 100644 index 000000000..ab6585b91 --- /dev/null +++ b/extra/help2man/help2man.install @@ -0,0 +1,18 @@ +info_dir=/usr/share/info +info_files=(help2man.info) + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/extra/htop/ChangeLog b/extra/htop/ChangeLog index 686b0e181..ea5776244 100644 --- a/extra/htop/ChangeLog +++ b/extra/htop/ChangeLog @@ -1,3 +1,6 @@ +2011-05-17 Angel Velasquez <angvp@archlinux.org> + * Added patch to fix --sort-key (closes FS#23224) + 2009-09-21 Eric Belanger <eric@archlinux.org> * htop 0.8.3-1 diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD index 75cb3940d..447b035a7 100644 --- a/extra/htop/PKGBUILD +++ b/extra/htop/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 105144 2011-01-06 20:57:13Z angvp $ +# $Id: PKGBUILD 124246 2011-05-18 04:38:36Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=htop pkgver=0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Interactive process viewer" arch=('i686' 'x86_64' 'mips64el') url="http://htop.sourceforge.net/" @@ -12,13 +13,17 @@ license=('GPL') depends=('ncurses') makedepends=('python2') options=('!emptydirs') -source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz) -md5sums=('7c5507f35f363f3f40183a2ba3c561f8') +changelog=ChangeLog +source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz + htop.c.patch) +md5sums=('7c5507f35f363f3f40183a2ba3c561f8' + '750e8ad8476c5d9738da2a2bc7a7c2b6') build() { cd ${srcdir}/${pkgname}-${pkgver} sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure sed -i 's|python|python2|' scripts/MakeHeader.py + patch -Np0 -i $srcdir/htop.c.patch ./configure --prefix=/usr --enable-unicode --enable-openvz \ --enable-vserver make diff --git a/extra/htop/htop.c.patch b/extra/htop/htop.c.patch new file mode 100644 index 000000000..41a2dd377 --- /dev/null +++ b/extra/htop/htop.c.patch @@ -0,0 +1,15 @@ +From: Roman Kosenko <madkite@gmail.com> +Date: Thu, 10 Mar 2011 16:23:53 +0200 +Subject: [PATCH] Fix stupid bug with --sort-key + +--- htop.c.old 2010-11-24 20:45:38.000000000 +0200 ++++ htop.c 2011-03-10 16:32:18.473716667 +0200 +@@ -282,7 +282,7 @@ + printVersionFlag(); + break; + case 's': +- if (strcmp(optarg, "help")) { ++ if (!strcmp(optarg, "help")) { + for (int j = 1; j < LAST_PROCESSFIELD; j++) + printf ("%s\n", Process_fieldNames[j]); + exit(0); diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 9d0759d68..6029c1ebe 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 112014 2011-03-03 05:10:44Z eric $ +# $Id: PKGBUILD 124912 2011-05-25 06:37:46Z eric $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin pkgver=2010.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="A frontend to the panorama-tools" arch=('i686' 'x86_64' 'mips64el') url="http://hugin.sourceforge.net/" @@ -14,13 +14,15 @@ depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') makedepends=('zip' 'cmake' 'boost') install=${pkgname}.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('bfd716655461987312b2f2f00c90dcc5') -sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 hugin-gcc46.patch) +md5sums=('bfd716655461987312b2f2f00c90dcc5' + '4393c7b31da60f230c85e63a6a2e43a0') +sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07' + '52798a155a037f853f41402f797e8a4cb6bb3e07') build() { cd "${srcdir}" - + (cd ${pkgname}-${pkgver}; patch -p1 -i ../hugin-gcc46.patch) mkdir build && cd build cmake "${srcdir}/${pkgname}-${pkgver}" \ diff --git a/extra/hugin/hugin-gcc46.patch b/extra/hugin/hugin-gcc46.patch new file mode 100644 index 000000000..98a70ad50 --- /dev/null +++ b/extra/hugin/hugin-gcc46.patch @@ -0,0 +1,16 @@ + +diff -r 0377a1af6110 -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx +--- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jun 25 16:36:21 2007 +0000 ++++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000 +@@ -41,6 +41,7 @@ + #define VIGRA_MULTI_ITERATOR_HXX + + #include <sys/types.h> ++#include <stddef.h> + #include "tinyvector.hxx" + #include "iteratortags.hxx" + + + + + diff --git a/extra/icecast/PKGBUILD b/extra/icecast/PKGBUILD deleted file mode 100644 index 84c7d48c4..000000000 --- a/extra/icecast/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 109082 2011-02-05 20:09:03Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Jason Chu <jchu@xentac.net> - -pkgname=icecast -pkgver=2.3.2 -pkgrel=5 -pkgdesc="Streaming audio over the Internet" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.icecast.org/" -depends=('libxslt' 'libvorbis' 'curl' 'speex' 'libtheora') -backup=('etc/icecast.xml' - 'etc/logrotate.d/icecast') -source=("http://downloads.us.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'icecastd' 'icecast.logrotate' - 'start-by-nobody.patch') -md5sums=('ff516b3ccd2bcc31e68f460cd316093f' - 'e823c1fdb080aae3d0c54ef8be95f7cb' - '59c6552bcb1dd9fb542af8670dfabd3c' - 'd8e929d2214123a1954da4383bf16583') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - patch -Np1 -i ${srcdir}/start-by-nobody.patch - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - # install man-page - sed -i -e 's/icecast2/icecast/g' debian/icecast2.1 - install -Dm644 debian/icecast2.1 \ - ${pkgdir}/usr/share/man/man1/icecast.1 - - # init file - install -Dm755 ${srcdir}/icecastd \ - ${pkgdir}/etc/rc.d/icecast - # rotate the logs (taken from Fedora) - install -Dm644 ${srcdir}/icecast.logrotate \ - ${pkgdir}/etc/logrotate.d/icecast - - # install log dir - install -d -g99 -o99 ${pkgdir}/var/log/icecast -} diff --git a/extra/icecast/icecast.logrotate b/extra/icecast/icecast.logrotate deleted file mode 100644 index 0fb014c06..000000000 --- a/extra/icecast/icecast.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/icecast/*log { - missingok - notifempty - sharedscripts - postrotate - endscript -} - diff --git a/extra/icecast/icecastd b/extra/icecast/icecastd deleted file mode 100644 index e6c91b08c..000000000 --- a/extra/icecast/icecastd +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -timeo=30 - -getPID() { - pgrep -u nobody icecast 2>/dev/null -} - -case $1 in - start) - stat_busy "Starting Icecast Server" - if getPID >/dev/null; then - # already running - stat_fail - exit 1 - else - /usr/bin/icecast -b -c /etc/icecast.xml &>/dev/null - while (( timeo > 0 )); do - if getPID >/dev/null; then - add_daemon icecast - stat_done - exit 0 - fi - sleep 1 - (( timeo-- )) - done - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Icecast Server" - if ! getPID >/dev/null; then - # not running - stat_done - exit 1 - fi - if ! kill $(getPID) &> /dev/null; then - stat_fail - exit 1 - fi - while (( timeo > 0 )); do - if getPID >/dev/null; then - rm_daemon icecast - stat_done - exit 0 - fi - sleep 1 - (( timeo-- )) - done - stat_fail - exit 1 - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/icecast/start-by-nobody.patch b/extra/icecast/start-by-nobody.patch deleted file mode 100644 index d218e5afe..000000000 --- a/extra/icecast/start-by-nobody.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- icecast-2.3.2/conf/icecast.xml.in~ 2010-11-12 16:47:54.750000918 +0100 -+++ icecast-2.3.2/conf/icecast.xml.in 2010-11-12 16:48:08.086667585 +0100 -@@ -164,11 +164,9 @@ - - <security> - <chroot>0</chroot> -- <!-- - <changeowner> - <user>nobody</user> -- <group>nogroup</group> -+ <group>nobody</group> - </changeowner> -- --> - </security> - </icecast> diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 35cc5fa90..db4a0aba4 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 114609 2011-03-14 15:02:27Z jgc $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id: PKGBUILD 125606 2011-05-26 21:06:33Z bisson $ +# Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape pkgver=0.48.1 -pkgrel=2 +pkgrel=3 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' arch=('i686' 'x86_64' 'mips64el') @@ -13,33 +14,40 @@ makedepends=('boost' 'pkg-config' 'intltool') depends=('gc' 'gtkmm' 'poppler-glib' 'pyxml' 'libxslt' 'gsl' 'popt' 'python2' 'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('python2-numpy: some extensions' - 'python-lxml: some extensions and filters') + 'python-lxml: some extensions and filters' + 'uniconvertor: reading/writing to some proprietary formats') options=('!libtool') -install=inkscape.install -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('a43467119925aee70d1d63d746f9846abb4dea91') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'gcc46.patch') +sha1sums=('a43467119925aee70d1d63d746f9846abb4dea91' + '7163f35978538a6e223005737e8707b6f847fab3') + +install=install build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --with-python \ - --with-perl \ - --without-gnome-vfs \ - --with-xft \ - --enable-lcms \ - --enable-poppler-cairo \ - --disable-dependency-tracking - - sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py - sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py - sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp - sed -i 's|\<python -c |python2 -c|g' share/extensions/uniconv*.py - sed -i 's|"python"|"python2"|g' src/main.cpp - - make + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../gcc46.patch + sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py + sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py + sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp + sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py + sed -i 's|"python"|"python2"|g' src/main.cpp + + ./configure --prefix=/usr \ + --with-python \ + --with-perl \ + --without-gnome-vfs \ + --with-xft \ + --enable-lcms \ + --enable-poppler-cairo \ + --disable-dependency-tracking \ + + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install } diff --git a/extra/inkscape/gcc46.patch b/extra/inkscape/gcc46.patch new file mode 100644 index 000000000..d04914c87 --- /dev/null +++ b/extra/inkscape/gcc46.patch @@ -0,0 +1,849 @@ +diff -aur old/src/2geom/utils.h new/src/2geom/utils.h +--- old/src/2geom/utils.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/2geom/utils.h 2011-05-26 14:38:55.912288964 +0000 +@@ -35,6 +35,7 @@ + + #include <cmath> + #include <vector> ++#include <cstddef> + + namespace Geom { + +diff -aur old/src/arc-context.h new/src/arc-context.h +--- old/src/arc-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/arc-context.h 2011-05-26 14:37:30.814792031 +0000 +@@ -15,6 +15,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/connection.h> + + #include <2geom/point.h> +diff -aur old/src/box3d-context.h new/src/box3d-context.h +--- old/src/box3d-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/box3d-context.h 2011-05-26 14:37:30.814792031 +0000 +@@ -15,6 +15,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "proj_pt.h" +diff -aur old/src/conn-avoid-ref.h new/src/conn-avoid-ref.h +--- old/src/conn-avoid-ref.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/conn-avoid-ref.h 2011-05-26 14:37:30.814792031 +0000 +@@ -14,6 +14,7 @@ + */ + + #include <glib/gslist.h> ++#include <stddef.h> + #include <sigc++/connection.h> + + struct SPDesktop; +diff -aur old/src/connection-pool.h new/src/connection-pool.h +--- old/src/connection-pool.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/connection-pool.h 2011-05-26 14:37:30.814792031 +0000 +@@ -3,6 +3,7 @@ + + #include <glib-object.h> + #include <gtkmm.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape +diff -aur old/src/connector-context.h new/src/connector-context.h +--- old/src/connector-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/connector-context.h 2011-05-26 14:37:30.814792120 +0000 +@@ -12,6 +12,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <sigc++/connection.h> + #include "event-context.h" +diff -aur old/src/desktop.h new/src/desktop.h +--- old/src/desktop.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/desktop.h 2011-05-26 14:37:30.814792120 +0000 +@@ -27,6 +27,7 @@ + + #include <gdk/gdkevents.h> + #include <gtk/gtktypeutils.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #include <2geom/matrix.h> +diff -aur old/src/dialogs/object-attributes.cpp new/src/dialogs/object-attributes.cpp +--- old/src/dialogs/object-attributes.cpp 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/dialogs/object-attributes.cpp 2011-05-26 14:37:30.814792120 +0000 +@@ -13,6 +13,7 @@ + #include <glibmm/i18n.h> + #include <string> + #include <cstring> ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/functors/ptr_fun.h> + #include <sigc++/adaptors/bind.h> +diff -aur old/src/display/canvas-temporary-item.h new/src/display/canvas-temporary-item.h +--- old/src/display/canvas-temporary-item.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/display/canvas-temporary-item.h 2011-05-26 14:37:30.814792120 +0000 +@@ -14,6 +14,7 @@ + + #include "display/display-forward.h" + ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape { +diff -aur old/src/document.h new/src/document.h +--- old/src/document.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/document.h 2011-05-26 14:37:30.814792120 +0000 +@@ -17,6 +17,7 @@ + + #include <glib-object.h> + #include <gtk/gtksignal.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <sigc++/class_slot.h> + +diff -aur old/src/document-private.h new/src/document-private.h +--- old/src/document-private.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/document-private.h 2011-05-26 14:37:30.814792120 +0000 +@@ -14,6 +14,7 @@ + */ + + #include <map> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "xml/event-fns.h" + #include "sp-defs.h" +diff -aur old/src/document-subset.h new/src/document-subset.h +--- old/src/document-subset.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/document-subset.h 2011-05-26 14:37:30.814792120 +0000 +@@ -10,6 +10,7 @@ + #ifndef SEEN_INKSCAPE_DOCUMENT_SUBSET_H + #define SEEN_INKSCAPE_DOCUMENT_SUBSET_H + ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/functors/slot.h> + +diff -aur old/src/draw-context.h new/src/draw-context.h +--- old/src/draw-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/draw-context.h 2011-05-26 14:37:30.814792120 +0000 +@@ -14,6 +14,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include <forward.h> +diff -aur old/src/extension/timer.h new/src/extension/timer.h +--- old/src/extension/timer.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/extension/timer.h 2011-05-26 14:37:30.814792120 +0000 +@@ -13,6 +13,7 @@ + #ifndef INKSCAPE_EXTENSION_TIMER_H__ + #define INKSCAPE_EXTENSION_TIMER_H__ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glibmm/timeval.h> + #include "extension-forward.h" +diff -aur old/src/flood-context.h new/src/flood-context.h +--- old/src/flood-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/flood-context.h 2011-05-26 14:37:30.814792120 +0000 +@@ -11,6 +11,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gtk/gtk.h> + #include "event-context.h" +diff -aur old/src/gc-alloc.h new/src/gc-alloc.h +--- old/src/gc-alloc.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/gc-alloc.h 2011-05-26 14:37:30.814792120 +0000 +@@ -16,6 +16,7 @@ + #define SEEN_INKSCAPE_GC_ALLOC_H + + #include <limits> ++#include <cstddef> + #include "gc-core.h" + + namespace Inkscape { +diff -aur old/src/gc.cpp new/src/gc.cpp +--- old/src/gc.cpp 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/gc.cpp 2011-05-26 14:37:30.814792120 +0000 +@@ -16,6 +16,7 @@ + #include <glib/gmessages.h> + #include <sigc++/functors/ptr_fun.h> + #include <glibmm/main.h> ++#include <cstddef> + + namespace Inkscape { + namespace GC { +diff -aur old/src/gc-finalized.h new/src/gc-finalized.h +--- old/src/gc-finalized.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/gc-finalized.h 2011-05-26 14:37:30.814792120 +0000 +@@ -17,6 +17,7 @@ + #define SEEN_INKSCAPE_GC_FINALIZED_H + + #include <new> ++#include <cstddef> + #include "gc-core.h" + + namespace Inkscape { +diff -aur old/src/gradient-context.h new/src/gradient-context.h +--- old/src/gradient-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/gradient-context.h 2011-05-26 14:37:30.814792120 +0000 +@@ -15,6 +15,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + +diff -aur old/src/gradient-drag.h new/src/gradient-drag.h +--- old/src/gradient-drag.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/gradient-drag.h 2011-05-26 14:37:30.814792120 +0000 +@@ -15,6 +15,7 @@ + */ + + #include <glib/gslist.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <vector> + +diff -aur old/src/knot.h new/src/knot.h +--- old/src/knot.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/knot.h 2011-05-26 14:37:30.814792120 +0000 +@@ -20,6 +20,7 @@ + #include "forward.h" + #include <2geom/point.h> + #include "knot-enums.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class SPKnot; +diff -aur old/src/libavoid/geomtypes.h new/src/libavoid/geomtypes.h +--- old/src/libavoid/geomtypes.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/libavoid/geomtypes.h 2011-05-26 14:37:30.814792120 +0000 +@@ -29,6 +29,7 @@ + #ifndef AVOID_GEOMTYPES_H + #define AVOID_GEOMTYPES_H + ++#include <cstddef> + #include <vector> + #include <utility> + +diff -aur old/src/live_effects/lpeobject-reference.h new/src/live_effects/lpeobject-reference.h +--- old/src/live_effects/lpeobject-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/live_effects/lpeobject-reference.h 2011-05-26 14:37:30.818124452 +0000 +@@ -11,6 +11,7 @@ + + #include <forward.h> + #include <uri-references.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape { +diff -aur old/src/live_effects/parameter/path.h new/src/live_effects/parameter/path.h +--- old/src/live_effects/parameter/path.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/live_effects/parameter/path.h 2011-05-26 14:37:30.818124452 +0000 +@@ -16,6 +16,7 @@ + + #include "live_effects/parameter/parameter.h" + #include "live_effects/parameter/path-reference.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape { +diff -aur old/src/live_effects/parameter/path-reference.h new/src/live_effects/parameter/path-reference.h +--- old/src/live_effects/parameter/path-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/live_effects/parameter/path-reference.h 2011-05-26 14:37:30.818124452 +0000 +@@ -11,6 +11,7 @@ + + #include <forward.h> + #include <uri-references.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class Path; +diff -aur old/src/Makefile.am new/src/Makefile.am +--- old/src/Makefile.am 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/Makefile.am 2011-05-26 14:37:30.814792031 +0000 +@@ -205,7 +205,7 @@ + + inkscape_SOURCES += main.cpp $(win32_sources) + inkscape_LDADD = $(all_libs) +-inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows) ++inkscape_LDFLAGS = -Wl,--export-dynamic $(kdeldflags) $(mwindows) + + inkview_SOURCES += inkview.cpp $(win32_sources) + inkview_LDADD = $(all_libs) +diff -aur old/src/message-stack.h new/src/message-stack.h +--- old/src/message-stack.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/message-stack.h 2011-05-26 14:37:30.818124452 +0000 +@@ -14,6 +14,7 @@ + #ifndef SEEN_INKSCAPE_MESSAGE_STACK_H + #define SEEN_INKSCAPE_MESSAGE_STACK_H + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glib.h> + #include <stdarg.h> +diff -aur old/src/object-hierarchy.h new/src/object-hierarchy.h +--- old/src/object-hierarchy.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/object-hierarchy.h 2011-05-26 14:37:30.818124452 +0000 +@@ -14,6 +14,7 @@ + + #include <exception> + #include <list> ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/signal.h> + #include <glib/gmessages.h> +diff -aur old/src/persp3d-reference.h new/src/persp3d-reference.h +--- old/src/persp3d-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/persp3d-reference.h 2011-05-26 14:37:30.818124452 +0000 +@@ -11,6 +11,7 @@ + */ + + #include "uri-references.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "persp3d.h" + +diff -aur old/src/rect-context.h new/src/rect-context.h +--- old/src/rect-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/rect-context.h 2011-05-26 14:37:30.818124452 +0000 +@@ -14,6 +14,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "libnr/nr-point.h" +diff -aur old/src/selcue.h new/src/selcue.h +--- old/src/selcue.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/selcue.h 2011-05-26 14:37:30.818124452 +0000 +@@ -14,6 +14,7 @@ + */ + + #include <list> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class SPDesktop; +diff -aur old/src/selection-describer.h new/src/selection-describer.h +--- old/src/selection-describer.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/selection-describer.h 2011-05-26 14:37:30.818124452 +0000 +@@ -12,6 +12,7 @@ + #ifndef SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H + #define SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "message-context.h" + +diff -aur old/src/selection.h new/src/selection.h +--- old/src/selection.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/selection.h 2011-05-26 14:37:30.818124452 +0000 +@@ -19,6 +19,7 @@ + #include <vector> + #include <map> + #include <list> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + //#include "libnr/nr-rect.h" +diff -aur old/src/seltrans.h new/src/seltrans.h +--- old/src/seltrans.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/seltrans.h 2011-05-26 14:37:30.818124452 +0000 +@@ -15,6 +15,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <2geom/point.h> + #include <2geom/matrix.h> +diff -aur old/src/sp-conn-end.h new/src/sp-conn-end.h +--- old/src/sp-conn-end.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-conn-end.h 2011-05-26 14:37:30.818124452 +0000 +@@ -2,6 +2,7 @@ + #define SEEN_SP_CONN_END + + #include <glib/gtypes.h> ++#include <stddef.h> + #include <sigc++/connection.h> + + #include "sp-use-reference.h" +diff -aur old/src/sp-conn-end-pair.h new/src/sp-conn-end-pair.h +--- old/src/sp-conn-end-pair.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-conn-end-pair.h 2011-05-26 14:37:30.818124452 +0000 +@@ -15,6 +15,7 @@ + + #include "forward.h" + #include "libnr/nr-point.h" ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/functors/slot.h> + #include <sigc++/signal.h> +diff -aur old/src/sp-gradient.h new/src/sp-gradient.h +--- old/src/sp-gradient.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/sp-gradient.h 2011-05-26 14:37:30.818124452 +0000 +@@ -25,6 +25,7 @@ + #include "sp-gradient-units.h" + #include "sp-gradient-vector.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + struct SPGradientReference; +diff -aur old/src/spiral-context.h new/src/spiral-context.h +--- old/src/spiral-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/spiral-context.h 2011-05-26 14:37:30.821456796 +0000 +@@ -16,6 +16,7 @@ + */ + + #include <gtk/gtktypeutils.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "libnr/nr-point.h" +diff -aur old/src/sp-object.h new/src/sp-object.h +--- old/src/sp-object.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-object.h 2011-05-26 14:37:30.818124452 +0000 +@@ -56,6 +56,7 @@ + + + #include <glib-object.h> ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/functors/slot.h> + #include <sigc++/signal.h> +diff -aur old/src/sp-offset.h new/src/sp-offset.h +--- old/src/sp-offset.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-offset.h 2011-05-26 14:37:30.818124452 +0000 +@@ -16,6 +16,7 @@ + + #include "sp-shape.h" + ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #define SP_TYPE_OFFSET (sp_offset_get_type ()) +diff -aur old/src/sp-pattern.h new/src/sp-pattern.h +--- old/src/sp-pattern.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-pattern.h 2011-05-26 14:37:30.818124452 +0000 +@@ -32,6 +32,7 @@ + #include "sp-paint-server.h" + #include "uri-references.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + class SPPatternReference : public Inkscape::URIReference { +diff -aur old/src/sp-shape.h new/src/sp-shape.h +--- old/src/sp-shape.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-shape.h 2011-05-26 14:37:30.818124452 +0000 +@@ -19,6 +19,7 @@ + #include "sp-marker-loc.h" + #include <2geom/forward.h> + ++#include <stddef.h> + #include <sigc++/connection.h> + + #define SP_TYPE_SHAPE (sp_shape_get_type ()) +diff -aur old/src/sp-switch.h new/src/sp-switch.h +--- old/src/sp-switch.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-switch.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + + #include "sp-item-group.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + #define SP_TYPE_SWITCH (CSwitch::getType()) +diff -aur old/src/sp-text.h new/src/sp-text.h +--- old/src/sp-text.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-text.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + */ + + #include <glib/gtypes.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "sp-item.h" + #include "sp-string.h" +diff -aur old/src/sp-tref-reference.h new/src/sp-tref-reference.h +--- old/src/sp-tref-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-tref-reference.h 2011-05-26 14:37:30.821456796 +0000 +@@ -13,6 +13,7 @@ + + #include <forward.h> + #include <uri-references.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #include "util/share.h" +diff -aur old/src/sp-use.h new/src/sp-use.h +--- old/src/sp-use.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-use.h 2011-05-26 14:37:30.821456796 +0000 +@@ -13,6 +13,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "svg/svg-length.h" + #include "sp-item.h" +diff -aur old/src/sp-use-reference.h new/src/sp-use-reference.h +--- old/src/sp-use-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-use-reference.h 2011-05-26 14:37:30.821456796 +0000 +@@ -11,6 +11,7 @@ + + #include <forward.h> + #include <uri-references.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class Path; +diff -aur old/src/star-context.h new/src/star-context.h +--- old/src/star-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/star-context.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "libnr/nr-point.h" +diff -aur old/src/style.h new/src/style.h +--- old/src/style.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/style.h 2011-05-26 14:37:30.821456796 +0000 +@@ -24,6 +24,7 @@ + #include "uri.h" + #include "sp-paint-server.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + namespace Inkscape { +diff -aur old/src/text-context.h new/src/text-context.h +--- old/src/text-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/text-context.h 2011-05-26 14:37:30.821456796 +0000 +@@ -15,6 +15,7 @@ + */ + + /* #include <gdk/gdkic.h> */ ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gtk/gtkimcontext.h> + +diff -aur old/src/ui/dialog/desktop-tracker.h new/src/ui/dialog/desktop-tracker.h +--- old/src/ui/dialog/desktop-tracker.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/dialog/desktop-tracker.h 2011-05-26 14:37:30.821456796 +0000 +@@ -11,6 +11,7 @@ + #ifndef SEEN_DIALOG_DESKTOP_TRACKER + #define SEEN_DIALOG_DESKTOP_TRACKER + ++#include <stddef.h> + #include <sigc++/connection.h> + #include <glib/gtypes.h> + +diff -aur old/src/ui/dialog/document-metadata.h new/src/ui/dialog/document-metadata.h +--- old/src/ui/dialog/document-metadata.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/dialog/document-metadata.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + #define INKSCAPE_UI_DIALOG_DOCUMENT_METADATA_H + + #include <list> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gtkmm/notebook.h> + #include <glibmm/i18n.h> +diff -aur old/src/ui/dialog/document-properties.h new/src/ui/dialog/document-properties.h +--- old/src/ui/dialog/document-properties.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/dialog/document-properties.h 2011-05-26 14:37:30.821456796 +0000 +@@ -15,6 +15,7 @@ + #define INKSCAPE_UI_DIALOG_DOCUMENT_PREFERENCES_H + + #include <list> ++#include <stddef.h> + #include <sigc++/sigc++.h>// + #include <gtkmm/notebook.h> + #include <glibmm/i18n.h> +diff -aur old/src/ui/dialog/inkscape-preferences.h new/src/ui/dialog/inkscape-preferences.h +--- old/src/ui/dialog/inkscape-preferences.h 2010-11-06 18:47:19.806162000 +0000 ++++ new/src/ui/dialog/inkscape-preferences.h 2011-05-26 14:37:30.821456796 +0000 +@@ -28,6 +28,7 @@ + #include <gtkmm/frame.h> + #include <gtkmm/notebook.h> + #include "ui/widget/preferences-widget.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glibmm/i18n.h> + #include <gtkmm/textview.h> +diff -aur old/src/ui/dialog/undo-history.cpp new/src/ui/dialog/undo-history.cpp +--- old/src/ui/dialog/undo-history.cpp 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/dialog/undo-history.cpp 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + + #include <glibmm/i18n.h> + #include <gtk/gtkimage.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + +diff -aur old/src/ui/tool/control-point.h new/src/ui/tool/control-point.h +--- old/src/ui/tool/control-point.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/tool/control-point.h 2011-05-26 14:37:30.821456796 +0000 +@@ -12,6 +12,7 @@ + #define SEEN_UI_TOOL_CONTROL_POINT_H + + #include <boost/utility.hpp> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gdkmm.h> + #include <gtkmm.h> +diff -aur old/src/ui/tool/control-point-selection.h new/src/ui/tool/control-point-selection.h +--- old/src/ui/tool/control-point-selection.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/ui/tool/control-point-selection.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + + #include <memory> + #include <boost/optional.hpp> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <2geom/forward.h> + #include <2geom/point.h> +diff -aur old/src/ui/tool/manipulator.h new/src/ui/tool/manipulator.h +--- old/src/ui/tool/manipulator.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/tool/manipulator.h 2011-05-26 14:37:30.821456796 +0000 +@@ -13,6 +13,7 @@ + + #include <set> + #include <map> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glib.h> + #include <gdk/gdk.h> +diff -aur old/src/ui/tool/multi-path-manipulator.h new/src/ui/tool/multi-path-manipulator.h +--- old/src/ui/tool/multi-path-manipulator.h 2010-11-06 18:47:19.806162000 +0000 ++++ new/src/ui/tool/multi-path-manipulator.h 2011-05-26 14:37:30.821456796 +0000 +@@ -11,6 +11,7 @@ + #ifndef SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H + #define SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H + ++#include <stddef.h> + #include <sigc++/connection.h> + #include "display/display-forward.h" + #include "forward.h" +diff -aur old/src/ui/tool/node.h new/src/ui/tool/node.h +--- old/src/ui/tool/node.h 2011-01-02 04:34:09.814902000 +0000 ++++ new/src/ui/tool/node.h 2011-05-26 14:37:30.821456796 +0000 +@@ -15,6 +15,7 @@ + #include <iterator> + #include <iosfwd> + #include <stdexcept> ++#include <cstddef> + #include <tr1/functional> + #include <boost/utility.hpp> + #include <boost/shared_ptr.hpp> +diff -aur old/src/ui/tool/node-tool.h new/src/ui/tool/node-tool.h +--- old/src/ui/tool/node-tool.h 2010-11-06 18:47:19.806162000 +0000 ++++ new/src/ui/tool/node-tool.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + #include <memory> + #include <boost/ptr_container/ptr_map.hpp> + #include <glib.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "forward.h" +diff -aur old/src/ui/view/view.h new/src/ui/view/view.h +--- old/src/ui/view/view.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/view/view.h 2011-05-26 14:37:30.821456796 +0000 +@@ -15,6 +15,7 @@ + */ + + #include <gdk/gdktypes.h> ++#include <stddef.h> + #include <sigc++/connection.h> + #include "message.h" + #include "gc-managed.h" +diff -aur old/src/ui/widget/color-picker.h new/src/ui/widget/color-picker.h +--- old/src/ui/widget/color-picker.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/color-picker.h 2011-05-26 14:37:30.824789230 +0000 +@@ -13,6 +13,7 @@ + #ifndef __COLOR_PICKER_H__ + #define __COLOR_PICKER_H__ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gtkmm/button.h> + #include <gtkmm/dialog.h> +diff -aur old/src/ui/widget/page-sizer.h new/src/ui/widget/page-sizer.h +--- old/src/ui/widget/page-sizer.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/page-sizer.h 2011-05-26 14:37:30.824789230 +0000 +@@ -13,6 +13,7 @@ + #define INKSCAPE_UI_WIDGET_PAGE_SIZER__H + + #include <gtkmm.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #include "helper/units.h" +diff -aur old/src/ui/widget/preferences-widget.h new/src/ui/widget/preferences-widget.h +--- old/src/ui/widget/preferences-widget.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/preferences-widget.h 2011-05-26 14:37:30.824789230 +0000 +@@ -26,6 +26,7 @@ + #include <gtkmm/drawingarea.h> + #include <gtkmm/frame.h> + #include <gtkmm/filechooserbutton.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glibmm/i18n.h> + +diff -aur old/src/ui/widget/selected-style.h new/src/ui/widget/selected-style.h +--- old/src/ui/widget/selected-style.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/selected-style.h 2011-05-26 14:37:30.824789230 +0000 +@@ -23,6 +23,7 @@ + #include <gtkmm/adjustment.h> + #include <gtkmm/spinbutton.h> + ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #include <glibmm/i18n.h> +diff -aur old/src/ui/widget/style-subject.h new/src/ui/widget/style-subject.h +--- old/src/ui/widget/style-subject.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/style-subject.h 2011-05-26 14:37:30.824789230 +0000 +@@ -14,6 +14,7 @@ + #include "libnr/nr-rect.h" + #include <2geom/rect.h> + #include "sp-item.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class SPDesktop; +diff -aur old/src/uri-references.h new/src/uri-references.h +--- old/src/uri-references.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/uri-references.h 2011-05-26 14:37:30.824789230 +0000 +@@ -13,6 +13,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/trackable.h> + +diff -aur old/src/util/forward-pointer-iterator.h new/src/util/forward-pointer-iterator.h +--- old/src/util/forward-pointer-iterator.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/util/forward-pointer-iterator.h 2011-05-26 14:37:30.824789230 +0000 +@@ -15,6 +15,7 @@ + #define SEEN_INKSCAPE_UTIL_FORWARD_POINTER_ITERATOR_H + + #include <iterator> ++#include <cstddef> + #include "util/reference.h" + + namespace Inkscape { +diff -aur old/src/util/share.h new/src/util/share.h +--- old/src/util/share.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/util/share.h 2011-05-26 14:37:30.824789230 +0000 +@@ -14,6 +14,7 @@ + + #include "gc-core.h" + #include <cstring> ++#include <cstddef> + + namespace Inkscape { + namespace Util { +diff -aur old/src/util/unordered-containers.h new/src/util/unordered-containers.h +--- old/src/util/unordered-containers.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/util/unordered-containers.h 2011-05-26 14:37:30.824789230 +0000 +@@ -41,6 +41,8 @@ + # define INK_UNORDERED_MAP __gnu_cxx::hash_map + # define INK_HASH __gnu_cxx::hash + ++#include <cstddef> ++ + namespace __gnu_cxx { + // hash function for pointers + // TR1 and Boost have this defined by default, __gnu_cxx doesn't +diff -aur old/src/widgets/desktop-widget.h new/src/widgets/desktop-widget.h +--- old/src/widgets/desktop-widget.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/desktop-widget.h 2011-05-26 14:37:30.824789230 +0000 +@@ -21,6 +21,7 @@ + #include "ui/view/view-widget.h" + #include "ui/view/edit-widget-interface.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + // forward declaration +diff -aur old/src/widgets/gradient-image.h new/src/widgets/gradient-image.h +--- old/src/widgets/gradient-image.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/gradient-image.h 2011-05-26 14:37:30.824789230 +0000 +@@ -19,6 +19,7 @@ + + #include <glib.h> + ++#include <stddef.h> + #include <sigc++/connection.h> + + #define SP_TYPE_GRADIENT_IMAGE (sp_gradient_image_get_type ()) +diff -aur old/src/widgets/gradient-vector.h new/src/widgets/gradient-vector.h +--- old/src/widgets/gradient-vector.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/gradient-vector.h 2011-05-26 14:37:30.824789230 +0000 +@@ -17,6 +17,7 @@ + + #include <glib.h> + ++#include <stddef.h> + #include <sigc++/connection.h> + + #include <gtk/gtkvbox.h> +diff -aur old/src/widgets/sp-attribute-widget.h new/src/widgets/sp-attribute-widget.h +--- old/src/widgets/sp-attribute-widget.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/sp-attribute-widget.h 2011-05-26 14:37:30.824789230 +0000 +@@ -14,6 +14,7 @@ + #define SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H + + #include <glib.h> ++#include <stddef.h> + #include <sigc++/connection.h> + + #define SP_TYPE_ATTRIBUTE_WIDGET (sp_attribute_widget_get_type ()) +diff -aur old/src/widgets/sp-color-notebook.cpp new/src/widgets/sp-color-notebook.cpp +--- old/src/widgets/sp-color-notebook.cpp 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/sp-color-notebook.cpp 2011-05-26 14:37:30.824789230 +0000 +@@ -22,6 +22,7 @@ + #include <cstring> + #include <string> + #include <cstdlib> ++#include <cstddef> + #include <gtk/gtk.h> + #include <glibmm/i18n.h> + +diff -aur old/src/xml/helper-observer.h new/src/xml/helper-observer.h +--- old/src/xml/helper-observer.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/xml/helper-observer.h 2011-05-26 14:37:30.824789230 +0000 +@@ -5,6 +5,7 @@ + #include "node.h" + #include "../sp-object.h" + //#include "../sp-object-repr.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape { diff --git a/extra/kmldonkey/kmldonkey.install b/extra/inkscape/install index e70c054ec..6e803bf1d 100644 --- a/extra/kmldonkey/kmldonkey.install +++ b/extra/inkscape/install @@ -1,11 +1,13 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { post_install } + post_remove() { post_install } diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index f8a341783..210e6cead 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122250 2011-05-03 10:29:38Z andrea $ +# $Id: PKGBUILD 124831 2011-05-24 17:22:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace pkgver=4.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -16,8 +16,7 @@ groups=('kde') depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz' 'libqalculate' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx' 'xorg-xsetroot' 'libxcomposite' 'libxinerama') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'networkmanager' 'bluez' - 'python2' 'kdebindings-python') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python') replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') install="${pkgname}.install" @@ -28,7 +27,8 @@ backup=('usr/share/config/kdm/kdmrc' options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch' 'nm-09.patch') + 'fixpath.patch' 'terminate-server.patch' + 'fix-app-launch-in-plasmoid.patch') sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' @@ -37,14 +37,16 @@ sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - '91ed84f5bb99909cab1b5ca0779bbf5cf6c72d33') + 'ca55cd0a25fd8cfb95fa3b1cdd373d496fd7312d') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -p0 -i ${srcdir}/kdm-zsh-profile.patch patch -p0 -i ${srcdir}/fixpath.patch patch -p0 -i ${srcdir}/terminate-server.patch - patch -p1 -i ${srcdir}/nm-09.patch + + # Already fixed upstream + patch -p1 -i ${srcdir}/fix-app-launch-in-plasmoid.patch cd ${srcdir} mkdir build @@ -54,7 +56,8 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_Xmms=OFF \ - -DWITH_Googlegadgets=OFF + -DWITH_Googlegadgets=OFF \ + -DWITH_NetworkManager=OFF make } diff --git a/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch b/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch new file mode 100644 index 000000000..fec667663 --- /dev/null +++ b/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch @@ -0,0 +1,22 @@ +commit 3f1dd3b94ab2b56abb43a51b7b78a9cd162325d0 +Author: Aaron Seigo <aseigo@kde.org> +Date: Fri May 6 22:51:50 2011 +0200 + + get rid of duplicate connect + + patch contributed by Luc Menut + BUG:262614 + REVIEW:101284 + +diff --git a/plasma/generic/containmentactions/applauncher/launch.cpp b/plasma/generic/containmentactions/applauncher/launch.cpp +index cbc7175..bef53e5 100644 +--- a/plasma/generic/containmentactions/applauncher/launch.cpp ++++ b/plasma/generic/containmentactions/applauncher/launch.cpp +@@ -36,7 +36,6 @@ AppLauncher::AppLauncher(QObject *parent, const QVariantList &args) + { + m_menu = new KMenu(); + connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*))); +- connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*))); + + m_action->setMenu(m_menu); + } diff --git a/extra/kdeedu/PKGBUILD b/extra/kdeedu/PKGBUILD index e1c29b24b..a5a24fb20 100644 --- a/extra/kdeedu/PKGBUILD +++ b/extra/kdeedu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 122727 2011-05-06 08:29:55Z andrea $ +# $Id: PKGBUILD 124802 2011-05-24 13:56:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -26,8 +26,8 @@ pkgname=('kdeedu-blinken' 'kdeedu-rocs' 'kdeedu-step') pkgver=4.6.3 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=2 +arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeedu') @@ -46,7 +46,6 @@ build() { cd ${srcdir} mkdir build cd build - # rpath is needed for cantor to find R cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=OFF \ diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index 572d2bdb3..428e753e8 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122843 2011-05-06 11:48:02Z andrea $ +# $Id: PKGBUILD 124805 2011-05-24 14:15:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdelibs pkgver=4.6.3 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -19,11 +19,13 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' replaces=('arts' 'kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch') + 'kde-applications-menu.patch' 'archlinux-menu.patch' + 'abs-syntax-highlight.patch' 'fix-double-POST-action.patch') sha1sums=('c7fb089c9d52a6b1d9188b9e788753373a3288e4' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - 'd994f262356af5b9e4e9619646e471bd98c91efb') + 'd994f262356af5b9e4e9619646e471bd98c91efb' + 'c8ef05943e71a28c4604217d31fc6ca83e48476c') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -35,6 +37,9 @@ build() { # add syntax highlightning for PKGBUILD and .install files patch -p1 -i $srcdir/abs-syntax-highlight.patch + # Already fixed upstream + patch -p1 -i $srcdir/fix-double-POST-action.patch + cd ${srcdir} mkdir build cd build diff --git a/extra/kdelibs/fix-double-POST-action.patch b/extra/kdelibs/fix-double-POST-action.patch new file mode 100644 index 000000000..2672d65db --- /dev/null +++ b/extra/kdelibs/fix-double-POST-action.patch @@ -0,0 +1,27 @@ +commit 92db24adfa941003db1d885df01157056617f30b +Author: Maks Orlovich <maksim@kde.org> +Date: Sun May 8 14:39:03 2011 -0400 + + Fix the job-on-hold reuse logic, which caused the double-POST problem) + + adawit, could you please at least READ what you're backporting if you are + going to be this aggressive? Or better yet, please don't backport anything + that's not fixing a critical bug or is trivial, as per: + http://techbase.kde.org/Policies/Minor_Point_Release_Policy + + CCMAIL: adawit@kde.org + BUG: 272466 + +diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp +index 55da053..9f5607e 100644 +--- a/kio/kio/scheduler.cpp ++++ b/kio/kio/scheduler.cpp +@@ -1151,7 +1151,7 @@ Slave *SchedulerPrivate::heldSlaveForJob(SimpleJob *job) + bool canJobReuse = (cmd == CMD_GET || cmd == CMD_MULTI_GET); + + if (KIO::TransferJob *tJob = qobject_cast<KIO::TransferJob *>(job)) { +- canJobReuse = cmd == (canJobReuse || cmd == CMD_SPECIAL); ++ canJobReuse = (canJobReuse || cmd == CMD_SPECIAL); + if (canJobReuse) { + KIO::MetaData outgoing = tJob->outgoingMetaData(); + const QString resume = outgoing.value("resume"); diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index b3d455918..36f799fbb 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,8 +4,8 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=git20110323 -_commit=986cae8974998213496a8678ad03523dba83e69d +pkgver=git20110524 +_commit=f112886575a9c1fc8986f098db9ef84a6fb2e98e pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64' 'mips64el') @@ -15,15 +15,10 @@ depends=('kdebase-workspace' 'networkmanager') makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info') optdepends=('mobile-broadband-provider-info: allow to add new mobile connection') install=${pkgname}.install -source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}" - 'nm-09.patch') -md5sums=('3dc3b2631e0d4e4f578ef20f7802bf04' - 'b7ad3dac9a5022c99dfd2ad0dc8549cb') +source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") +md5sums=('19d139aa4e80b5829b8a898b315a0a0a') build() { - cd "${srcdir}/networkmanagement" - patch -p1 -i "${srcdir}/nm-09.patch" - cd "${srcdir}" mkdir build cd build @@ -38,5 +33,3 @@ package() { cd ${srcdir}/build make DESTDIR=${pkgdir} install } -md5sums=('8373cd729b12a821b28b483e3e9d253f' - 'c46839bc0503f2dbec76282b8ab163bd') diff --git a/extra/keyutils/PKGBUILD b/extra/keyutils/PKGBUILD deleted file mode 100644 index 0a0258b22..000000000 --- a/extra/keyutils/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 116950 2011-03-26 15:07:29Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=keyutils -pkgver=1.4 -pkgrel=1 -pkgdesc="Linux Key Management Utilities" -arch=(i686 x86_64 'mips64el') -url="http://www.kernel.org" -license=('GPL2' 'LGPL2.1') -depends=('glibc' 'sh') -backup=(etc/request-key.conf) -source=(http://people.redhat.com/~dhowells/$pkgname/$pkgname-$pkgver.tar.bz2) - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i -e '/CFLAGS/s|:= -g -O2|+=|' Makefile - make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} -md5sums=('e168c1bdaf5aa93c2cbf8a5e7f8ef27b') diff --git a/extra/kismet/kismet-2008-05-R1-infinite-loop.diff b/extra/kismet/kismet-2008-05-R1-infinite-loop.diff deleted file mode 100644 index f8417943e..000000000 --- a/extra/kismet/kismet-2008-05-R1-infinite-loop.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- gpsmap.cc -+++ gpsmap.cc -@@ -874,7 +874,7 @@ - - // Break up the path to the gpsxml file and form a path based on that - unsigned int lastslash = 0; -- for (unsigned int x = origxmlfile.find('/'); x != string::npos; -+ for (string::size_type x = origxmlfile.find('/'); x != string::npos; - lastslash = x, x = origxmlfile.find('/', lastslash+1)) { - // We don't actually need to do anything... - } -@@ -882,7 +882,7 @@ - comp = origxmlfile.substr(0, lastslash); - - lastslash = 0; -- for (unsigned int x = orignetfile.find('/'); x != string::npos; -+ for (string::size_type x = orignetfile.find('/'); x != string::npos; - lastslash = x, x = orignetfile.find('/', lastslash+1)) { - // We don't actually need to do anything... - } diff --git a/extra/kismet/kismet-build.patch b/extra/kismet/kismet-build.patch deleted file mode 100644 index 9935ca4fa..000000000 --- a/extra/kismet/kismet-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- macaddr.h.orig 2009-07-08 02:29:38.000000000 -0400 -+++ macaddr.h 2009-07-08 02:37:54.000000000 -0400 -@@ -73,7 +73,7 @@ - longmac |= (uint64_t) bs_in[5] << ((MAC_LEN - 5 - 1) * 8); - - // If it has a mask component, get that -- char *in_mask = strchr(in, '/'); -+ const char *in_mask = strchr(in, '/'); - if (in_mask != NULL) { - longmask = 0; - diff --git a/extra/kmldonkey/PKGBUILD b/extra/kmldonkey/PKGBUILD deleted file mode 100644 index aea99597c..000000000 --- a/extra/kmldonkey/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 104423 2011-01-02 13:07:17Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kmldonkey -pkgver=2.0.2 -_kdever=4.4.0 -pkgrel=5 -pkgdesc="An MLDonkey frontend for KDE" -arch=('i686' 'x86_64' 'mips64el') -url='http://userbase.kde.org/KMLDonkey' -license=('GPL') -depends=('kdebase-workspace') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'docbook-xsl') -install="${pkgname}.install" -source=("http://download.kde.org/stable/extragear/${pkgname}-${pkgver}-kde${_kdever}.tar.bz2") -md5sums=('40ae039dc01a45807111c2d0023eeaa6') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgname}-${pkgver}-kde${_kdever} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install -} diff --git a/extra/kmplayer/PKGBUILD b/extra/kmplayer/PKGBUILD deleted file mode 100644 index 3114a8bb8..000000000 --- a/extra/kmplayer/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 94084 2010-10-04 12:47:37Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: damir <damir@archlinux.org> - -pkgname=kmplayer -pkgver=0.11.2c -pkgrel=1 -pkgdesc="Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend for KDE" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL' 'LGPL' 'FDL') -url="http://kmplayer.kde.org" -depends=('kdebase-runtime' 'pango') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'docbook-xsl') -install=${pkgname}.install -source=("http://kmplayer.kde.org/pkgs/$pkgname-$pkgver.tar.bz2") -md5sums=('7a1363dfaad0c7b563ecbd58f301e704') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install -} diff --git a/extra/kmplayer/kmplayer.install b/extra/kmplayer/kmplayer.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kmplayer/kmplayer.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/libbtctl/PKGBUILD b/extra/libbtctl/PKGBUILD deleted file mode 100644 index 76cd085aa..000000000 --- a/extra/libbtctl/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 59225 2009-11-21 15:31:57Z giovanni $ -# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> -# Contributor: Roman Kyrylych <roman@archlinux.org> - -pkgname=libbtctl -pkgver=0.11.1 -pkgrel=1 -pkgdesc="GObject wrapper for Bluetooth functionality." -arch=('i686' 'x86_64' 'mips64el') -url="http://www.usefulinc.com/software/gnome-bluetooth/" -license=('GPL' 'LGPL') -depends=('glib2' 'openobex' 'bluez') -makedepends=('intltool' 'python' 'gtk2') -options=('!libtool' '!makeflags') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.11/${pkgname}-${pkgver}.tar.bz2) -md5sums=('5b5ab9e71dd5428c4e5c45cbf581a384') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-gtk-doc \ - --disable-mono --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/extra/libftdi/PKGBUILD b/extra/libftdi/PKGBUILD index ba33e210d..b43d6ab53 100644 --- a/extra/libftdi/PKGBUILD +++ b/extra/libftdi/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 101400 2010-11-29 04:43:52Z allan $ +# $Id: PKGBUILD 125350 2011-05-26 02:17:50Z eric $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libftdi -pkgver=0.18 -pkgrel=2 +pkgver=0.19 +pkgrel=1 pkgdesc="A library to talk to FTDI chips" -arch=("i686" "x86_64" 'mips64el') +arch=('i686' 'x86_64') url="http://www.intra2net.com/en/developer/libftdi/download.php" -license=("GPL2" "LGPL2.1") -depends=('libusb-compat') -makedepends=("boost") +license=('GPL2' 'LGPL2.1') +depends=('libusb-compat' 'gcc-libs') +makedepends=('boost') options=('!libtool') source=("http://www.intra2net.com/en/developer/libftdi/download/$pkgname-$pkgver.tar.gz") -md5sums=('916f65fa68d154621fc0cf1f405f2726') -sha1sums=('52401db0e7cb90a5d83f82c2859a4f8d44e52579') +md5sums=('e6e25f33b4327b1b7aa1156947da45f3') +sha1sums=('0f08caf8e754ace69cd682489fae3f7f09920fe1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD index 158699992..fa4540a1a 100644 --- a/extra/libgnome-keyring/PKGBUILD +++ b/extra/libgnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 120579 2011-04-25 17:26:49Z ibiru $ +#$Id: PKGBUILD 125537 2011-05-26 16:32:57Z ibiru $ #Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=libgnome-keyring -pkgver=3.0.1 +pkgver=3.0.3 pkgrel=1 pkgdesc="GNOME keyring client library" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ makedepends=('intltool' 'pkgconfig') options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9d748842dab86914488bef039ca2c25f8ff5510daae3815643e6e00a2f69cacb') +sha256sums=('a0cc08bcd431070d3f01c2741903c2bd8b0231ee73de709d28e722e28575fdf8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgnome-keyring/fix_crash.patch b/extra/libgnome-keyring/fix_crash.patch new file mode 100644 index 000000000..1e28cdb73 --- /dev/null +++ b/extra/libgnome-keyring/fix_crash.patch @@ -0,0 +1,35 @@ +From 9bcac748b54e00836715b0f70be26b7cbdc8c888 Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.pitt@ubuntu.com> +Date: Mon, 23 May 2011 08:58:49 +0000 +Subject: Fix crash from recent memleak fix (b49e32b) + +make_attribute_list_va() statically copies the caller's method arguments into +the GnomeKeyringAttributeList, so we must only free the array itself, not the +GnomeKeyringAttribute strings. + +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=650840 +--- +diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c +index dc271dd..4febf47 100644 +--- a/library/gnome-keyring.c ++++ b/library/gnome-keyring.c +@@ -2443,7 +2443,7 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType type, + va_end (args); + + ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data); +- gnome_keyring_attribute_list_free (attributes); ++ g_array_free (attributes, TRUE); + return ret; + } + +@@ -2520,7 +2520,7 @@ gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type, + va_end (args); + + ret = gnome_keyring_find_items_sync (type, attributes, found); +- gnome_keyring_attribute_list_free (attributes); ++ g_array_free (attributes, TRUE); + return ret; + } + +-- +cgit v0.9 diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD index 061dd2e68..d5343da70 100644 --- a/extra/libgsf/PKGBUILD +++ b/extra/libgsf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 116824 2011-03-25 21:58:52Z heftig $ +# $Id: PKGBUILD 124392 2011-05-20 13:18:16Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgbase=libgsf pkgname=('libgsf' 'libgsf-gnome') -pkgver=1.14.20 +pkgver=1.14.21 pkgrel=1 arch=(i686 x86_64 'mips64el') url="http://www.gnome.org/" @@ -13,7 +13,7 @@ makedepends=('libxml2' 'glib2' 'bzip2' 'intltool' 'pkgconfig' 'python2' 'libbonobo' 'gconf' 'pygtk') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/1.14/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('df82cd86e472a6f8e566976eb7eb8f587aac2639c1448b14b4dbf4db7da1ada6') +sha256sums=('eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD index 9de18bb05..55cfcad8c 100644 --- a/extra/libgweather/PKGBUILD +++ b/extra/libgweather/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117926 2011-04-04 21:33:29Z heftig $ +# $Id: PKGBUILD 124751 2011-05-24 07:48:30Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgweather -pkgver=3.0.0 +pkgver=3.0.2 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org/" install=libgweather.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 gettext-not-xml.patch) -sha256sums=('f13eb69c6ec8c4db08a78ffe980a5dd0e194894d411691a6821a068c650d1545' +sha256sums=('9041526fa0466b99dae5cf06c2cc70376f25531eec5d58b1e1378acfb302410c' 'f21d55ab7916a50cad10d1c0bb3785a262e8ad8f35b9fb4c02ae23f1b0783727') build() { diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index ce6e6e706..742e73b6b 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 111658 2011-02-28 03:23:17Z allan $ +# $Id: PKGBUILD 124693 2011-05-24 03:40:20Z eric $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> pkgname=libjpeg-turbo -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression" arch=('i686' 'x86_64' 'mips64el') url="http://libjpeg-turbo.virtualgl.org/" license=('GPL' 'custom') +depends=('glibc') makedepends=('nasm') provides=('libjpeg=8.0.2') conflicts=('libjpeg') replaces=('libjpeg') options=('!libtool') source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('83e6914a281d649ad289445dc20f9de4') +md5sums=('03b9c1406c7bfdc204313c2917ce6962') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,6 +29,5 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install - install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE" } - diff --git a/extra/liblqr/PKGBUILD b/extra/liblqr/PKGBUILD index 84fa40839..445511d75 100644 --- a/extra/liblqr/PKGBUILD +++ b/extra/liblqr/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 49462 2009-08-08 15:03:23Z tpowa $ +# $Id: PKGBUILD 124082 2011-05-16 15:00:24Z andrea $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=liblqr pkgver=0.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="A seam-carving C/C++ library called Liquid Rescale" arch=('i686' 'x86_64' 'mips64el') url="http://liblqr.wikidot.com/" license=('GPL') -depends=('glibc' 'glib2') +depends=('glib2') makedepends=('pkgconfig') -options=('!libtool') -source=(http://liblqr.wikidot.com/local--files/en:download-page/$pkgname-1-$pkgver.tar.bz2) +options=('!libtool' '!emptydirs') +source=("http://liblqr.wikidot.com/local--files/en:download-page/$pkgname-1-$pkgver.tar.bz2") build() { cd "$srcdir/$pkgname-1-$pkgver" ./configure --prefix=/usr - make || return 1 - make DESTDIR="$pkgdir/" install || return 1 + make +} + +package() { + cd "$srcdir/$pkgname-1-$pkgver" + make DESTDIR="$pkgdir/" install } md5sums=('0e24ed3c9fcdcb111062640764d7b87a') diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD index 9a8fbea4d..d75e8840c 100644 --- a/extra/libmygpo-qt/PKGBUILD +++ b/extra/libmygpo-qt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122697 2011-05-06 06:29:29Z andrea $ +# $Id: PKGBUILD 124554 2011-05-22 22:58:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libmygpo-qt -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="A C++/Qt client library for gpodder.net" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('qjson') makedepends=('cmake') source=("http://stefan.derkits.at/files/${pkgname}/${pkgname}.${pkgver}.tar.gz") -md5sums=('6f88444c82e9840638ec16e366457dd7') +md5sums=('0ed91cc9483f4634e8709a0ea95baeba') build() { cd "${srcdir}" diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD index f53f584e9..9d29118a9 100644 --- a/extra/liborigin2/PKGBUILD +++ b/extra/liborigin2/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 112096 2011-03-03 20:59:03Z eric $ +# $Id: PKGBUILD 124976 2011-05-25 14:38:34Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> pkgbase=liborigin2 pkgname=('liborigin2' 'liborigin2-docs') pkgver=20100913 -pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=4 +arch=('i686' 'x86_64') url="http://soft.proindependent.com/liborigin2/" license=('GPL3') makedepends=('doxygen' 'qt' 'boost') diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD index 1daebcb01..614c58ea4 100644 --- a/extra/libpst/PKGBUILD +++ b/extra/libpst/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 112025 2011-03-03 09:42:31Z eric $ +# $Id: PKGBUILD 124979 2011-05-25 14:53:00Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libpst pkgname=('libpst' 'libpst-docs') pkgver=0.6.49 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=3 +arch=('i686' 'x86_64') url="http://www.five-ten-sg.com/libpst/" license=('GPL') makedepends=('python2' 'boost') diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD new file mode 100644 index 000000000..6e2d4766f --- /dev/null +++ b/extra/libqzeitgeist/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 125364 2011-05-26 10:10:50Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libqzeitgeist +pkgver=0.7.0 +pkgrel=1 +pkgdesc="A Qt interface to the Zeitgeist event tracking system" +url="https://projects.kde.org/projects/kdesupport/libqzeitgeist" +arch=('i686' 'x86_64') +license=('GPL') +depends=('qt') +makedepends=('cmake') +source=("http://releases.zeitgeist-project.com/qzeitgeist/QtZeitgeist-${pkgver}.tar.bz2") +md5sums=('e58d4b988bbab812f8bd6878d87c0956') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../QtZeitgeist-${pkgver}-Source \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index 901438de5..0367ee9c9 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120683 2011-04-25 23:06:22Z ibiru $ +# $Id: PKGBUILD 124678 2011-05-23 20:49:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libsoup pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.34.1 +pkgver=2.34.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -11,7 +11,7 @@ makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject- url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) options=('!libtool' '!emptydirs') -sha256sums=('a2f846af2c4c08e15eacc9879c8c9be4d85f8105f960f96a9ba3dbabd9ee517b') +sha256sums=('1d70edc48c309528635012269733739f9cd22548913125864318a65d1b6f1261') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/libssh2/PKGBUILD b/extra/libssh2/PKGBUILD new file mode 100644 index 000000000..ddf30e72c --- /dev/null +++ b/extra/libssh2/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124297 2011-05-19 05:00:38Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: ice-man <icemanf@gmail.com> + +pkgname=libssh2 +pkgver=1.2.7 +pkgrel=2 +pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" +url="http://www.libssh2.org/" +arch=('i686' 'x86_64') +license=('BSD') +depends=('openssl') +makedepends=('zlib') +options=('!libtool') +source=("http://www.libssh2.org/download/${pkgname}-${pkgver}.tar.gz") +md5sums=('a5d78344886f1282e4008c09bf568076') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 77f1d048b..24f4aea76 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120130 2011-04-20 11:35:26Z ibiru $ +# $Id: PKGBUILD 124787 2011-05-24 12:59:08Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar pkgver=0.15.6 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD index 18d101959..446e2bf63 100644 --- a/extra/libvncserver/PKGBUILD +++ b/extra/libvncserver/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 120955 2011-04-27 19:24:20Z andrea $ +# $Id: PKGBUILD 124232 2011-05-17 19:20:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libvncserver pkgver=0.9.8 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server" arch=('i686' 'x86_64' 'mips64el') url="http://libvncserver.sourceforge.net/" license=('GPL') -depends=('libjpeg' 'zlib') +depends=('libjpeg' 'zlib' 'gnutls') options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz") md5sums=('dda9e75a1d5d7c37bb57d90ead7b32b3') diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD index c9395bec3..d37c740ec 100644 --- a/extra/libwnck3/PKGBUILD +++ b/extra/libwnck3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117893 2011-04-04 21:09:31Z heftig $ +# $Id: PKGBUILD 124742 2011-05-24 07:31:15Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.0.0 +pkgver=3.0.2 pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2) -sha256sums=('bc34093ad185bb5086e97226f36157a6dd205623d32bdef71261a8b248a41f15') +sha256sums=('4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/extra/libx86/PKGBUILD b/extra/libx86/PKGBUILD deleted file mode 100644 index c181e7a7b..000000000 --- a/extra/libx86/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 21343 2008-12-12 01:32:33Z eric $ -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: tardo <tardo@nagi-fanboi.net> -# Maintainer: Thayer Williams <thayer@archlinux.org> - -pkgname=libx86 -pkgver=1.1 -pkgrel=2 -pkgdesc="Provides an lrmi interface that works on x86, am64 and alpha" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.codon.org.uk/~mjg59/libx86/" -license=('custom') -depends=('glibc') -source=(http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$pkgver.tar.gz - libx86-ifmask.patch) -md5sums=('41bee1f8e22b82d82b5f7d7ba51abc2a' - '573897186eb8670d8d97c64ea7614001') - -build() { - cd $srcdir/$pkgname-$pkgver - - # lrmi.c patch courtesy of Gentoo - patch -Np0 -i $srcdir/libx86-ifmask.patch || return 1 - - # compensate for x86_64 - if [ "$CARCH" = "x86_64" ]; then - make BACKEND=x86emu || return 1 - else - make || return 1 - fi - - make DESTDIR=$pkgdir install || return 1 - chmod 644 $pkgdir/usr/lib/libx86.a || return 1 - - install -D -m 644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT || return 1 -} diff --git a/extra/libx86/libx86-ifmask.patch b/extra/libx86/libx86-ifmask.patch deleted file mode 100644 index c99eeb819..000000000 --- a/extra/libx86/libx86-ifmask.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- lrmi.c.orig 2008-09-06 12:24:36.070136428 +0200 -+++ lrmi.c 2008-09-06 12:28:10.584287458 +0200 -@@ -55,6 +55,18 @@ OTHER DEALINGS IN THE SOFTWARE. - #include "x86-common.h" - - #if defined(__linux__) -+#ifndef TF_MASK -+#define TF_MASK X86_EFLAGS_TF -+#endif -+#ifndef IF_MASK -+#define IF_MASK X86_EFLAGS_IF -+#endif -+#ifndef IOPL_MASK -+#define IOPL_MASK X86_EFLAGS_IOPL -+#endif -+#ifndef VIF_MASK -+#define VIF_MASK X86_EFLAGS_VIF -+#endif - #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) - #elif defined(__NetBSD__) || defined(__FreeBSD__) - #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL) diff --git a/extra/libxfce4ui/PKGBUILD b/extra/libxfce4ui/PKGBUILD index 2f4479bee..2e7e8d593 100644 --- a/extra/libxfce4ui/PKGBUILD +++ b/extra/libxfce4ui/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 106352 2011-01-16 16:37:35Z andyrtr $ +# $Id: PKGBUILD 124354 2011-05-20 06:47:50Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be> pkgname=libxfce4ui pkgver=4.8.0 -pkgrel=1 +pkgrel=3 pkgdesc="share commonly used Xfce widgets among the Xfce applications" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://www.xfce.org/" -groups=('xfce4') -depends=('libxfce4util>=4.8.0' 'gtk2' "xfconf>=4.8.0" 'startup-notification') +depends=('libxfce4util>=4.8.0' 'gtk2' "xfconf>=4.8.0" 'libsm' 'startup-notification') makedepends=('intltool' 'gtk-doc' 'glade') optdepends=('glade: for using the included glade module') #replaces=('libxfcegui4') - later when all is ported diff --git a/extra/libxfce4util/PKGBUILD b/extra/libxfce4util/PKGBUILD index 6b2f5a989..7855ad22c 100644 --- a/extra/libxfce4util/PKGBUILD +++ b/extra/libxfce4util/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 106357 2011-01-16 16:41:01Z andyrtr $ +# $Id: PKGBUILD 124279 2011-05-18 16:40:43Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=libxfce4util pkgver=4.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Basic utility non-GUI functions for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://www.xfce.org/" -groups=('xfce4') depends=("glib2") makedepends=('pkgconfig' 'intltool' 'gtk-doc') options=('!libtool') diff --git a/extra/libxfcegui4/PKGBUILD b/extra/libxfcegui4/PKGBUILD index a99ca04d9..5c7e594d0 100644 --- a/extra/libxfcegui4/PKGBUILD +++ b/extra/libxfcegui4/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 119470 2011-04-11 17:35:10Z andyrtr $ +# $Id: PKGBUILD 124284 2011-05-18 17:58:51Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=libxfcegui4 pkgver=4.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="Various gtk widgets for Xfce" arch=(i686 x86_64 'mips64el') license=('GPL2') url="http://www.xfce.org/" -groups=('xfce4') depends=('startup-notification' "xfconf>=4.8.0" "libglade" 'libsm' 'hicolor-icon-theme') makedepends=('intltool') options=('!libtool') diff --git a/extra/lsdvd/PKGBUILD b/extra/lsdvd/PKGBUILD index 7fd464fb3..fbda54607 100644 --- a/extra/lsdvd/PKGBUILD +++ b/extra/lsdvd/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 39761 2009-05-21 11:31:55Z jgc $ +# $Id: PKGBUILD 124465 2011-05-22 11:21:47Z andrea $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=lsdvd pkgver=0.16 -pkgrel=4 -pkgdesc="lsdvd is a C application for reading the contents of a DVD and printing the contents to your terminal" -arch=(i686 x86_64 'mips64el') -url="http://untrepid.com/acidrip/lsdvd.html" -depends=('libdvdread>=4.1.3') +pkgrel=5 +pkgdesc="A C application for reading the contents of a DVD and printing the contents to your terminal" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/lsdvd/" +depends=('libdvdread') license=('GPL2') #Special thanks to Mathieu Clabaut <mathieu.clabaut@gmail.com> for patches -source=(http://downloads.sourceforge.net/lsdvd/${pkgname}-${pkgver}.tar.gz +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz stdint_usage.patch) -md5sums=('340e1abe5c5e5abf7ff8031e78f49ee7' '6cbcbfde873f894bd3c784f65141b2fc') +md5sums=('340e1abe5c5e5abf7ff8031e78f49ee7' + '6cbcbfde873f894bd3c784f65141b2fc') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/stdint_usage.patch" || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + patch -Np1 -i "${srcdir}/stdint_usage.patch" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD index 95fe0d747..d89319bd6 100644 --- a/extra/lyx/PKGBUILD +++ b/extra/lyx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112021 2011-03-03 08:05:12Z eric $ +# $Id: PKGBUILD 124982 2011-05-25 15:39:01Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=lyx -pkgver=1.6.9 -pkgrel=2 +pkgver=1.6.10 +pkgrel=1 pkgdesc="An advanced open-source document processor." arch=('i686' 'x86_64' 'mips64el') url="http://www.lyx.org" @@ -12,14 +12,15 @@ depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'aspell' 'aiksaurus' makedepends=('boost') license=('GPL') source=(ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/$pkgname-$pkgver.tar.bz2 \ - lyx.desktop) -sha1sums=('a1acacc8a26546542e32977ae222e811c98b1ca4' + lyx.desktop) +sha1sums=('344e14897ea7d004bf181eac39355f1b08f0af83' 'e207a0b14d58aeb7b83f8fc47ab2e668cbc66844') build() { cd "${srcdir}/${pkgname}-${pkgver}" find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} + sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp + export CXXFLAGS="$CXXFLAGS -fpermissive" ./configure --prefix=/usr \ --with-frontend=qt4 --without-included-boost make diff --git a/extra/mc/PKGBUILD b/extra/mc/PKGBUILD deleted file mode 100644 index 14a7edd76..000000000 --- a/extra/mc/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 119545 2011-04-12 03:04:01Z eric $ -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=mc -pkgver=4.7.5.2 -pkgrel=1 -pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.ibiblio.org/mc/" -license=('GPL') -depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang') -makedepends=('libxt' 'libx11') -optdepends=('p7zip: support for 7zip archives') -provides=('mcedit-pkgbuild-syntax') -conflicts=('mc-utf8') -replaces=('mc-utf8') -options=('!emptydirs' '!makeflags') -source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2") -md5sums=('bdae966244496cd4f6d282d80c9cf3c6') -sha1sums=('08ffcc9fd19c7d8906a454c27b7074ca35bce14a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \ - --enable-background --enable-charset --enable-largefile \ - --with-edit --with-gpm-mouse --with-mmap --enable-vfs-smb \ - --with-screen=slang --with-subshell --with-vfs --with-x \ - --without-debug --without-gnome --without-included-gettext \ - --libexecdir=/usr/lib - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - # Fix FS#15177 - sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \ - -i "${pkgdir}/usr/lib/mc/extfs.d/uzip" - - # Fix FS#18312 - rm "${pkgdir}/usr/lib/mc/extfs.d/u7z" - - sed 's#/usr/bin/env python#/usr/bin/python2#' \ - -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" -} diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD index d96117ea1..3b347e45e 100644 --- a/extra/midori/PKGBUILD +++ b/extra/midori/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122421 2011-05-04 06:44:02Z andyrtr $ +# $Id: PKGBUILD 124201 2011-05-17 17:28:05Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> pkgname=midori #_gitdate=20090306 -pkgver=0.3.5 #_git${_gitdate} +pkgver=0.3.6 #_git${_gitdate} pkgrel=1 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('vala: for use in extensions') source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2 #midori-${_gitdate}.tar.bz2 ) -md5sums=('f92f0f11276d63150fd321dc08d575fb') +md5sums=('c4cb0686601b1c470c317de3d3f8e8fd') # source PKGBUILD && mksource mksource() { diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index 19b9c8249..5b83cd885 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 120268 2011-04-21 21:31:35Z giovanni $ +# $Id: PKGBUILD 124985 2011-05-25 16:04:09Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: 03/08/04 <lefungus@altern.org> pkgname=mkvtoolnix -pkgver=4.7.0 -pkgrel=1 +pkgver=4.8.0 +pkgrel=2 pkgdesc="Set of tools to create, edit and inspect Matroska files" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" -depends=('libmatroska' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2' 'xdg-utils') -makedepends=('wxgtk' 'boost' 'ruby') -optdepends=('wxgtk: mkvmerge,mkvinfo and mmg GUI') +depends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils') +makedepends=('boost' 'ruby') install=mkvtoolnix.install source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2") -md5sums=('68200debce9570fc14d934a3d6a750b5') +md5sums=('47a730706f3da2bcf4ba62bba3a8f260') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD index cbe919280..2df733cc2 100644 --- a/extra/moc/PKGBUILD +++ b/extra/moc/PKGBUILD @@ -1,11 +1,9 @@ -# $Id: PKGBUILD 107458 2011-01-25 20:51:09Z remy $ -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: dorphell <dorphell@gmx.net> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# $Id: PKGBUILD 124292 2011-05-19 04:47:01Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=moc pkgver=2.4.4 -pkgrel=3 +pkgrel=4 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" arch=('i686' 'x86_64' 'mips64el') url="http://moc.daper.net/" @@ -18,27 +16,32 @@ optdepends=('speex: for using the speex plugin' 'libmpcdec: for using the musepack plugin' 'wavpack: for using the wavpack plugin' 'libmodplug: for using the modplug plugin') -options=('!libtool' 'force') -source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2) -md5sums=('647c770a5542a4ae5437386807a89796') -sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db') +options=('!libtool') +source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2 \ + gcc-undefined-symbols.diff curl-streams.diff) +md5sums=('647c770a5542a4ae5437386807a89796' + 'efacb8559e9145e15b0c25f8fa2a9d79' + 'bb9be1e80762851c57075c99a612af2f') +sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db' + 'a811a4ac7e049914aab528d3f06a6be6634c2720' + 'a58ca952d7f3b0ede19b95c53da96c090d0a94c4') build() { - cd ${srcdir}/${pkgname}-${pkgver} - - sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c - sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' decoder_plugins/ffmpeg/ffmpeg.c - # Disabling aac to use the external ffmpeg to play them (FS#13164) - ./configure --prefix=/usr --without-rcc --without-aac \ - --with-oss --with-alsa --with-jack --with-mp3 \ - --with-musepack --with-vorbis --with-flac --with-wavpack \ - --with-sndfile --with-modplug --with-ffmpeg --with-speex \ - --with-samplerate --with-curl - make + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ../gcc-undefined-symbols.diff + patch -p1 -i ../curl-streams.diff + sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c + sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' decoder_plugins/ffmpeg/ffmpeg.c +# Disabling aac to use the external ffmpeg to play them (FS#13164) + ./configure --prefix=/usr --without-rcc --without-aac \ + --with-oss --with-alsa --with-jack --with-mp3 \ + --with-musepack --with-vorbis --with-flac --with-wavpack \ + --with-sndfile --with-modplug --with-ffmpeg --with-speex \ + --with-samplerate --with-curl + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/moc/curl-streams.diff b/extra/moc/curl-streams.diff new file mode 100644 index 000000000..2dbc38d54 --- /dev/null +++ b/extra/moc/curl-streams.diff @@ -0,0 +1,28 @@ +diff -u moc-2.4.4/io_curl.c moc-2.4.4/io_curl.c +--- a/io_curl.c 2007-07-08 08:54:45.000000000 +0200 ++++ b/io_curl.c 2011-05-18 09:09:40.000000000 +0200 +@@ -338,6 +338,8 @@ + fd_set read_fds, write_fds, exc_fds; + int max_fd; + int ret; ++ long milliseconds; ++ struct timeval timeout; + + logit ("Doing select()..."); + +@@ -356,8 +358,14 @@ + if (s->curl.wake_up_pipe[0] > max_fd) + max_fd = s->curl.wake_up_pipe[0]; + ++ curl_multi_timeout(s->curl.multi_handle, &milliseconds); ++ if(milliseconds <= 0) ++ milliseconds = 1000; /* just a cautionary default */ ++ timeout.tv_sec = milliseconds / 1000; ++ timeout.tv_usec = (milliseconds % 1000) * 1000; ++ + ret = select (max_fd + 1, &read_fds, &write_fds, +- &exc_fds, NULL); ++ &exc_fds, &timeout); + + if (ret < 0 && errno == EINTR) { + logit ("Interrupted"); diff --git a/extra/moc/gcc-undefined-symbols.diff b/extra/moc/gcc-undefined-symbols.diff new file mode 100644 index 000000000..09e9b8bda --- /dev/null +++ b/extra/moc/gcc-undefined-symbols.diff @@ -0,0 +1,12 @@ +--- decoder.c~ 2011-05-08 09:28:28.077137883 +0200 ++++ decoder.c 2011-05-10 21:40:48.887941968 +0200 +@@ -259,6 +259,9 @@ + for (i = 0; i < plugins_num; i++) + if (plugins[i].decoder->destroy) + plugins[i].decoder->destroy (); ++ for (i = 0; i < plugins_num; i++) ++ if (plugins[i].handle) ++ lt_dlclose(plugins[i].handle); + + if (lt_dlexit()) + logit ("lt_exit() failed: %s", lt_dlerror()); diff --git a/extra/monotone/PKGBUILD b/extra/monotone/PKGBUILD deleted file mode 100644 index 8f5c29287..000000000 --- a/extra/monotone/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 119532 2011-04-11 21:19:22Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> -# Contributor: Dan McGee <dpmcgee@gmail.com> -pkgname=monotone -pkgver=1.0 -pkgrel=1 -pkgdesc="A modern distributed version control system, like hg, darcs, or git" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.monotone.ca" -license=('GPL') -depends=('botan' 'pcre' 'lua' 'sqlite3' 'libidn' 'zlib') -makedepends=('boost') -install=${pkgname}.install -source=(http://www.monotone.ca/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('6a0b5d8560f08d76a950172f9ed0feff') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - MAKEFLAGS="-j1" make DESTDIR="${pkgdir}" install - install -Dm644 contrib/monotone.zsh_completion \ - "${pkgdir}/usr/share/zsh/site-functions/monotone" -} diff --git a/extra/monotone/monotone.install b/extra/monotone/monotone.install deleted file mode 100644 index 49a8651c0..000000000 --- a/extra/monotone/monotone.install +++ /dev/null @@ -1,29 +0,0 @@ -infodir=usr/share/info -filelist=(monotone.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 - -# arg 1: the new package version -# arg 2: the old package version - if [ "$(vercmp $2 0.45)" -lt 0 ]; then - echo ">>> Your monotone databases will need updating for an internal format" - echo ">>> change. Please run the following command on each of your databases" - echo ">>> (after remembering to take a backup copy):" - echo ">>> $ mtn -d dbname.mtn db migrate" - fi -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/extra/multitail/PKGBUILD b/extra/multitail/PKGBUILD index 93558817f..aa356da64 100644 --- a/extra/multitail/PKGBUILD +++ b/extra/multitail/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 79574 2010-05-04 15:01:54Z kevin $ +# $Id: PKGBUILD 125613 2011-05-27 00:13:31Z kevin $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Roberto Carvajal <roberto@archlinux.org> pkgname=multitail -pkgver=5.2.6 +pkgver=5.2.8 pkgrel=1 -pkgdesc="MultiTail lets you view one or multiple files like the original tail program" -arch=(i686 x86_64 'mips64el') +pkgdesc="Lets you view one or multiple files like the original tail program" +arch=(i686 x86_64) license=('GPL') url="http://www.vanheusden.com/multitail" depends=('ncurses') backup=(etc/multitail.conf) source=(${url}/${pkgname}-${pkgver}.tgz) -md5sums=('6496b3d78660ff8d11c743a0d03cca34') +md5sums=('aaa3691b0ea66ef02ffefd628c7dee8b') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - /usr/bin/make || return 1 - /bin/install -D -m 755 multitail ${startdir}/pkg/usr/bin/multitail - /bin/install -D -m 644 multitail.1 ${startdir}/pkg/usr/share/man/man1/multitail.1 - /bin/install -D -m 644 multitail.conf ${startdir}/pkg/etc/multitail.conf + cd ${srcdir}/${pkgname}-${pkgver} + /usr/bin/make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + /bin/install -D -m 755 multitail ${pkgdir}/usr/bin/multitail + /bin/install -D -m 644 multitail.1 ${pkgdir}/usr/share/man/man1/multitail.1 + /bin/install -D -m 644 multitail.conf ${pkgdir}/etc/multitail.conf } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 0f40309d1..7f1a0f89a 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,28 +1,25 @@ -# $Id: PKGBUILD 123610 2011-05-11 18:27:48Z ibiru $ +# $Id: PKGBUILD 125321 2011-05-25 21:21:29Z ibiru $ # 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.0.1 -pkgrel=2 +pkgver=3.0.2.1 +pkgrel=1 pkgdesc="A window manager for GNOME3" arch=(i686 x86_64) license=('GPL') depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection') -makedepends=('intltool' 'gtk-doc') +makedepends=('intltool' 'gnome-doc-utils') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - squash_some_leaks.patch) -sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708' - 'dda962cfd884ffbe2c3c4a86641964228d7b04ef30e19bb2894c4398fa4c296a') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('b122ffe170078af3edb9d4aa076c89eefd7a12a8aa57a1025227c1ab92912b3c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/squash_some_leaks.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/mutter \ --localstatedir=/var --disable-static diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index 94cdc6efa..7ba50f3f1 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122706 2011-05-06 06:57:16Z ibiru $ +# $Id: PKGBUILD 124892 2011-05-24 21:49:03Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nautilus -pkgver=3.0.1.1 -pkgrel=3 +pkgver=3.0.2 +pkgrel=1 pkgdesc="The GNOME shell and file manager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,8 +14,8 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=nautilus.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('ba53b2b8a38bcd4d6a1860421de222dc5b6b9904cceed49b2d0d90e972ee7dd6') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('6a4c6b75593f0e815763d0040878cd908da72318f18b05f33d24040e0d602b22') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nbsmtp/PKGBUILD b/extra/nbsmtp/PKGBUILD deleted file mode 100644 index d10254ed7..000000000 --- a/extra/nbsmtp/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 75557 2010-04-01 20:23:24Z giovanni $ -# Maintainer: dorphell <dorphell@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -pkgname=nbsmtp -pkgver=1.00 -pkgrel=3 -pkgdesc="No-Brainer SMTP client suitable to run in chroot jails, embeded systems, laptops, and workstations" -arch=(i686 x86_64 'mips64el') -url="http://nbsmtp.ferdyx.org/" -license=('GPL') -depends=('openssl') -source=(http://www.it.uc3m.es/~ferdy/nbsmtp/$pkgname-$pkgver.tar.bz2 build.patch) -md5sums=('0c6a200027a6f7f61f44b374261aa52f' '043236152fecb550d80ab3cd84711cd3') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -Np0 -i ../build.patch || return 1 - ./configure --prefix=/usr --enable-ssl || return 1 - make || return 1 - make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install || return 1 -} diff --git a/extra/nbsmtp/build.patch b/extra/nbsmtp/build.patch deleted file mode 100644 index 325b16308..000000000 --- a/extra/nbsmtp/build.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- hmac_md5.c~ 2005-07-28 19:29:07.000000000 +0200 -+++ hmac_md5.c 2006-06-04 15:49:09.000000000 +0200 -@@ -4,10 +4,11 @@ - * - * Code taken from RFC2104. - */ -- -+#include <stdlib.h> - #include <openssl/md5.h> - #include <string.h> - -+ - #include "hmac_md5.h" - - /** diff --git a/extra/neon/PKGBUILD b/extra/neon/PKGBUILD index b43b0526d..bcfd1aa15 100644 --- a/extra/neon/PKGBUILD +++ b/extra/neon/PKGBUILD @@ -1,29 +1,32 @@ -# $Id: PKGBUILD 121086 2011-04-29 00:26:05Z stephane $ +# $Id: PKGBUILD 124952 2011-05-25 12:20:04Z andrea $ +# Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# KEEP LIBTOOL FILES! pkgname=neon -pkgver=0.29.3 -pkgrel=3 +pkgver=0.29.6 +pkgrel=1 pkgdesc="HTTP and WebDAV client library with a C interface" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') depends=('krb5' 'expat' 'ca-certificates') url="http://www.webdav.org/neon/" -source=("http://www.webdav.org/neon/${pkgname}-${pkgver}.tar.gz") -md5sums=('ba1015b59c112d44d7797b62fe7bee51') -options=('libtool') +source=("http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('591e0c82e6979e7e615211b386b8f6bc') +options=('libtool') # FS#16067 build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./configure --prefix=/usr \ - --with-expat --enable-shared --disable-static \ - --with-ssl=openssl --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + --with-expat \ + --enable-shared \ + --disable-static \ + --with-ssl=openssl \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD index 90812bd04..839a9a9d1 100644 --- a/extra/neverball/PKGBUILD +++ b/extra/neverball/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 63937 2010-01-19 04:44:36Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Ben <contrasutra@myrealbox.com> +# $Id: PKGBUILD 124594 2011-05-23 08:40:29Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=neverball pkgver=1.5.4 -pkgrel=2 +pkgrel=3 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness" arch=('i686' 'x86_64' 'mips64el') url="http://neverball.org/" license=('GPL') -depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg>=7' 'libvorbis' 'physfs') +depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs') makedepends=('mesa') source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz) md5sums=('c523b0f72c2035831310e821162f7bd7') @@ -17,36 +16,31 @@ sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h || return 1 + sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h if [ "${CARCH}" = "i686" ] ;then - make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS="" || return 1 + make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS="" else - make ENABLE_NLS=1 DATADIR=/usr/share/neverball || return 1 + make ENABLE_NLS=1 DATADIR=/usr/share/neverball fi +} - install -D -m755 neverball "${pkgdir}/usr/bin/neverball" || return 1 - install -D -m755 neverputt "${pkgdir}/usr/bin/neverputt" || return 1 - install -D -m755 mapc "${pkgdir}/usr/bin/mapc" || return 1 - - install -d "${pkgdir}/usr/share/neverball" - cp -r data/* "${pkgdir}/usr/share/neverball/" || return 1 +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + install -d "${pkgdir}/usr/bin" + install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball} + install -d "${pkgdir}"/usr/share/man/man{1,6} + + install -m755 neverball neverputt mapc "${pkgdir}/usr/bin" + cp -r locale/* "${pkgdir}/usr/share/locale/" + cp -r data/* "${pkgdir}/usr/share/neverball/" + install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/" + install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/" + install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/" + install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1" + install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6" + + ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png" + ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png" find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \; - - install -d "${pkgdir}/usr/share/locale" - cp -r locale/* "${pkgdir}/usr/share/locale/" || return 1 - - install -d "${pkgdir}/usr/share/applications" - install -d "${pkgdir}/usr/share/pixmaps" - install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/" || return 1 - install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/" || return 1 - ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png" || return 1 - ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png" || return 1 - - install -d "${pkgdir}/usr/share/doc/neverball" - install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/" || return 1 - - install -D -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1/mapc.1" || return 1 - install -D -m644 dist/neverball.6 "${pkgdir}/usr/share/man/man6/neverball.6" || return 1 - install -D -m644 dist/neverputt.6 "${pkgdir}/usr/share/man/man6/neverputt.6" || return 1 } diff --git a/extra/nickle/PKGBUILD b/extra/nickle/PKGBUILD deleted file mode 100644 index e31d0f4bc..000000000 --- a/extra/nickle/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -#$Id: $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=nickle -pkgver=2.70 -pkgrel=1 -pkgdesc="A programming language based prototyping environment with powerful programming and scripting capabilities" -arch=('i686' 'x86_64' 'mips64el') -url="http://nickle.org" -license=('custom') -depends=('readline') -source=(http://nickle.org/release/${pkgname}-${pkgver}.tar.gz) -md5sums=('fbb77ad1c6f80a9a67ae28a2a678ed67') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/extra/nppangband/Makefile.std b/extra/nppangband/Makefile.std deleted file mode 100755 index 5bebf01fa..000000000 --- a/extra/nppangband/Makefile.std +++ /dev/null @@ -1,375 +0,0 @@ -# File: Makefile.std
-
-# This is not a very "nice" Makefile, but it usually works.
-
-#
-# Note that you may have to make modifications below according
-# to your machine, available libraries, compilation options,
-# and your "visual module" of choice. This Makefile is intended
-# for use with Unix machines running X11, gtk, (n)curses, termcap,
-# or VT100, Slang, Linux VCS or SVGA library,
-# or possibly for "Atari" or "Amiga" computers with "Curses" ports,
-# see below for more information.
-#
-# Note that "main-mac.c", the visual module for the Macintosh,
-# must be compiled in a special way, see elsewhere.
-#
-# Note that "main-win.c", the visual module for Windows,
-# must be compiled in a special way, see elsewhere.
-#
-# Note that "main-ibm.c", "main-dos.c", and "main-emx.c",
-# the visual modules for various types of IBM-PC computers,
-# must be compiled with special Makefiles, see elsewhere.
-#
-# Note that "main-ros.c", the visual module for RISC OS,
-# must be compiled with "Makefile.ros", see elsewhere.
-#
-# Note that "main-ami.c", the visual module for the Amiga,
-# must be compiled with "Makefile.ami", see elsewhere.
-#
-# If you are able to construct "main-xxx.c" and/or "Makefile.xxx"
-# files for a currently unsupported system, please send them to
-# Robert Ruehlmann < rr9@thangorodrim.net > for inclusion in future
-# versions.
-#
-# This Makefile comes with "default" dependencies that may be obsolete.
-#
-
-
-#
-# The "source" and "object" files.
-#
-
-SRCS = \
- z-util.c z-virt.c z-form.c z-rand.c z-term.c \
- variable.c tables.c util.c cave.c \
- object1.c object2.c monster1.c monster2.c \
- xtra1.c xtra2.c spells1.c spells2.c \
- melee1.c melee2.c save.c effects.c feature.c files.c \
- cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c \
- store.c birth.c load.c quest.c squelch.c \
- wizard1.c wizard2.c obj-info.c \
- generate.c dungeon.c init1.c init2.c randart.c \
- main-cap.c main-gcu.c main-x11.c main-xaw.c main.c \
- main-gtk.c main-lsl.c main-sla.c main-vcs.c main-xpj.c main-lfb.c \
- maid-x11.c \
- use-obj.c
-
-OBJS = \
- z-util.o z-virt.o z-form.o z-rand.o z-term.o \
- variable.o tables.o util.o cave.o \
- object1.o object2.o monster1.o monster2.o \
- xtra1.o xtra2.o spells1.o spells2.o \
- melee1.o melee2.o save.o effects.o feature.o files.o \
- cmd1.o cmd2.o cmd3.o cmd4.o cmd5.o cmd6.o \
- store.o birth.o load.o quest.o squelch.o \
- wizard1.o wizard2.o obj-info.o \
- generate.o dungeon.o init1.o init2.o randart.o \
- main-cap.o main-gcu.o main-x11.o main-xaw.o main.o \
- main-gtk.o main-lsl.o main-sla.o main-vcs.o main-xpj.o main-lfb.o \
- maid-x11.o \
- use-obj.o
-
-
-
-##
-## Following are some "system" definitions
-##
-## No changes are needed to compile a version that will run on both
-## X11 and Curses, in debugging mode, with maximal warnings, on many
-## normal Unix machines of the Sun OS variety (non-solaris).
-##
-## To use an "alternative" definition, simply "modify" (or "replace")
-## the definition below with one that you like. For example, you can
-## change the compiler to "cc", or remove the "debugging" options, or
-## remove the X11 or Curses support, etc, as desired.
-##
-## With X11, XAW or GTK, you can add -D"USE_XPJ" to CFLAGS to get the
-## 3d-projection module "xpj".
-##
-## See also "config.h" and "h-config.h" for important information.
-##
-## Some "examples" are given below, they can be used by simply
-## removing the FIRST column of "#" signs from the "block" of lines
-## you wish to use, and commenting out "standard" block below.
-##
-## This is not intended to be a "good" Makefile, just a "simple" one.
-##
-
-
-#
-# This is my compiler of choice, it seems to work most everywhere.
-#
-CC = gcc
-
-
-#
-# Standard version (see main-x11.c and main-gcu.c)
-#
-# This version supports both "X11" and "curses" in a single executable.
-#
-# You may have to add various X11 include/library directories to the
-# "CFLAGS", if your machine places files in a weird location.
-#
-# You may be able to remove "-ltermcap" on some machines (ex: Solaris).
-#
-# You may have to replace "-lcurses" with "-lncurses" to use the
-# "new curses" library instead of the "old curses" library, and
-# you may have to add "-I/usr/include/ncurses" to the "CFLAGS".
-#
-# See "main-gcu.c" and "config.h" for some optional "curses" defines,
-# including "USE_GETCH" and "USE_CURS_SET". Note that "config.h" will
-# attempt to "guess" at many of these flags based on your system.
-#
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_GCU"
-#LIBS = -lX11 -lcurses -ltermcap
-
-
-##
-## Variation -- Only support "main-x11.c" (not "main-gcu.c")
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_X11"
-#LIBS = -lX11
-
-
-##
-## Variation -- Only support "main-gcu.c" (not "main-x11.c")
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_GCU"
-#LIBS = -lcurses -ltermcap
-
-
-##
-## Variation -- Use "main-xaw.c" instead of "main-x11.c"
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_XAW" -D"USE_GCU"
-#LIBS = -lXaw -lXmu -lXt -lX11 -lcurses -ltermcap
-
-
-##
-## Variation -- Use "main-gtk.c" instead of "main-x11.c"
-## Note: gtk-config adds GTK and X11 includes and libraries as appropriate.
-##
-#CFLAGS = -Wall -O `gtk-config --cflags` -g -D"USE_GTK" -D"USE_GCU"
-#LIBS = `gtk-config --libs` -lcurses -ltermcap
-
-
-##
-## Variation -- Use "main-cap.c" instead of "main-gcu.c"
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_CAP"
-#LIBS = -lX11 -ltermcap
-
-
-##
-## Variation -- Only work on simple vt100 terminals
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_CAP" -D"USE_HARDCODE"
-
-
-##
-## Variation -- compile for Linux
-##
-## Allows the use of Angband in the console using ncurses,
-## as well as under X11.
-##
-#CFLAGS = -I/usr/X11R6/include -I/usr/include/ncurses -Wall \
- # -O2 -fno-strength-reduce -D"HAVE_MKSTEMP" \
- # -D"USE_X11" -D"USE_GCU" -D"USE_NCURSES" -g
-#LIBS = -L/usr/X11R6/lib -lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lncurses
-
-
-##
-## Variation -- compile for Linux
-##
-## Allows the use of Angband in the console using curses.
-##
-#CFLAGS = -Wall -O2 -fno-strength-reduce -pipe -D"USE_GCU"
-#LIBS = -lcurses
-
-
-##
-## Variation -- compile for Linux
-##
-## Allows the use of Angband in X11 using the Athena Widget set.
-##
-#CFLAGS = -Wall -O2 -fno-strength-reduce -pipe -g -D"USE_XAW"
-#LIBS = -L/usr/X11R6/lib -lXaw -lXext -lSM -lICE -lXmu -lXt -lX11
-
-
-##
-## Variation -- this might work better than the suggestion above
-##
-CFLAGS = -I/usr/include/ncurses \
- -Wall -O2 -fno-strength-reduce -fomit-frame-pointer \
- -D"USE_X11" -D"USE_GCU" \
- -D"USE_TPOSIX" -D"USE_CURS_SET"
-LIBS = -lX11 -lncurses
-LDFLAGS = -s
-
-
-##
-## Variation -- compile for Solaris
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_GCU" -D"SOLARIS"
-#LIBS = -lX11 -lsocket -lcurses
-
-
-##
-## Variation -- compile for SGI Indigo runnig Irix
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_GCU" -D"SGI"
-#LIBS = -lX11 -lcurses -ltermcap -lsun
-
-
-##
-## Variation -- compile for Dec ALPHA OSF/1 v2.0
-##
-#CC = cc
-##CFLAGS = -std -O -g3 -Olimit 4000 -D"USE_X11" -D"USE_GCU"
-#CFLAGS = -std -g -D"USE_X11" -D"USE_GCU"
-#LIBS = -lX11 -lcurses -ltermcap -lrpcsvc
-
-
-##
-## Variation -- compile for Interactive Unix (ISC) systems
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_X11" -D"USE_GCU" -D"ISC"
-#LIBS = -lX11 -lcurses -lnsl_s -linet -lcposix
-
-
-##
-## Variation -- Support fat binaries under NEXTSTEP
-##
-#CFLAGS = -Wall -O1 -pipe -g -D"USE_GCU" -arch m68k -arch i386
-#LIBS = -lcurses -ltermcap
-
-
-##
-## Variation -- Support Linux + SVGA library
-##
-#CFLAGS = -Wall -O2 -fno-strength-reduce -D"USE_LSL"
-#LIBS = -lz -lvgagl -lvga
-
-
-##
-## Variation -- Support Linux "vcs" (Virtual Console memory) module
-##
-#CFLAGS = -Wall -O2 -fno-strength-reduce -D"USE_VCS"
-#LIBS =
-
-
-##
-## Variation -- Support S-Lang library
-##
-#CFLAGS = -Wall -O2 -fno-strength-reduce -D"USE_SLA" -I/usr/include/slang
-#LIBS = -lslang
-
-
-#
-# Default target.
-#
-all: nppangband
-
-
-#
-# Install the game.
-#
-
-install: nppangband
- cp nppangband ..
-
-
-#
-# Build the "NPPAngband" program
-#
-
-nppangband: $(OBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) -o nppangband $(OBJS) $(LIBS)
-
-
-#
-# Clean up old junk
-#
-
-clean:
- -rm -f *.o nppangband
-
-#
-# Generate dependencies automatically
-#
-
-depend:
- makedepend -D__MAKEDEPEND__ $(SRCS)
-
-
-#
-# Hack -- some file dependencies
-#
-
-HDRS = \
- h-basic.h \
- h-define.h h-type.h h-system.h h-config.h
-
-INCS = \
- angband.h \
- config.h defines.h types.h externs.h \
- z-term.h z-rand.h z-util.h z-virt.h z-form.h $(HDRS)
-
-
-birth.o: birth.c $(INCS)
-cave.o: cave.c $(INCS)
-cmd1.o: cmd1.c $(INCS)
-cmd2.o: cmd2.c $(INCS)
-cmd3.o: cmd3.c $(INCS)
-cmd4.o: cmd4.c $(INCS)
-cmd5.o: cmd5.c $(INCS)
-cmd6.o: cmd6.c $(INCS)
-dungeon.o: dungeon.c $(INCS)
-effects.o: effects.c $(INCS)
-feature.o: feature.c $(INCS)
-files.o: files.c $(INCS)
-generate.o: generate.c $(INCS)
-init1.o: init1.c $(INCS) init.h
-init2.o: init2.c $(INCS) init.h
-load.o: load.c $(INCS) init.h
-maid-x11.o: maid-x11.c $(INCS) maid-x11.h
-main-cap.o: main-cap.c $(INCS) main.h
-main-gcu.o: main-gcu.c $(INCS) main.h
-main-gtk.o: main-gtk.c $(INCS) main.h maid-x11.h
-main-lsl.o: main-lsl.c $(INCS) main.h
-main-sla.o: main-sla.c $(INCS) main.h
-main-vcs.o: main-vcs.c $(INCS) main.h
-main-x11.o: main-x11.c $(INCS) main.h maid-x11.h
-main-xaw.o: main-xaw.c $(INCS) main.h maid-x11.h
-main-xpj.o: main-xpj.c $(INCS) main.h maid-x11.h
-main-lfb.o: main-lfb.c $(INCS) main.h
-main.o: main.c $(INCS) main.h
-melee1.o: melee1.c $(INCS)
-melee2.o: melee2.c $(INCS)
-monster1.o: monster1.c $(INCS)
-monster2.o: monster2.c $(INCS)
-obj-info.o: obj-info.c $(INCS)
-object1.o: object1.c $(INCS)
-object2.o: object2.c $(INCS)
-quest.o: quest.c $(INCS)
-randart.o: randart.c $(INCS) init.h
-save.o: save.c $(INCS)
-spells1.o: spells1.c $(INCS)
-spells2.o: spells2.c $(INCS)
-squelch.o: squelch.c $(INCS)
-store.o: store.c $(INCS)
-tables.o: tables.c $(INCS)
-use-obj.o: use-obj.c $(INCS)
-util.o: util.c $(INCS)
-variable.o: variable.c $(INCS)
-wizard1.o: wizard1.c $(INCS)
-wizard2.o: wizard2.c $(INCS)
-xtra1.o: xtra1.c $(INCS)
-xtra2.o: xtra2.c $(INCS)
-z-form.o: z-form.c $(HDRS) z-form.h z-util.h z-virt.h
-z-rand.o: z-rand.c $(HDRS) z-rand.h
-z-term.o: z-term.c $(HDRS) z-term.h z-virt.h
-z-util.o: z-util.c $(HDRS) z-util.h
-z-virt.o: z-virt.c $(HDRS) z-virt.h z-util.h
-
diff --git a/extra/nppangband/PKGBUILD b/extra/nppangband/PKGBUILD deleted file mode 100644 index 177b0fa53..000000000 --- a/extra/nppangband/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 58001 2009-11-03 08:18:40Z giovanni $ -# Maintainer: James Rayner <iphitus@gmail.com> - -pkgname=nppangband -pkgver=0.5.0.25 -pkgrel=1.1 -pkgdesc="A variant of Angband that attempts to take popular ideas from other variants" -url="http://www.assembla.com/wiki/show/NPPAngband" -depends=('ncurses' 'libx11') -makedepends=('libxaw' 'xorg-font-utils') -source=(http://www.assembla.com/spaces/NPPAngband/documents/dmfeFgWJir3PuseJe5afGb/download/npp050-rev25-src.zip) -license=('custom') -arch=('i686' 'x86_64' 'mips64el') - -build() { - - cd $srcdir/npp050-rev25-src/src - sed 's@# define DEFAULT_PATH "./lib/"@# define DEFAULT_PATH "/usr/share/nppangband/"@' -i config.h - sed -i 's/-D"USE_LFB"//g' Makefile.std # Remove framebuffer support, does not compile, - make -f Makefile.std - - - # Fix fonts - cd ../lib/xtra/font/ - tr -d '\r' < compile_bdf_fonts.sh > compile_bdf_fonts2.sh # Convert line endings dos->unix - sed -i "s/\.bdf/\.bdf;/g" compile_bdf_fonts2.sh # fix syntax error, missing ;. - bash compile_bdf_fonts2.sh # no shebang, use bash explicitly - - # Install - cd $srcdir/npp050-rev25-src/ - mkdir -p $pkgdir/usr/bin $pkgdir/usr/share - cp -R lib $pkgdir/usr/share/nppangband/ - chmod -R 775 $pkgdir/usr/share/nppangband/ - chown -R root:games $pkgdir/usr/share/nppangband/ - install -m755 src/nppangband $pkgdir/usr/bin/nppangband - - # install custom license - install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING -} - -md5sums=('776d387ccbca31edf7eb30eb1402b0c9') diff --git a/extra/nss-mdns/PKGBUILD b/extra/nss-mdns/PKGBUILD index bfb2f6eeb..fb75b698e 100644 --- a/extra/nss-mdns/PKGBUILD +++ b/extra/nss-mdns/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 56016 2009-10-17 23:24:29Z giovanni $ +# $Id: PKGBUILD 124100 2011-05-16 15:17:50Z andrea $ +# Maintainer: # Contributor: Travis Willard <travis@archlinux.org> pkgname=nss-mdns pkgver=0.10 -pkgrel=2 +pkgrel=3 pkgdesc="glibc plugin providing host name resolution via mDNS" arch=('i686' 'x86_64' 'mips64el') url="http://0pointer.de/lennart/projects/nss-mdns/" -license=('lgpl') +license=('LGPL') depends=('glibc') makedepends=('pkgconfig') backup=('etc/mdns.allow') install=nss-mdns.install -source=(http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz - mdns.allow) +source=("http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'mdns.allow') md5sums=('03938f17646efbb50aa70ba5f99f51d7' '904abb492fb1f56722826c0c3a997bf0') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./configure --prefix=/ \ --disable-lynx \ --enable-avahi - make || return 1 - make DESTDIR=${pkgdir} install - mkdir -p ${startdir}/pkg/etc - install -m644 ../mdns.allow ${startdir}/pkg/etc/mdns.allow + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}"/mdns.allow "${pkgdir}"/etc/mdns.allow } diff --git a/extra/nss-mdns/nss-mdns.install b/extra/nss-mdns/nss-mdns.install index ed0fd0c24..85e4d269a 100644 --- a/extra/nss-mdns/nss-mdns.install +++ b/extra/nss-mdns/nss-mdns.install @@ -18,7 +18,3 @@ EOM post_install } - -op=$1 -shift -$op $* diff --git a/extra/numlockx/PKGBUILD b/extra/numlockx/PKGBUILD deleted file mode 100644 index 31dbbb430..000000000 --- a/extra/numlockx/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 75639 2010-04-02 01:32:53Z dgriffiths $ -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Travis Willard <travisw@wmpub.ca> -# Contributor: Thayer Williams <thayer@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=numlockx -pkgver=1.2 -pkgrel=1 -pkgdesc="Turns on the numlock key in X11" -arch=('i686' 'x86_64' 'mips64el') -license=('MIT') -url="http://ktown.kde.org/~seli/numlockx/" -depends=('libxtst') -source=(http://ktown.kde.org/~seli/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('be9109370447eae23f6f3f8527bb1a67') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure --prefix=/usr x_includes=/usr/include/X11 \ - x_libraries=/usr/lib || return 1 - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make prefix=${pkgdir}/usr install || return 1 - - # Install the custom MIT license - install -D LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 -} diff --git a/extra/oxygen-icons/PKGBUILD b/extra/oxygen-icons/PKGBUILD deleted file mode 100644 index 1440c6446..000000000 --- a/extra/oxygen-icons/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 121091 2011-04-29 00:27:25Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=oxygen-icons -pkgname=('oxygen-icons' - 'oxygen-icons-svg') -pkgver=4.6.3 -pkgrel=1 -pkgdesc="The Oxygen Icon Theme" -arch=('any') -url='http://www.oxygen-icons.org/' -license=('LGPL') -makedepends=('pkgconfig' 'cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('9efaf92d516f716f3d36ff0e21c66384500e967d') - -build() { - cd $srcdir - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_oxygen-icons() { - cd $srcdir/build - make DESTDIR=$pkgdir install -} - -package_oxygen-icons-svg() { - pkgdesc="The Oxygen Icon Theme (Scalable Vector Graphics)" - cd $srcdir/${pkgbase}-${pkgver} - find scalable -type f ! -name '*.sh' -exec \ - install -D -m644 "{}" "${pkgdir}/usr/share/icons/oxygen/{}" \; -} diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD index e22ade6ce..f64ee4525 100644 --- a/extra/parted/PKGBUILD +++ b/extra/parted/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 82289 2010-06-10 01:52:54Z andrea $ +# $Id: PKGBUILD 124503 2011-05-22 16:56:26Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=parted -pkgver=2.3 +pkgver=2.4 pkgrel=1 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ url="http://www.gnu.org/software/parted/parted.html" depends=('device-mapper' 'e2fsprogs') options=('!libtool') install=${pkgname}.install -source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('30ceb6df7e8681891e865e2fe5a7903d') +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('b6cc55fd6e04b37b1745bc2e10d1a888') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -21,11 +21,11 @@ build() { ./configure --prefix=/usr \ --disable-debug \ --disable-rpath \ - --disable-Werror || return 1 - make || return 1 + --disable-Werror + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } diff --git a/extra/partitionmanager/PKGBUILD b/extra/partitionmanager/PKGBUILD index a37d30f06..061d656eb 100644 --- a/extra/partitionmanager/PKGBUILD +++ b/extra/partitionmanager/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89515 2010-09-01 13:48:17Z tpowa $ +# $Id: PKGBUILD 124524 2011-05-22 18:37:51Z giovanni $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> pkgname=partitionmanager pkgver=1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="A KDE 4 utility that allows you to manage disks, partitions, and file systems." arch=('i686' 'x86_64' 'mips64el') url="https://sourceforge.net/projects/partitionman/" diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD index 70d8a705e..a878b42b5 100644 --- a/extra/php-apc/PKGBUILD +++ b/extra/php-apc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122195 2011-05-02 19:06:00Z pierre $ +# $Id: PKGBUILD 123989 2011-05-15 16:00:20Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-apc -pkgver=3.1.8 +pkgver=3.1.9 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' @@ -11,7 +11,7 @@ depends=('php') license="PHP" source=("http://pecl.php.net/get/APC-${pkgver}.tgz") backup=('etc/php/conf.d/apc.ini') -md5sums=('bb1147933a61aa70ceffe53cc6f2920f') +md5sums=('a2cf7fbf6f3a87f190d897a53260ddaa') build() { cd $srcdir/APC-$pkgver diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 814b4a97f..05883a1d8 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 123134 2011-05-08 21:15:31Z foutrelis $ +# $Id: PKGBUILD 124929 2011-05-25 09:33:46Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,8 +7,8 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.7.11 -pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=5 +arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' @@ -16,12 +16,22 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('07c2a2535b4d7436b5ec7685fe063fec') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + nm09-pidgin.patch + nm09-more.patch) +md5sums=('07c2a2535b4d7436b5ec7685fe063fec' + '744a21b4dbaf949dba7cd3b75b12b4fe' + 'a673659d86c7a65aa710f7c8c7feda82') build() { cd "$srcdir/$pkgname-$pkgver" + # Update for NetworkManager 0.9 connection states + # (http://developer.pidgin.im/ticket/13505) + # (http://developer.pidgin.im/ticket/13859) + patch -Np1 -i "$srcdir/nm09-pidgin.patch" + patch -Np1 -i "$srcdir/nm09-more.patch" + # Use Python 2 sed -i 's/env python$/\02/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} @@ -51,7 +61,7 @@ package_pidgin(){ install=pidgin.install cd "$srcdir/pidgin-$pkgver" - + # For linking make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES @@ -72,7 +82,7 @@ package_libpurple(){ 'cyrus-sasl-plugins') optdepends=('avahi: Bonjour protocol support' 'dbus-python: for purple-remote and purple-url-handler') - + cd "$srcdir/pidgin-$pkgver" for _dir in libpurple share/sounds share/ca-certs m4macros po; do @@ -100,3 +110,5 @@ package_finch(){ rm "$pkgdir"/usr/share/man/man1/pidgin.1 } + +# vim:set ts=2 sw=2 et: diff --git a/extra/pidgin/nm09-more.patch b/extra/pidgin/nm09-more.patch new file mode 100644 index 000000000..8c708df9a --- /dev/null +++ b/extra/pidgin/nm09-more.patch @@ -0,0 +1,49 @@ +diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c +--- pidgin-2.7.11/libpurple/network.c.nm09more 2011-04-26 12:01:27.700085246 -0500 ++++ pidgin-2.7.11/libpurple/network.c 2011-05-24 13:13:28.185165657 -0500 +@@ -833,8 +833,20 @@ purple_network_is_available(void) + purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n"); + } + +- if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED) +- return TRUE; ++ switch (nm_state) ++ { ++ case NM_STATE_UNKNOWN: ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_CONNECTED_LOCAL: ++ case NM_STATE_CONNECTED_SITE: ++ case NM_STATE_CONNECTED_GLOBAL: ++#else ++ case NM_STATE_CONNECTED: ++#endif ++ return TRUE; ++ default: ++ break; ++ } + + return FALSE; + +@@ -1170,9 +1182,14 @@ purple_network_init(void) + NM_DBUS_SERVICE, + NM_DBUS_PATH, + NM_DBUS_INTERFACE); ++ /* NM 0.6 signal */ + dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(nm_proxy, "StateChange", + G_CALLBACK(nm_state_change_cb), NULL, NULL); ++ /* NM 0.7 and later signal */ ++ dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID); ++ dbus_g_proxy_connect_signal(nm_proxy, "StateChanged", ++ G_CALLBACK(nm_state_change_cb), NULL, NULL); + + dbus_proxy = dbus_g_proxy_new_for_name(nm_conn, + DBUS_SERVICE_DBUS, +@@ -1207,6 +1224,7 @@ purple_network_uninit(void) + #ifdef HAVE_NETWORKMANAGER + if (nm_proxy) { + dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL); ++ dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL); + g_object_unref(G_OBJECT(nm_proxy)); + } + if (dbus_proxy) { diff --git a/extra/pidgin/nm09-pidgin.patch b/extra/pidgin/nm09-pidgin.patch new file mode 100644 index 000000000..1c2471d1f --- /dev/null +++ b/extra/pidgin/nm09-pidgin.patch @@ -0,0 +1,38 @@ +diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c +--- pidgin-2.7.10/libpurple/network.c.foo 2011-03-10 02:21:43.920933267 -0600 ++++ pidgin-2.7.10/libpurple/network.c 2011-03-10 02:23:11.466838793 -0600 +@@ -71,6 +71,10 @@ + #include <dbus/dbus-glib.h> + #include <NetworkManager.h> + ++#if !defined(NM_CHECK_VERSION) ++#define NM_CHECK_VERSION(x,y,z) 0 ++#endif ++ + static DBusGConnection *nm_conn = NULL; + static DBusGProxy *nm_proxy = NULL; + static DBusGProxy *dbus_proxy = NULL; +@@ -863,7 +867,13 @@ nm_update_state(NMState state) + + switch(state) + { ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_CONNECTED_LOCAL: ++ case NM_STATE_CONNECTED_SITE: ++ case NM_STATE_CONNECTED_GLOBAL: ++#else + case NM_STATE_CONNECTED: ++#endif + /* Call res_init in case DNS servers have changed */ + res_init(); + /* update STUN IP in case we it changed (theoretically we could +@@ -880,6 +890,9 @@ nm_update_state(NMState state) + case NM_STATE_ASLEEP: + case NM_STATE_CONNECTING: + case NM_STATE_DISCONNECTED: ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_DISCONNECTING: ++#endif + if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) + break; + if (ui_ops != NULL && ui_ops->network_disconnected != NULL) diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index f11499723..51a71fe49 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 117503 2011-04-04 08:59:49Z jgc $ +# $Id: PKGBUILD 124052 2011-05-16 10:27:13Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler -pkgname=('poppler' 'poppler-glib') # 'poppler-qt') -pkgver=0.16.4 +pkgname=('poppler' 'poppler-glib' 'poppler-qt') +pkgver=0.16.5 pkgrel=1 arch=(i686 x86_64 'mips64el') license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'pkgconfig' 'lcms' 'gobject-introspection') options=('!libtool') url="http://poppler.freedesktop.org/" -source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz) -md5sums=('2b996ca77dad04b422f67238daab48e7') +source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz) +md5sums=('2b6e0c26b77a943df3b9bb02d67ca236') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" sed -i -e '/AC_PATH_XTRA/d' configure.ac autoreconf ./configure --prefix=/usr --sysconfdir=/etc \ @@ -25,8 +25,6 @@ build() { --disable-poppler-qt4 \ --enable-poppler-glib make - sed -e 's/^glib_subdir =.*/glib_subdir =/' \ - -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile } package_poppler() { @@ -35,6 +33,8 @@ package_poppler() { conflicts=("poppler-qt3<${pkgver}") cd "${srcdir}/${pkgbase}-${pkgver}" + sed -e 's/^glib_subdir =.*/glib_subdir =/' \ + -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile make DESTDIR="${pkgdir}" install rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 05554e4e5..417ab5c15 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123242 2011-05-09 13:33:46Z bisson $ +# $Id: PKGBUILD 124325 2011-05-19 16:07:15Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=postfix pkgver=2.8.3 -pkgrel=1 +pkgrel=3 pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)' url='http://www.postfix.org/' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${p 'rc.d') sha1sums=('2604066f158f5327449960afd6334b996dc01799' '5fc3de6c7df1e5851a0a379e825148868808318b' - '050e6afc5886049682c945ce147b3c47fe113939') + '40c6be2eb55e6437a402f43775cdb3d22ea87a66') provides=('smtp-server' 'smtp-forwarder') replaces=('postfix-mysql' 'postfix-pgsql') @@ -28,23 +28,23 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - make makefiles CCARGS=' \ - -DUSE_SASL_AUTH -I/usr/include/sasl \ - -DUSE_CYRUS_SASL \ + make makefiles DEBUG='' CCARGS=' \ + -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \ -DHAS_LDAP \ -DUSE_TLS \ -DHAS_MYSQL -I/usr/include/mysql \ -DHAS_PGSQL -I/usr/include/postgresql \ -DHAS_SQLITE \ ' AUXLIBS=' \ - -lsasl2 -lssl -lcrypto \ + -lsasl2 \ -lldap -llber \ + -lssl -lcrypto \ -lmysqlclient -lz -lm \ -lpq \ -lsqlite3 -lpthread \ - ' + ' OPT="${CFLAGS} ${LDFLAGS}" - make OPT="${CFLAGS}" + make } package() { diff --git a/extra/postfix/rc.d b/extra/postfix/rc.d index 94ccc2af0..fa314bb84 100755 --- a/extra/postfix/rc.d +++ b/extra/postfix/rc.d @@ -4,24 +4,23 @@ . /etc/rc.d/functions name=postfix -PID=$(pidof -o %PPID /usr/lib/postfix/master) case "$1" in start) stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && /usr/sbin/postfix start &>/dev/null \ + /usr/sbin/postfix start &>/dev/null \ && { add_daemon $name; stat_done; } \ || { stat_fail; exit 1; } ;; stop) stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && /usr/sbin/postfix stop &>/dev/null \ + /usr/sbin/postfix stop &>/dev/null \ && { rm_daemon $name; stat_done; } \ || { stat_fail; exit 1; } ;; reload) stat_busy "Reloading $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ + /usr/sbin/postfix reload &>/dev/null \ && { stat_done; } \ || { stat_fail; exit 1; } ;; diff --git a/extra/python-gtkglext/PKGBUILD b/extra/python-gtkglext/PKGBUILD deleted file mode 100644 index c1fcd1410..000000000 --- a/extra/python-gtkglext/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 89694 2010-09-03 10:37:56Z remy $ -# Maintainer: simo <simo@archlinux.org> -pkgname=python-gtkglext -pkgver=1.1.0 -pkgrel=4 -pkgdesc="Python language bindings for GtkGLExt" -arch=(i686 x86_64 'mips64el') -depends=('gtkglext' 'mesa' 'python-opengl' 'pygtk') -makedepends=('libxmu') -url="http://gtkglext.sourceforge.net/" -source=(http://downloads.sourceforge.net/gtkglext/pygtkglext-$pkgver.tar.bz2) -license="LGPL" -md5sums=('720b421d3b8514a40189b285dd91de57') - -build() { - cd $startdir/src/pygtkglext-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install - find $startdir/pkg -name '*.la' -exec rm {} \; -} diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index 2e56f44e7..ba8c0f601 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 110855 2011-02-22 19:17:39Z tpowa $ +# $Id: PKGBUILD 124173 2011-05-17 12:44:55Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm pkgver=0.14.0 -pkgrel=1 +pkgrel=2 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64 'mips64el') license=('GPL2' 'LGPL2.1') @@ -16,6 +16,7 @@ provides=('qemu') replaces=('kvm') source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz 65-kvm.rules) +options=(!strip) build() { @@ -24,7 +25,7 @@ build() ./configure --prefix=/usr \ --sysconfdir=/etc \ --audio-drv-list=alsa,sdl,oss,esd \ - --audio-card-list=ac97,sb16,es1370,adlib \ + --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs make } @@ -44,6 +45,13 @@ package() # install udev rules install -D -m644 ${srcdir}/65-kvm.rules \ ${pkgdir}/lib/udev/rules.d/65-kvm.rules + # strip scripts directory + find ${pkgdir}/usr/bin -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-executable*) # Binaries + /usr/bin/strip $STRIP_BINARIES "$binary";; + esac + done } md5sums=('4ea6f412d85a826e0b0690f5c4c59f13' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index a541ebf6e..f6b1913ea 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 110725 2011-02-21 20:11:19Z tpowa $ +# $Id: PKGBUILD 124178 2011-05-17 13:06:59Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=0.14.0 +pkgver=0.14.1 pkgrel=1 pkgdesc="QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') @@ -13,13 +13,14 @@ backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz 65-kvm.rules) +options=(!strip) build() { cd ${srcdir}/${pkgname}-${pkgver} sed -i -e 's/lib64/lib/g' x86_64.ld ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,esd \ - --audio-card-list=ac97,sb16,es1370,adlib \ + --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs \ --kerneldir="/usr/src/linux-$(uname -r)" make @@ -30,6 +31,14 @@ package() { make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/65-kvm.rules \ ${pkgdir}/lib/udev/rules.d/65-kvm.rules + # strip scripts directory + find ${pkgdir}/usr/src/linux-${_kernver}/scripts -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-executable*) # Binaries + /usr/bin/strip $STRIP_BINARIES "$binary";; + esac + done + } -md5sums=('f9d145d5c09de9f0984ffe9bd1229970' +md5sums=('b6c713a8db638e173af53a62d5178640' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index e7ed56b07..c41f9caee 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 109447 2011-02-09 17:52:06Z schiv $ -# Maintainer: Ray Rashif <schivmeister@gmail.com> +# $Id: PKGBUILD 124858 2011-05-24 19:56:15Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=rosegarden -pkgver=11.02 +pkgver=11.06 pkgrel=1 pkgdesc="MIDI/audio sequencer and notation editor" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ optdepends=('lilypond: notation display' 'dssi-vst: win32 VST support') install=$pkgname.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('fca86bfd7351a16cc2b55a85d2c8a128') +md5sums=('77ab43d06de53ace338843ff82e26288') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/rsync/ChangeLog b/extra/rsync/ChangeLog index a1d6b4f9d..d07e4ad5a 100644 --- a/extra/rsync/ChangeLog +++ b/extra/rsync/ChangeLog @@ -1,3 +1,7 @@ +2011-05-17 Angel Velasquez <angvp@archlinux.org> + * rsync 3.0.8-2 + * Added call_rsync func to rsyncd to support pass arguments to the daemon + 2010-01-01 Eric Belanger <eric@archlinux.org> * rsync 3.0.7-1 diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD index 27f09a91d..a43d1440f 100644 --- a/extra/rsync/PKGBUILD +++ b/extra/rsync/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 118437 2011-04-06 20:17:24Z angvp $ +# $Id: PKGBUILD 124256 2011-05-18 05:08:59Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=rsync pkgver=3.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="A file transfer program to keep remote files in sync" arch=('i686' 'x86_64' 'mips64el') url="http://samba.anu.edu.au/rsync/" license=('GPL3') depends=('acl') backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync') +changelog=ChangeLog source=(http://rsync.samba.org/ftp/rsync/${pkgname}-${pkgver}.tar.gz \ rsyncd.conf rsyncd rsync.xinetd) md5sums=('0ee8346ce16bdfe4c88a236e94c752b4' '4395c0591638349b1a7aeaaa4da1f03a' - '3d8f90ac8467ff6af28754584a61fd11' + '7a9ce3b5de97f3aae29b906f93e1d157' 'ea3e9277dc908bc51f9eddc0f6b935c1') sha1sums=('10e80173c7e9ed8b8a4dc9e8fdab08402da5f08d' '48be09294134dfed888818872fe552a59c29147a' - '357af5648eb4ecf84cc6b1de1cd79d21eca3a518' + 'eda623c31d9def454cf8e3e88dcf63de4ca5c08b' 'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1') build() { diff --git a/extra/rsync/rsyncd b/extra/rsync/rsyncd index 573130fb3..d7a772e8e 100644 --- a/extra/rsync/rsyncd +++ b/extra/rsync/rsyncd @@ -3,10 +3,16 @@ . /etc/rc.conf . /etc/rc.d/functions +[ -f /etc/conf.d/rsyncd ] && . /etc/conf.d/rsyncd + +function call_rsyncd() { + /usr/bin/rsync --daemon $RSYNCD_ARGS +} + case "$1" in start) stat_busy "Starting rsyncd" - [ ! -f /var/run/daemons/rsyncd ] && /usr/bin/rsync --daemon + [ ! -f /var/run/daemons/rsyncd ] && call_rsyncd if [ $? -gt 0 ]; then stat_fail else diff --git a/extra/rxvt-unicode/ChangeLog b/extra/rxvt-unicode/ChangeLog new file mode 100644 index 000000000..6b3a80c20 --- /dev/null +++ b/extra/rxvt-unicode/ChangeLog @@ -0,0 +1,2 @@ +2011-05-17 Angel Velasquez <angvp@archlinux.org> + * Removed not accepted upstream patch (closes FS#23324) diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD index 07bf9746e..86da1fd45 100644 --- a/extra/rxvt-unicode/PKGBUILD +++ b/extra/rxvt-unicode/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 122865 2011-05-07 00:01:55Z eric $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id: PKGBUILD 124251 2011-05-18 04:52:29Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: tobias <tobias@archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=rxvt-unicode pkgver=9.11 -pkgrel=1 +pkgrel=2 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)" arch=('i686' 'x86_64' 'mips64el') url="http://software.schmorp.de/pkg/rxvt-unicode.html" license=('GPL') depends=('gcc-libs' 'libxft' 'gdk-pixbuf2') optdepends=('perl: lots of utilities' 'gtk2-perl: to use the urxvt-tabbed') +changelog=ChangeLog source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \ - ${pkgname}.desktop popup-menu-hang.diff) + ${pkgname}.desktop) md5sums=('1bed5bfeed026e0bfafa0e9e4f62aa37' - '3de6c13126a45bc3bc9f6bba077a1311' - 'aead33ba3b08eeb251fb0c1427a4a024') + '3de6c13126a45bc3bc9f6bba077a1311') sha1sums=('21d0fad9a6032dbcf2c43a85f288543c6bd5ab3d' - '962aebc88982dbeb62a7c4a051ff567e015f61a0' - 'ec4013f4af3a45da928b75f40fbf6389070e7fdd') + '962aebc88982dbeb62a7c4a051ff567e015f61a0') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 < ../popup-menu-hang.diff ./configure --prefix=/usr \ --with-terminfo=/usr/share/terminfo \ --enable-256-color \ diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index 0a650eb85..e9755aada 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,29 +1,40 @@ -# $Id: PKGBUILD 84723 2010-07-03 19:29:41Z ibiru $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 125359 2011-05-26 09:22:50Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim -pkgver=1.4.9 -pkgrel=2 -pkgdesc="A Input Method development platform" -arch=("i686" "x86_64" 'mips64el') -url="http://www.scim-im.org/projects/scim" +pkgver=1.4.10 +pkgrel=1 +pkgdesc='Input method user interface and development platform' +url='http://www.scim-im.org/projects/scim' license=('GPL') +arch=('i686' 'x86_64') depends=('gtk2' 'gcc-libs') makedepends=('intltool') backup=('etc/scim/config' 'etc/scim/global') options=('!libtool') -install=scim.install -source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz - gcc45.patch) -md5sums=('975ba34b01304ea8166ac8ea27aa9e88' - '9d7b41421424cedcbc5740098afa4921') +source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_$pkgver.tar.gz") +sha1sums=('bf33a6ceb199453fed909a61f54e971653fe5abf') + +install=install build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/gcc45.patch - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-gnu-ld --with-x --disable-static - make - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + + ./bootstrap + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-static \ + --with-gnu-ld \ + --with-x \ + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } diff --git a/extra/scim/install b/extra/scim/install new file mode 100644 index 000000000..405061cb4 --- /dev/null +++ b/extra/scim/install @@ -0,0 +1,13 @@ +post_install() { + echo -n 'updating gtk.immodules... ' + /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + echo 'done.' +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index c235a694d..bbf5c4e21 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120604 2011-04-25 18:04:11Z ibiru $ +# $Id: PKGBUILD 124485 2011-05-22 15:13:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') groups=('gnome-extra') install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('79efc22f9fe7db3d53a02be8bcf910be25aef0e321a49ec87a3a709f8aaaa912') +sha256sums=('78b38d6e7220d1957af34eac79c21423f1f4be066853126d30cc030d8407a1bf') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/sharutils/sharutils.install b/extra/sharutils/sharutils.install deleted file mode 100644 index e8d9f8c07..000000000 --- a/extra/sharutils/sharutils.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(sharutils.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD index 435321d1b..1d1af26d0 100644 --- a/extra/socat/PKGBUILD +++ b/extra/socat/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 87629 2010-08-17 13:33:30Z bisson $ -# Maintainer: +# $Id: PKGBUILD 125383 2011-05-26 13:02:11Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=socat pkgver=1.7.1.3 -pkgrel=1 -pkgdesc='Relay for bidirectional data transfer via socket, pty, pipe, file and more' -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') +pkgrel=2 +pkgdesc='Multipurpose relay' url='http://www.dest-unreach.org/socat/' +license=('GPL2') +arch=('i686' 'x86_64') depends=('readline' 'openssl' 'tcp_wrappers') -makedepends=('imake') source=("http://www.dest-unreach.org/socat/download/$pkgname-$pkgver.tar.gz") sha1sums=('5a42275da0d8a5182452b36535a74c3cdf21793b') build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --mandir=/usr/share/man - make depend || return 1 - make || return 1 + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install || return 1 + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD index 0c582933f..5f2c69b20 100644 --- a/extra/source-highlight/PKGBUILD +++ b/extra/source-highlight/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111993 2011-03-02 22:17:55Z ibiru $ +# $Id: PKGBUILD 124988 2011-05-25 16:07:54Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=source-highlight pkgver=3.1.4 -pkgrel=2 +pkgrel=3 pkgdesc="Convert source code to syntax highlighted document" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/src-highlite/" diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index 3f8d411f3..577657653 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 117296 2011-03-30 18:17:00Z schiv $ +# $Id: PKGBUILD 124581 2011-05-23 04:58:46Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox pkgver=14.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64' 'mips64el') url="http://sox.sourceforge.net/" license=('GPL' 'LGPL') depends=('libtool' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr') -makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack') +makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') optdepends=('libao: for ao plugin' 'ffmpeg: for ffmpeg plugin' 'libmad: for mp3 plugin' 'libid3tag: for mp3 plugin' - 'wavpack: for wavpack plugin') + 'wavpack: for wavpack plugin' + 'libpulse: for pulse plugin') options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) md5sums=('f6e1999b05d9b0cc9bb47ce8d3208dee') @@ -22,6 +23,7 @@ sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am ./configure --prefix=/usr --sysconfdir=/etc \ --with-dyn-default --with-distro="Arch Linux" make @@ -30,6 +32,4 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - ln -sf play "${pkgdir}/usr/bin/rec" - ln -sf ../man1/sox.1.gz "${pkgdir}/usr/share/man/man7/soxeffect.7" } diff --git a/extra/speedcrunch/PKGBUILD b/extra/speedcrunch/PKGBUILD deleted file mode 100644 index b3f5d875d..000000000 --- a/extra/speedcrunch/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 67114 2010-02-03 16:04:47Z andrea $ -# Maintainer: -# Contributor: Ronald van Haren <ronald.archlinux.org> - -pkgname=speedcrunch -pkgver=0.10.1 -pkgrel=2 -pkgdesc="Simple but powerful calculator using Qt" -url="http://speedcrunch.org/" -arch=('i686' 'x86_64' 'mips64el') -depends=('qt') -makedepends=('cmake') -license=('GPL2') -source=(http://speedcrunch.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('344ee1303b05502d28c58a2fff1ca6b2') - -build() { - cd $srcdir/$pkgname-$pkgver/src - cmake . -DCMAKE_INSTALL_PREFIX=/usr || return 1 - make || return 1 - - # fix make install issue - lrelease speedcrunch.pro - make DESTDIR=$pkgdir install -} diff --git a/extra/startup-notification/PKGBUILD b/extra/startup-notification/PKGBUILD index de12bc3a4..4b1dccd98 100644 --- a/extra/startup-notification/PKGBUILD +++ b/extra/startup-notification/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111001 2011-02-23 15:59:58Z jgc $ +# $Id: PKGBUILD 124868 2011-05-24 20:23:38Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=startup-notification -pkgver=0.10 -pkgrel=2 +pkgver=0.12 +pkgrel=1 pkgdesc="Monitor and display application startup" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -12,13 +12,15 @@ depends=('libx11' 'xcb-util>=0.3.4') options=('!libtool') url="http://www.freedesktop.org" source=(http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('bca0ed1c74bc4e483ea2ed12a5717354') +md5sums=('2cd77326d4dcaed9a5a23a1232fb38e9') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e '/AC_PATH_XTRA/d' configure.in - autoreconf --force --install ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/telepathy-farsight/PKGBUILD b/extra/telepathy-farsight/PKGBUILD index 44902b1fc..ebc6f52b3 100644 --- a/extra/telepathy-farsight/PKGBUILD +++ b/extra/telepathy-farsight/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 120813 2011-04-26 16:12:15Z ibiru $ +# $Id: PKGBUILD 124113 2011-05-16 16:15:50Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Denis Zawada <deno@rootnode.net> pkgname=telepathy-farsight -pkgver=0.0.17 +pkgver=0.0.18 pkgrel=1 pkgdesc="A telepathy-backend to use stream engine." arch=('i686' 'x86_64' 'mips64el') url="http://telepathy.freedesktop.org" license=('GPL') -depends=('telepathy-glib' 'farsight2' 'gstreamer0.10-base') +depends=('telepathy-glib' 'farsight2') makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('f98377802d38333924f6f1a955a2d42a') +md5sums=('984be4153c635ca1b2010de27d74eff4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD index cbb00a4c0..024b5df26 100644 --- a/extra/telepathy-glib/PKGBUILD +++ b/extra/telepathy-glib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120253 2011-04-21 18:20:55Z ibiru $ +# $Id: PKGBUILD 124130 2011-05-16 17:05:51Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.14.5 +pkgver=0.14.6 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('2911d33b45744cdc41774c91f6b837c2') +md5sums=('ab8cf90283ef3382de1d20d87c9d970a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD index aff371792..7390c8b74 100644 --- a/extra/telepathy-idle/PKGBUILD +++ b/extra/telepathy-idle/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120807 2011-04-26 15:59:24Z ibiru $ +# $Id: PKGBUILD 123992 2011-05-15 17:48:59Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Samuel Mendes <heka.lok@gmail.com> pkgname=telepathy-idle -pkgver=0.1.9 +pkgver=0.1.10 pkgrel=1 pkgdesc="An IRC connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -13,15 +13,11 @@ license=('LGPL') depends=('telepathy-glib' 'openssl') makedepends=('libxslt' 'python2') install=telepathy-idle.install -source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz - python27.patch) -md5sums=('423f2cc0481bdb32facb850eaf586ff2' - '03661efde8f768417e224720e1346d7b') +source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('570a431e3e28ca6ebf3f0c84198f0b9a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/python27.patch" - autoreconf -fi ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy make diff --git a/extra/telepathy-idle/python27.patch b/extra/telepathy-idle/python27.patch deleted file mode 100644 index f8abffb57..000000000 --- a/extra/telepathy-idle/python27.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur telepathy-idle-0.1.7.orig/configure.ac telepathy-idle-0.1.7/configure.ac ---- telepathy-idle-0.1.7.orig/configure.ac 2010-12-07 03:52:29.000000000 -0800 -+++ telepathy-idle-0.1.7/configure.ac 2010-12-07 09:41:21.179715253 -0800 -@@ -103,7 +103,7 @@ - AC_MSG_ERROR([xsltproc (from the libxslt source package) is required]) - fi - PYTHON= --AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python]) -+AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python2.7 python]) - if test -z "$PYTHON"; then - AC_MSG_ERROR([Python is required to compile this package]) - fi -@@ -111,7 +111,7 @@ - - dnl check for a version of python that can run the twisted tests - AC_MSG_CHECKING([for Python with Twisted and IRC protocol support]) --for TEST_PYTHON in python2.5 python2.6 python; do -+for TEST_PYTHON in python2.5 python2.6 python2.7 python; do - if $TEST_PYTHON -c "from sys import version_info; import dbus, dbus.mainloop.glib; raise SystemExit(version_info < (2, 5, 0, 'final', 0))" >/dev/null 2>&1; then - if $TEST_PYTHON -c "import twisted.words.protocols.irc, twisted.internet.reactor" >/dev/null 2>&1; then - AM_CONDITIONAL([WANT_TWISTED_TESTS], true) diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD index 0d98fcdec..42f52fb2b 100644 --- a/extra/telepathy-qt4/PKGBUILD +++ b/extra/telepathy-qt4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122345 2011-05-03 23:56:05Z andrea $ +# $Id: PKGBUILD 124315 2011-05-19 11:49:47Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-qt4 -pkgver=0.5.16 +pkgver=0.6.0 pkgrel=1 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ options=('!libtool') depends=('qt' 'telepathy-farsight') makedepends=('libxslt' 'python2' 'cmake') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('82e36c051c74d323b329f69ac2c5427f') +md5sums=('2acb266af1a3f55f7104830ac8db2090') build() { cd "${srcdir}" diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD index 4c0943fa1..98cbad621 100644 --- a/extra/totem-plparser/PKGBUILD +++ b/extra/totem-plparser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 116067 2011-03-22 18:11:16Z heftig $ +# $Id: PKGBUILD 125552 2011-05-26 16:51:47Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=totem-plparser -pkgver=2.32.4 +pkgver=2.32.5 pkgrel=1 url="http://www.hadess.net/totem.php3" pkgdesc="Totem playlist parser library" @@ -12,7 +12,7 @@ depends=('gmime' 'libsoup-gnome') makedepends=('intltool' 'pkgconfig' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/2.32/totem-pl-parser-${pkgver}.tar.bz2) -sha256sums=('349006c8c26a7bee6775c2f48cb158be15c92608f444598c67ca820c205213d6') +sha256sums=('f7233972602321db5e46819a5b47b52c10b63c4344725a5179ac956284e1991d') build() { cd "${srcdir}/totem-pl-parser-${pkgver}" diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index ff9fb8a51..75b5f10da 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120757 2011-04-26 11:04:01Z heftig $ +# $Id: PKGBUILD 125547 2011-05-26 16:47:44Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') pkgver=3.0.1 -pkgrel=1 +pkgrel=2 url="http://www.hadess.net/totem.php3" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'custom') @@ -27,7 +27,7 @@ build() { package_totem() { pkgdesc="A GNOME3 integrated movie player based on Gstreamer." - depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas') + depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf') groups=('gnome-extra') install=totem.install optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index d01cbc5be..5f8e7da61 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 115693 2011-03-19 13:02:20Z ibiru $ +# $Id: PKGBUILD 124261 2011-05-18 07:05:56Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission -#pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgname=('transmission-cli' 'transmission-gtk' ) -pkgver=2.22 -pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +pkgname=('transmission-cli' 'transmission-gtk') +pkgver=2.31 +pkgrel=1 +arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" license=('MIT') -makedepends=('intltool' 'curl' 'libnotify' 'desktop-file-utils' 'libevent' 'libcanberra' 'dbus-glib') +makedepends=('gtk2' 'intltool' 'curl' 'libnotify' 'libevent' 'libcanberra' 'dbus-glib') source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.bz2 transmissiond transmissiond.conf) -md5sums=('6499986bf769276310b00bda1090090d' - '50b7c17300bc8b38f44fb6f681ba05d0' +md5sums=('2785016d74bbecf842cef04883e56400' + '08875299e3fbb68fc546c1f350ac1f06' 'be39806c35b7544856fa4070b00fc960') - build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -61,6 +59,7 @@ package_transmission-qt() { pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)" depends=('curl' 'qt' 'libevent') optdepends=('transmission-cli: daemon and web support') + install=transmission-qt.install cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/transmission/transmission-qt.install b/extra/transmission/transmission-qt.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/extra/transmission/transmission-qt.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/transmission/transmissiond b/extra/transmission/transmissiond index ff83bd331..1b4b4dc0e 100644 --- a/extra/transmission/transmissiond +++ b/extra/transmission/transmissiond @@ -31,7 +31,16 @@ case "$1" in while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done $0 start ;; + reload) + stat_busy "Reloading config" + [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart|reload}" esac exit 0 diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD index 2ad92d911..28eff256b 100644 --- a/extra/udisks/PKGBUILD +++ b/extra/udisks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122326 2011-05-03 20:32:37Z ibiru $ +# $Id: PKGBUILD 124509 2011-05-22 17:12:02Z giovanni $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=udisks pkgver=1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Disk Management Service" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/udisks" diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index a7e4978d4..6e7f7afe5 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,32 +1,29 @@ -# $Id: PKGBUILD 109572 2011-02-10 20:32:59Z bisson $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 124164 2011-05-17 08:27:15Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: damir <damir@archlinux.org> pkgname=uim -pkgver=1.6.1 -pkgrel=2 +pkgver=1.7.0 +pkgrel=1 pkgdesc='Multilingual input method library' arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/uim/' -license=('custom') +license=('custom:BSD') depends=('gtk2' 'libxft' 'libedit' 'anthy' 'm17n-lib') makedepends=('intltool' 'gettext' 'gnome-panel') optdepends=('gnome-panel: gnome applet indicator') options=('!libtool') -source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2" - 'home.patch') -sha1sums=('412bb2df6041185084e2f64fb73357389bf992b5' - 'dbcf90f3ea246c5723d715e0935072baa9364cd2') +source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('b79ed80c2557e804e6d3d2771a213a29cd932a73') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - - # UIM's Makefile needs to write in $HOME - patch -p0 < ../home.patch; export HOME="`pwd`" - - ./configure --prefix=/usr --libexecdir=/usr/lib/uim \ - --with-anthy-utf8 + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/uim \ + --with-anthy-utf8 make } diff --git a/extra/uim/home.patch b/extra/uim/home.patch deleted file mode 100644 index 5d171529d..000000000 --- a/extra/uim/home.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -aur uim/uim-helper.c uim/uim-helper.c ---- uim/uim-helper.c 2010-08-22 19:23:37.646666698 +0200 -+++ uim/uim-helper.c 2010-08-22 19:26:57.676666781 +0200 -@@ -178,7 +178,7 @@ - goto path_error; - } - -- if (strlcpy(helper_path, pw->pw_dir, len) >= (size_t)len) { -+ if (strlcpy(helper_path, getenv("HOME"), len) >= (size_t)len) { - endpwent(); - goto path_error; - } -diff -aur uim/uim-posix.c uim/uim-posix.c ---- uim/uim-posix.c 2010-08-22 19:23:37.650000031 +0200 -+++ uim/uim-posix.c 2010-08-22 19:26:40.096666322 +0200 -@@ -100,7 +100,7 @@ - home[0] = '\0'; - return UIM_FALSE; - } -- if (strlcpy(home, pw->pw_dir, len) >= (size_t)len) { -+ if (strlcpy(home, getenv("HOME"), len) >= (size_t)len) { - home[0] = '\0'; - endpwent(); - return UIM_FALSE; diff --git a/extra/uim/install b/extra/uim/install index ffed34d01..a2d5e00e6 100644 --- a/extra/uim/install +++ b/extra/uim/install @@ -1,13 +1,13 @@ post_install() { - echo -n "updating gtk.immodules... " - usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - echo "done." + echo -n "updating gtk.immodules... " + usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules + echo "done." } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index fac9cc594..30a9704c2 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122280 2011-05-03 18:02:14Z ibiru $ +# $Id: PKGBUILD 124973 2011-05-25 14:17:57Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower -pkgver=0.9.10 +pkgver=0.9.11 pkgrel=1 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection') replaces=('devicekit-power') options=('!libtool') source=($url/releases/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('fa567509c4ce8d1975259665b907929cac692a59dbe0e217e7494b1cdc949288') +sha256sums=('567358cc1b4887485d29e309897dd091c2c2ae95e48dfbb3279ffdc44a4b2956') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/vbetool/PKGBUILD b/extra/vbetool/PKGBUILD deleted file mode 100644 index 0e6033d81..000000000 --- a/extra/vbetool/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 19267 2008-11-18 03:22:15Z eric $ -# Contributor: Christian Storm <Christian.Storm@gmx.DE> -# Contributor: James Rayner <james@archlinux.org> -# Maintainer: Thayer Williams <thayer@archlinux.org> - -pkgname=vbetool -pkgver=1.1 -pkgrel=1 -pkgdesc="vbetool uses lrmi in order to run code from the video BIOS" -url="http://www.srcf.ucam.org/~mjg59/vbetool/" -license=('GPL2') -arch=('i686' 'x86_64' 'mips64el') -depends=('zlib' 'libx86') -makedepends=('pciutils') -source=(http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-${pkgver}.tar.gz) -md5sums=('ffb03b118867a02296d7449019ad8846') - -build() { - cd $srcdir/$pkgname-$pkgver - if [ "${CARCH}" = "x86_64" ]; then - ./configure --prefix=/usr --without-x86emu || return 1 - else - ./configure --prefix=/usr || return 1 - fi - make LIBS=-lpci || return 1 - make DESTDIR=$pkgdir install || return 1 -} - diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index 436ec5ddd..43f4aa5a4 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112123 2011-03-04 03:09:16Z eric $ +# $Id: PKGBUILD 124991 2011-05-25 16:14:08Z ibiru $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=vigra -pkgver=1.7.0 -pkgrel=6 +pkgver=1.7.1 +pkgrel=2 pkgdesc="Computer vision library" arch=('i686' 'x86_64' 'mips64el') url="http://hci.iwr.uni-heidelberg.de/vigra/" @@ -14,13 +14,14 @@ makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-num optdepends=('python2: for python bindings' 'boost-libs: for python bindings') options=('!libtool') -source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz libpng-1.4.patch) -md5sums=('a40b3b013653f75dc84ba55b2df1fae2' 'db610e48558eb323490ad21d636bac76') -sha1sums=('31875646cbb1928d93c96fc4da4fda31772cf8f6' '5f668c861f5fe927a4f51014afab94805db60c46') +source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz + vigra-1.7.1.gcc460.patch) +md5sums=('2bde208e0fd7626770169dd4fa097282' + '25ef8bc26bc38ee67e5b512d2acd0166') build() { - cd "${srcdir}"/${pkgname}-${pkgver}-src - patch -p1 < ../libpng-1.4.patch + cd "${srcdir}"/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_VIGRANUMPY=1 \ -DDOCINSTALL=share/doc @@ -28,7 +29,7 @@ build() { } package() { - cd "${srcdir}"/${pkgname}-${pkgver}-src + cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install # license install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/extra/vigra/vigra-1.7.1.gcc460.patch b/extra/vigra/vigra-1.7.1.gcc460.patch new file mode 100644 index 000000000..46f194dbc --- /dev/null +++ b/extra/vigra/vigra-1.7.1.gcc460.patch @@ -0,0 +1,33 @@ +diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx +--- vigra-1.7.1.old/include/vigra/random_forest.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/random_forest.hxx 2011-01-28 00:16:32.000000000 +0000 +@@ -43,6 +43,7 @@ + #include <set> + #include <list> + #include <numeric> ++#include <stddef.h> + #include "mathutil.hxx" + #include "array_vector.hxx" + #include "sized_int.hxx" +diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx +--- vigra-1.7.1.old/include/vigra/sifImport.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/sifImport.hxx 2011-01-28 00:23:31.000000000 +0000 +@@ -57,6 +57,7 @@ + #include <fstream> + #include <cstring> + #include <vector> ++#include <stddef.h> + #include "vigra/multi_array.hxx" + + namespace vigra { +diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx +--- vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28 00:23:31.000000000 +0000 +@@ -41,6 +41,7 @@ + #define VIGRA_MULTI_ITERATOR_HXX + + #include <sys/types.h> ++#include <stddef.h> + #include "tinyvector.hxx" + #include "iteratortags.hxx" + diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index efe3dac2e..1a636f80e 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,30 +1,43 @@ -# $Id: PKGBUILD 119562 2011-04-12 10:29:49Z giovanni $ +# $Id: PKGBUILD 125527 2011-05-26 14:21:55Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> -pkgbase=vlc -pkgname=('vlc' 'vlc-plugin') +pkgname=vlc pkgver=1.1.9 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=2 +pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" +arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" license=('GPL') -makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils' - 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' - 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' - 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' - 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' - 'avahi' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'libxpm' - 'xulrunner' 'pkgconfig' 'live-media' 'libnotify' 'libcdio' +depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio' + 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' + 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' + 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' + 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' + 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') +makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify' 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse') +optdepends=('avahi: for service discovery using bonjour protocol' + 'libnotify: for notification plugin' + 'ncurses: for ncurses interface support' + 'libdvdcss: for decoding encrypted DVDs' + 'lirc-utils: for lirc plugin' + 'libavc1394: for devices using the 1394ta AV/C' + 'libdc1394: for IEEE 1394 plugin' + 'kdelibs: KDE Solid hardware integration' + 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' + 'libpulse: PulseAudio support') +conflicts=('vlc-plugin') +replaces=('vlc-plugin') options=('!libtool') -source=("http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2") +install=vlc.install +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") md5sums=('06adb1848e6b87fbe1ced77ec0f91e4c') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c ./configure --prefix=/usr \ @@ -37,35 +50,12 @@ build() { --enable-lirc \ --enable-pvr \ --enable-ncurses \ - --enable-mozilla \ --with-live555-tree=/usr/lib/live \ --enable-realrtsp make } - -package_vlc() { - pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" - depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio' - 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' - 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' - 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' - 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' - 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') - optdepends=('avahi: for service discovery using bonjour protocol' - 'libnotify: for notification plugin' - 'ncurses: for ncurses interface support' - 'libdvdcss: for decoding encrypted DVDs' - 'lirc-utils: for lirc plugin' - 'libavc1394: for devices using the 1394ta AV/C' - 'libdc1394: for IEEE 1394 plugin' - 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' - 'libpulse: PulseAudio support') - options=('!libtool') - conflicts=('vlc-pulse-plugin') - replaces=('vlc-pulse-plugin') - install=vlc.install - cd "${srcdir}/${pkgbase}-${pkgver}" +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}/" install @@ -73,20 +63,4 @@ package_vlc() { install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" done - - rm -rf "${pkgdir}/usr/lib/mozilla" -} - -package_vlc-plugin() { - pkgdesc="VLC mozilla browser plugin" - depends=("${pkgbase}=${pkgver}" 'nspr' 'xulrunner' 'libxpm') - cd "${srcdir}/${pkgbase}-${pkgver}" - - #for linking against libvlc - make -C src DESTDIR="${pkgdir}" install-libLTLIBRARIES - - make -C projects/mozilla DESTDIR="${pkgdir}/" install - - #clean up libvlc - make -C src DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES } diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index 156a0941a..066ecc416 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106274 2011-01-16 13:41:19Z giovanni $ +# $Id: PKGBUILD 124014 2011-05-15 23:09:30Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat -pkgver=0.3.4 +pkgver=0.3.5 pkgrel=1 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('gnutls') makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') options=('!libtool') -source=(http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2) -md5sums=('79207fea567548462fe36397e633d287') +source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('0d2a089bfbfa550e0c65618a171fb3c4') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,11 +23,11 @@ build() { cd build cmake .. -DPREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so || return 1 + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so } package() { cd "${srcdir}/${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}/" install || return 1 + make DESTDIR="${pkgdir}/" install } diff --git a/extra/wesnoth/PKGBUILD b/extra/wesnoth/PKGBUILD index 24ba5d5c2..ec1cd77a8 100644 --- a/extra/wesnoth/PKGBUILD +++ b/extra/wesnoth/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 112017 2011-03-03 06:20:54Z eric $ +# $Id: PKGBUILD 125126 2011-05-25 17:01:35Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Jacobo Arvelo <unix4all@ya.com> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=wesnoth -pkgver=1.8.5 -pkgrel=3 +pkgver=1.8.6 +pkgrel=1 pkgdesc="A turn-based strategy game on a fantasy world" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,7 +16,7 @@ makedepends=('boost') install=wesnoth.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 wesnoth-libpng-1.4.0.patch) -md5sums=('a800285d1406690755dd0ea22b98b6df' +md5sums=('f1c3179869b01b61e253e74aeb241034' 'ca7412ffc4682ef55ddf82d56b0e2f08') build() { diff --git a/extra/wvdial/PKGBUILD b/extra/wvdial/PKGBUILD index 27c3d441e..2c756d99c 100644 --- a/extra/wvdial/PKGBUILD +++ b/extra/wvdial/PKGBUILD @@ -1,24 +1,30 @@ -# $Id: PKGBUILD 57749 2009-11-01 22:53:25Z giovanni $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 123798 2011-05-13 06:53:04Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=wvdial pkgver=1.61 -pkgrel=2 +pkgrel=3 pkgdesc="A dialer program to connect to the Internet" url="http://alumnit.ca/wiki/index.php?page=WvDial" arch=('i686' 'x86_64' 'mips64el') license=('custom') -depends=('wvstreams>=4.6.1' 'ppp') -source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +depends=('wvstreams' 'ppp' 'gcc-libs') +makedepends=('lockdev') +options=('!makeflags' '!buildflags') +source=("http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") md5sums=('acd3b2050c9b65fff2aecda6576ee7bc') build() { - unset LDFLAGS - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./configure - make || return 1 - make prefix=${pkgdir}/usr PPPDIR=${pkgdir}/etc/ppp/peers install || return 1 - install -Dm644 COPYING.LIB ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + make LOCKDEV="-llockdev" +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make prefix="${pkgdir}"/usr PPPDIR="${pkgdir}"/etc/ppp/peers install + install -Dm644 COPYING.LIB "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/xaw3d/PKGBUILD b/extra/xaw3d/PKGBUILD index 7744e668a..931513921 100644 --- a/extra/xaw3d/PKGBUILD +++ b/extra/xaw3d/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 38896 2009-05-10 18:12:17Z jgc $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 124576 2011-05-23 03:13:29Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xaw3d pkgver=1.5E -pkgrel=2 +pkgrel=3 pkgdesc="Three-D Athena widgets" arch=('i686' 'x86_64' 'mips64el') url="http://directory.fsf.org/project/xaw3d/" license=('MIT') depends=('libxmu' 'libxpm') makedepends=('imake') -options=('!makeflags' 'force') +options=('!makeflags') source=(ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-${pkgver}.tar.gz Xaw3d-1.5E-xorg-imake.patch Xaw3d-1.5-i18n.patch @@ -33,17 +32,20 @@ md5sums=('29ecfdcd6bcf47f62ecfd672d31269a1' build() { cd "${srcdir}/xc/lib/Xaw3d" - patch -Np0 -i "${srcdir}/Xaw3d-1.5E-xorg-imake.patch" || return 1 - patch -Np4 -i "${srcdir}/xaw3d.patch" || return 1 - patch -Np4 -i "${srcdir}/Xaw3d-ia64.patch" || return 1 - patch -Np4 -i "${srcdir}/Xaw3d-1.5-i18n.patch" || return 1 - patch -Np4 -i "${srcdir}/Xaw3d-1.5-box.c.patch" || return 1 - patch -Np4 -i "${srcdir}/Xaw3d-1.5-debian-fixes.patch" || return 1 - patch -Np4 -i "${srcdir}/Xaw3d-1.5E-warnings.patch" || return 1 - + patch -Np0 -i "${srcdir}/Xaw3d-1.5E-xorg-imake.patch" + patch -Np4 -i "${srcdir}/xaw3d.patch" + patch -Np4 -i "${srcdir}/Xaw3d-ia64.patch" + patch -Np4 -i "${srcdir}/Xaw3d-1.5-i18n.patch" + patch -Np4 -i "${srcdir}/Xaw3d-1.5-box.c.patch" + patch -Np4 -i "${srcdir}/Xaw3d-1.5-debian-fixes.patch" + patch -Np4 -i "${srcdir}/Xaw3d-1.5E-warnings.patch" ln -s .. X11 - xmkmf || return 1 + xmkmf make CDEBUGFLAGS="${CFLAGS} -DARROW_SCROLLBAR" - make DESTDIR="${pkgdir}" SHLIBDIR=/usr/lib INCDIR=/usr/include install || return 1 - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 +} + +package() { + cd "${srcdir}/xc/lib/Xaw3d" + make DESTDIR="${pkgdir}" SHLIBDIR=/usr/lib INCDIR=/usr/include install + install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD index 4cf84194a..c12fdbd4c 100644 --- a/extra/xfce4-settings/PKGBUILD +++ b/extra/xfce4-settings/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 112925 2011-03-07 18:53:16Z andyrtr $ +# $Id: PKGBUILD 124328 2011-05-19 16:30:23Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=xfce4-settings -pkgver=4.8.1 -pkgrel=2 +pkgver=4.8.2 +pkgrel=1 pkgdesc="Settings manager for xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -16,7 +16,7 @@ makedepends=('intltool') optdepends=('libcanberra: for sound control') source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2 xfce4-settings-4.6.0.patch) -md5sums=('0097476baadcc9bc9841d6b8e687b8eb' +md5sums=('a45420fea20f29265ab6785cb1d07377' '3046732e5d73c9939e7674602eadb1e2') build() { diff --git a/extra/xorg-iceauth/PKGBUILD b/extra/xorg-iceauth/PKGBUILD index 7489c6c08..8af9aa2b0 100644 --- a/extra/xorg-iceauth/PKGBUILD +++ b/extra/xorg-iceauth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113660 2011-03-10 14:29:50Z jgc $ +# $Id: PKGBUILD 125572 2011-05-26 20:17:22Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-iceauth -pkgver=1.0.4 -pkgrel=2 +pkgver=1.0.5 +pkgrel=1 pkgdesc="ICE authority file utility" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,12 +12,16 @@ depends=('libice') makedepends=('xorg-util-macros' 'xproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/iceauth-${pkgver}.tar.bz2) -sha1sums=('9b446c0d1815dce48bdea32db7dea7e429f6a310') +sha1sums=('d996c6ecaa93dcaccee4a11991eeacd40bddc13e') build() { cd "${srcdir}/iceauth-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/iceauth-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xorg-xauth/PKGBUILD b/extra/xorg-xauth/PKGBUILD index 26935f83f..fc3b2bb16 100644 --- a/extra/xorg-xauth/PKGBUILD +++ b/extra/xorg-xauth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113711 2011-03-10 14:51:46Z jgc $ +# $Id: PKGBUILD 125581 2011-05-26 20:38:49Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xauth -pkgver=1.0.5 -pkgrel=2 +pkgver=1.0.6 +pkgrel=1 pkgdesc="X.Org authorization settings program" arch=(i686 x86_64 'mips64el') license=('custom') @@ -12,12 +12,16 @@ depends=('libxmu') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(${url}/releases/individual/app/xauth-${pkgver}.tar.bz2) -sha1sums=('6d94b5822e8ce08630a8ff510230246d5ed45290') +sha1sums=('10a68367ecc60a641b9aa89e6f24f7ca71f23874') build() { cd "${srcdir}/xauth-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xauth-${pkgver}" make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xscreensaver/ChangeLog b/extra/xscreensaver/ChangeLog deleted file mode 100644 index ea08818fc..000000000 --- a/extra/xscreensaver/ChangeLog +++ /dev/null @@ -1,46 +0,0 @@ -2010-09-26 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.12-1 - * Upstream update - * Added libxxf86vm depends - -2010-05-17 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.11-1 - * Upstream update - -2009-10-17 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.10-2 - * Added support for electricsheep (close FS#16400) - -2009-09-09 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.10-1 - * Upstream update - -2009-09-03 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.09-1 - * Upstream update - -2009-01-02 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.08-1 - * Upstream update - -2008-08-11 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.07-1 - * Upstream update - -2008-07-18 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.06-1 - * Upstream update - -2008-03-02 Eric Belanger <eric@archlinux.org> - - * xscreensaver 5.05-1 - * Upstream update - * FHS man pages diff --git a/extra/xscreensaver/PKGBUILD b/extra/xscreensaver/PKGBUILD index 65db6d384..ff9f3e5a4 100644 --- a/extra/xscreensaver/PKGBUILD +++ b/extra/xscreensaver/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 123881 2011-05-14 00:52:40Z eric $ +# $Id: PKGBUILD 124565 2011-05-22 23:54:17Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xscreensaver -pkgver=5.13 +pkgver=5.14 pkgrel=1 pkgdesc="Screen saver and locker for the X Window System" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,11 @@ makedepends=('bc') backup=('etc/pam.d/xscreensaver') source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \ add-electricsheep.diff xscreensaver.pam LICENSE) -md5sums=('a1a55b763e17c5c83a2b7cb5ddf23560' +md5sums=('7777f2a50d6797f9757b6e078a7bea83' 'f82524626ed8a6832cd279e0548a9b46' '367a3538f54db71f108b34cfa31088ac' '5e7f3f2a63d20a484742f5b4cb5d572c') -sha1sums=('3bdac6122e5b7b0cffcc90b3b75dc7fa001c0181' +sha1sums=('bfa37a9e7b2e93f54922191bb93dbc70c2f73772' '65c2933380267475f2c4560bc22f4350393b00ce' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' '4209ea586b204fd1d81c382a0522c654f9fd9134') diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD index c68a296b4..07c965bff 100644 --- a/extra/yelp/PKGBUILD +++ b/extra/yelp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120703 2011-04-26 05:18:34Z jgc $ +# $Id: PKGBUILD 124709 2011-05-24 06:57:26Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=yelp -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ options=('!emptydirs' '!libtool') url="http://www.gnome.org" install=yelp.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('6de6c45439b21a3042236d5d836de9dd44d59c2d4c324982c316b4b6834ce0a4') +sha256sums=('938b50b63f2783d8f87ce2e6ebb622dcfc7cb2d81b39278d1298c5f3bdf236b9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD index be5bad18b..140fc2755 100644 --- a/extra/ypbind-mt/PKGBUILD +++ b/extra/ypbind-mt/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 91694 2010-09-27 17:40:26Z bisson $ -# Maintainer: judd <jvinet@zeroflux.org> +# $Id: PKGBUILD 123631 2011-05-11 23:05:30Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ypbind-mt -pkgver=1.32 +pkgver=1.33 pkgrel=1 pkgdesc='Linux NIS daemon' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +15,7 @@ backup=('etc/yp.conf' 'etc/conf.d/ypbind') source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz" 'ypbind.conf' 'ypbind') -sha1sums=('136d1cb1499d32d01f7efa216352911980a7dda8' +sha1sums=('49f578d15aa5d4f4130a2e96cd9c0e519263fc88' '07dee386d001fb9e9e6b76dda8af5b2092e5a4a2' '66f6ea2f622e0724e6017bf835d4f7f4a5bf9534') diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD index f3dd919f7..013eb774c 100644 --- a/extra/ypserv/PKGBUILD +++ b/extra/ypserv/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 91699 2010-09-27 17:41:23Z bisson $ +# $Id: PKGBUILD 123628 2011-05-11 23:04:51Z bisson $ # Maintainer: judd <jvinet@zeroflux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ypserv -pkgver=2.24 +pkgver=2.25 pkgrel=1 pkgdesc='Linux NIS Server' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets') source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz" \ 'yppasswd' 'ypserv') -sha1sums=('3ae53fe5e047b3bf6a1e407424311ec6e806a95d' +sha1sums=('ab997022d25b6374ae21d39f7ff564be028d8736' '96192b628afe36709496e4801d016c4bff343f0e' 'b625381bfa6cf62345377a7df30b8f45935206c5') diff --git a/extra/zile/PKGBUILD b/extra/zile/PKGBUILD index f4f07366d..5a8334b7a 100644 --- a/extra/zile/PKGBUILD +++ b/extra/zile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 104088 2010-12-28 17:55:43Z kevin $ +# $Id: PKGBUILD 125598 2011-05-26 20:47:05Z kevin $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=zile -pkgver=2.3.21 +pkgver=2.3.24 pkgrel=1 pkgdesc="A small, fast, and powerful Emacs clone" arch=(i686 x86_64 'mips64el') @@ -13,12 +13,16 @@ makedepends=('help2man') depends=('ncurses') license=('GPL') source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('4bac1dc5d7e6fb5c13bd6677bca34b11') +md5sums=('fe77d801ba69e0fb9b4914a04b9ff506') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } -md5sums=('ec2834a42789477c55e7d44bc9438de1') + |
