diff options
Diffstat (limited to 'extra')
27 files changed, 374 insertions, 120 deletions
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index b6e815c5e..918a84d27 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151749 2012-03-02 07:36:36Z tpowa $ +# $Id: PKGBUILD 157726 2012-04-29 04:09:24Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils pkgver=1.0.25 -pkgrel=2 +pkgrel=3 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" @@ -20,7 +20,9 @@ backup=(etc/conf.d/alsa) build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-alsaconf --with-systemdsystemunitdir=/lib/systemd/system + ./configure --prefix=/usr --disable-alsaconf \ + --with-udev-rules-dir=/usr/lib/udev/rules.d \ + --with-systemdsystemunitdir=/usr/lib/systemd/system make } @@ -30,6 +32,7 @@ package() { install -D -m755 ../alsa ${pkgdir}/etc/rc.d/alsa install -D -m644 ../alsa.conf.d ${pkgdir}/etc/conf.d/alsa install -D -m755 ../90alsa ${pkgdir}/etc/pm/sleep.d/90alsa + # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD index d0cf8b899..d26d78b21 100644 --- a/extra/bluedevil/PKGBUILD +++ b/extra/bluedevil/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 140234 2011-10-10 10:51:49Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 157804 2012-04-29 17:06:36Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=bluedevil -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 pkgdesc='KDE bluetooth framework' arch=('i686' 'x86_64') @@ -13,7 +12,7 @@ depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f1b2b932f3e1e52b13b0bad515bf4125') +md5sums=('e792576d34956d27cd0c3eb3c81a5923') build(){ cd "${srcdir}" diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 35a6d3036..50bb1b6b2 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156730 2012-04-23 09:04:12Z ibiru $ +# $Id: PKGBUILD 157728 2012-04-29 04:45:00Z allan $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord pkgver=0.1.19 -pkgrel=1 +pkgrel=2 pkgdesc="Color daemon" arch=('i686' 'x86_64') url="http://www.freedesktop.org/software/colord" @@ -17,6 +17,10 @@ sha1sums=('d133c6320fcdd069be86f4a7afa723f48f99acb3') build() { cd "$pkgname-$pkgver" + + # put udev files in /usr/lib + sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure + ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/colord \ --localstatedir=/var --disable-static \ diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 76f899f0c..ed2ec4c1e 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155881 2012-04-08 20:56:39Z dreisner $ +# $Id: PKGBUILD 157810 2012-04-30 00:00:31Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=dnsmasq -pkgver=2.60 -pkgrel=3 +pkgver=2.61 +pkgrel=1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" 'dnsmasq.confd' 'rc.dnsmasq' 'dnsmasq.service') -md5sums=('5a09908e02724d759ac60d9cafd27de8' +md5sums=('6ed0a5c2524dfc3a74ef494ee2469f09' '66479e99123faeab83ebaed709ef95b5' '819fbdf6440d710616e6df5f8ca9cdba' '631d8349acbed1b01d4e11d9f42fdb7d') diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD index f82f5959a..c16e6d78d 100644 --- a/extra/fuse/PKGBUILD +++ b/extra/fuse/PKGBUILD @@ -1,63 +1,51 @@ -# $Id: PKGBUILD 149637 2012-02-08 21:50:56Z ronald $ +# $Id: PKGBUILD 157796 2012-04-29 15:29:44Z dreisner $ # Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Mark Rosenstand <mark@archlinux.org> pkgname=fuse -pkgver=2.8.7 +pkgver=2.9.0 pkgrel=1 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64') url="http://fuse.sourceforge.net/" -license="GPL2" +license=('GPL2') depends=('glibc') makedepends=('pkg-config') backup=(etc/fuse.conf) -install=fuse.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 'fuse.conf') options=(!libtool) -sha1sums=('284f22401131ec148bd04362dc86f7b0e94fb5f4' +sha1sums=('e64396d516cca55995e0a8f8dd75456fd9d9d21d' '3b42e37a741d4651099225987dc40e7f02a716ad') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$pkgname-$pkgver" # fix building with glibc-2.14 sed -i '1i#define _GNU_SOURCE' util/fusermount.c - ./configure --prefix=/usr --enable-lib \ + ./configure --prefix=/usr --libdir=/usr/lib --enable-lib \ --enable-util --bindir=/bin make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$pkgname-$pkgver" make DESTDIR=${pkgdir} install - # static device nodes will cause collision. - rm -rf ${pkgdir}/dev - # Remove init script in wrong path # Don't add our own for now, as fusectl fs oopses on 2.6.18 rm -rf ${pkgdir}/etc/init.d #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse - install -d ${pkgdir}/lib - mv ${pkgdir}/usr/lib/libfuse.so.${pkgver} ${pkgdir}/lib/ - ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver} - ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2 - mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/ - ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 - ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1 - # install sample config file install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf - # Fix udev rule location - install -d -m755 "${pkgdir}/lib" - mv "${pkgdir}/etc/udev" "${pkgdir}/lib/" + # remove udev rules (is in the udev package} + rm -rf ${pkgdir}/etc/udev - # remove udev rules (should already be in udev package} - rm -f ${pkgdir}/lib/udev/rules.d/99-fuse.rules + # static device nodes are handled by udev + rm -rf ${pkgdir}/dev } diff --git a/extra/gnome-phone-manager/PKGBUILD b/extra/gnome-phone-manager/PKGBUILD index 4bce16951..a9e098140 100644 --- a/extra/gnome-phone-manager/PKGBUILD +++ b/extra/gnome-phone-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140561 2011-10-17 08:06:31Z heftig $ +# $Id: PKGBUILD 157740 2012-04-29 05:35:15Z eric $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-phone-manager pkgver=0.68 -pkgrel=1 +pkgrel=2 pkgdesc="Control your mobile phone from your GNOME desktop." arch=('i686' 'x86_64') url="http://live.gnome.org/PhoneManager" @@ -12,13 +12,17 @@ depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' ' makedepends=('intltool' 'gnome-common') options=('!emptydirs' '!libtool') install=gnome-phone-manager.install -source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/${pkgver}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('3777b62ee36492274532ece965f4688600457014f17a6f21dd01fb63bbb77f8f') +source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/${pkgver}/${pkgname}-${pkgver}.tar.xz + phonemgr-gnome-bluetooth-3.3.patch) +sha256sums=('3777b62ee36492274532ece965f4688600457014f17a6f21dd01fb63bbb77f8f' + 'a69c1d2d1d25eca4f32215d8a8ca3c8e4a048af76d7a291b86b0aa7f0f65c452') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static + patch -p1 -i ../phonemgr-gnome-bluetooth-3.3.patch + autoreconf -fi + LIBS+="-lgthread-2.0" ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static make } @@ -27,6 +31,6 @@ package() { make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-phone-manager ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-phone-manager "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch b/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch new file mode 100644 index 000000000..2200f9dcf --- /dev/null +++ b/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch @@ -0,0 +1,34 @@ +From 2877c3a41b7e8feeb6eb6d6f718f4556ffb0161c Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger <dimstar@opensuse.org> +Date: Mon, 05 Dec 2011 08:10:59 +0000 +Subject: Bug 665309: Adapt to gnome-bluetooth 3.3 API + +--- +diff --git a/configure.in b/configure.in +index 101a77f..d0a7651 100644 +--- a/configure.in ++++ b/configure.in +@@ -13,7 +13,7 @@ dnl Initialize libtool + AM_PROG_LIBTOOL + + GNOKII_REQS="gnokii >= 0.6.28" +-GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.0" ++GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.3" + + AC_PROG_CC + AC_PROG_INSTALL +diff --git a/gnome-bluetooth/phonemgr.c b/gnome-bluetooth/phonemgr.c +index 9ebac12..fecc367 100644 +--- a/gnome-bluetooth/phonemgr.c ++++ b/gnome-bluetooth/phonemgr.c +@@ -44,7 +44,7 @@ get_type (const char *address) + gboolean cont; + + client = bluetooth_client_new (); +- model = bluetooth_client_get_device_model (client, NULL); ++ model = bluetooth_client_get_device_model (client); + if (model == NULL) { + g_object_unref (client); + return type; +-- +cgit v0.9.0.2 diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD index 0da149312..751500159 100644 --- a/extra/jack/PKGBUILD +++ b/extra/jack/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145264 2011-12-20 18:09:32Z schiv $ +# $Id: PKGBUILD 157734 2012-04-29 05:10:29Z allan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: tobias <tobias@archlinux.net> # Contributor: Robert Emil Berge <robert@rebi.no> @@ -6,7 +6,7 @@ pkgname=jack _longname=jack-audio-connection-kit pkgver=0.121.3 -pkgrel=5 +pkgrel=6 pkgdesc="A low-latency audio server" arch=('i686' 'x86_64') license=('GPL' 'LGPL') @@ -47,7 +47,7 @@ package() { "$pkgdir/etc/security/limits.d/99-audio.conf" install -Dm644 "$srcdir/40-hpet-permissions.rules" \ - "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" # install a missing header forgotten by upstream # see https://bugs.archlinux.org/task/26865 diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD index 760cd2510..93357f5db 100644 --- a/extra/libbluedevil/PKGBUILD +++ b/extra/libbluedevil/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 140236 2011-10-10 10:55:52Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 157802 2012-04-29 17:04:04Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libbluedevil -pkgver=1.9.1 +pkgver=1.9.2 pkgrel=1 pkgdesc='A Qt wrapper for bluez used in the new KDE bluetooth stack' arch=('i686' 'x86_64') @@ -12,7 +11,7 @@ license=('GPL') depends=('qt' 'bluez') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b3f04954f75f78c874cdb462c2454afc') +md5sums=('b492db1825b239e5185c543badb21c26') build(){ cd "${srcdir}" diff --git a/extra/libbluray/PKGBUILD b/extra/libbluray/PKGBUILD index cad6d04c5..083cc1a4d 100644 --- a/extra/libbluray/PKGBUILD +++ b/extra/libbluray/PKGBUILD @@ -1,28 +1,37 @@ -# $Id: PKGBUILD 144944 2011-12-11 14:37:09Z ibiru $ +# $Id: PKGBUILD 157790 2012-04-29 15:02:33Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrew Cook <ariscop@gmail.com> pkgname=libbluray -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="Library to access Blu-Ray disks for video playback" arch=('i686' 'x86_64') url="http://www.videolan.org/developers/libbluray.html" license=('LGPL2.1') depends=('libxml2') +makedepends=('apache-ant' 'jdk7-openjdk') +optdepends=('java-environment: Blu-ray Disc Java support library') options=(!libtool) source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -sha512sums=('b938ca838d6e4ceaac74ca8850efb9d8c312638b70a9b42ebffd63bf703341eab3ce98b6edeea9b3284ba1d0f8b46fe803db1f668e72752e1e23e96435ac77dc') +sha512sums=('a27eaa929ef05c544beb966a24dfc5425546d6035bfb3e86dc60987b8a4761031ce27c3836a64f71cc76b5308c3cd75efb3bc1f238185819385477e64883888a') build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --disable-static + cd "$pkgname-$pkgver" + + . /etc/profile.d/jdk.sh + ./configure --prefix=/usr \ + --enable-bdjava \ + --with-jdk=${JAVA_HOME} \ + --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + #install bdj + install -Dm644 src/.libs/libbluray.jar "$pkgdir/usr/share/java/libbluray.jar" } # vim:set ts=2 sw=2 et: diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD index 92f2b3084..ef3168dee 100644 --- a/extra/libcanberra/PKGBUILD +++ b/extra/libcanberra/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139194 2011-10-01 13:46:12Z heftig $ +# $Id: PKGBUILD 157775 2012-04-29 10:03:21Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libcanberra pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) pkgver=0.28 -pkgrel=2 +pkgrel=3 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" arch=(i686 x86_64) license=('LGPL') @@ -22,7 +22,7 @@ build() { ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ --disable-static --with-builtin=dso --enable-null --disable-oss \ --enable-alsa --enable-gstreamer --enable-pulse \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=/usr/lib/systemd/system make } diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD index 580f63adc..772ebec46 100644 --- a/extra/libffado/PKGBUILD +++ b/extra/libffado/PKGBUILD @@ -1,29 +1,34 @@ -# $Id: PKGBUILD 142989 2011-11-19 21:35:53Z schiv $ +# $Id: PKGBUILD 157813 2012-04-30 03:19:10Z heftig $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: galiyosha@gmail.com # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> pkgname=libffado pkgver=2.0.1 -pkgrel=5 +pkgrel=7 pkgdesc="Driver for FireWire audio devices" arch=('i686' 'x86_64') url="http://www.ffado.org/" license=('GPL') depends=('libiec61883' 'libavc1394' 'libsigc++' - 'libxml++' 'alsa-lib' 'dbus') -makedepends=('scons' 'python2-qt') + 'libxml++' 'alsa-lib' 'dbus') +makedepends=('scons' 'python2-pyqt') optdepends=('python2: ffado-diag' - 'python2-qt: mixer applet') + 'python2-pyqt: mixer applet') provides=('ffado') source=("http://www.ffado.org/files/$pkgname-$pkgver.tar.gz" - '60-ffado.rules') + "libffado-gcc47.patch" "fix-segfault-on-close.patch" '60-ffado.rules') md5sums=('786f31facd417e6207e429f50af0e15e' + '287bb3f506e31626c4b8f91f0e1d9407' + 'ac9763cb2dc2f3eb4e1894e30645c6f1' 'f03a3e950801c4405b8934084651bca8') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i "$srcdir"/libffado-gcc47.patch + patch -p3 -i "$srcdir"/fix-segfault-on-close.patch + # hack to use CFLAGS without optimising sed -i 's/-O2//g' SConstruct @@ -38,7 +43,7 @@ build() { sed -i 's:python support/tools:python2 support/tools:' \ support/tools/SConscript - scons PREFIX=/usr #ENABLE_OPTIMIZATIONS=True + scons PREFIX=/usr } package() { @@ -49,7 +54,7 @@ package() { # add audio device rules # see https://bugs.archlinux.org/task/26342 install -Dm644 "$srcdir/60-ffado.rules" \ - "$pkgdir/lib/udev/rules.d/60-ffado.rules" + "$pkgdir/usr/lib/udev/rules.d/60-ffado.rules" # python2 fix for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do @@ -61,7 +66,7 @@ package() { "$pkgdir/usr/share/applications/ffadomixer.desktop" install -Dm644 support/xdg/hi64-apps-ffado.png \ - "$pkgdir/usr/share/pixmaps/$pkgname.png" + "$pkgdir/usr/share/pixmaps/$pkgname.png" } # vim:set ts=2 sw=2 et: diff --git a/extra/libffado/fix-segfault-on-close.patch b/extra/libffado/fix-segfault-on-close.patch new file mode 100644 index 000000000..c81b97e40 --- /dev/null +++ b/extra/libffado/fix-segfault-on-close.patch @@ -0,0 +1,64 @@ +Index: /trunk/libffado/src/debugmodule/debugmodule.h
+===================================================================
+--- /trunk/libffado/src/debugmodule/debugmodule.h (revision 1763)
++++ /trunk/libffado/src/debugmodule/debugmodule.h (revision 1999)
+@@ -283,6 +283,10 @@
+ void hexDumpQuadlets( quadlet_t *data_start, unsigned int length );
+
++class DebugModuleManager;
++
+ class DebugModule {
+ public:
++ friend class DebugModuleManager;
++
+ enum {
+ eDL_Message = DEBUG_LEVEL_MESSAGE,
+@@ -333,4 +337,5 @@
+ std::string m_name;
+ debug_level_t m_level;
++ DebugModuleManager* m_manager;
+ };
+
+Index: /trunk/libffado/src/debugmodule/debugmodule.cpp
+===================================================================
+--- /trunk/libffado/src/debugmodule/debugmodule.cpp (revision 1763)
++++ /trunk/libffado/src/debugmodule/debugmodule.cpp (revision 1999)
+@@ -84,5 +84,6 @@
+ // << endl;
+ // }
+- if ( !DebugModuleManager::instance()->unregisterModule( *this ) ) {
++
++ if (m_manager && !m_manager->unregisterModule( *this ) ) {
+ cerr << "Could not unregister DebugModule at DebugModuleManager"
+ << endl;
+@@ -263,12 +264,9 @@
+ DebugModuleManager::~DebugModuleManager()
+ {
+- // cleanin up leftover modules
+- for ( DebugModuleVectorIterator it = m_debugModules.begin();
+- it != m_debugModules.end();
+- ++it )
++ // cleaning up leftover modules
++ while (!m_debugModules.empty())
+ {
+- fprintf(stderr,"Cleaning up leftover debug module: %s\n",(*it)->getName().c_str());
+- m_debugModules.erase( it );
+- delete *it;
++ DebugModule *mod = m_debugModules.back();
++ unregisterModule(*mod);
+ }
+
+@@ -455,4 +453,6 @@
+ } else {
+ m_debugModules.push_back( &debugModule );
++ if (debugModule.m_manager == NULL)
++ debugModule.m_manager = this;
+ }
+ return true;
+@@ -469,4 +469,6 @@
+ if ( *it == &debugModule ) {
+ m_debugModules.erase( it );
++ if (debugModule.m_manager == this)
++ debugModule.m_manager = NULL;
+ return true;
+ }
diff --git a/extra/libffado/libffado-gcc47.patch b/extra/libffado/libffado-gcc47.patch new file mode 100644 index 000000000..f296956a5 --- /dev/null +++ b/extra/libffado/libffado-gcc47.patch @@ -0,0 +1,55 @@ +diff -Naur libffado-2.0.1-old/src/bebob/bebob_dl_mgr.cpp libffado-2.0.1/src/bebob/bebob_dl_mgr.cpp +--- libffado-2.0.1-old/src/bebob/bebob_dl_mgr.cpp 2009-05-17 23:42:38.000000000 +1000 ++++ libffado-2.0.1/src/bebob/bebob_dl_mgr.cpp 2012-04-29 15:26:29.011454798 +1000 +@@ -35,6 +35,7 @@ + + #include <cstdio> + #include <cstring> ++#include <unistd.h> + + namespace BeBoB { + enum { +diff -Naur libffado-2.0.1-old/src/ffadodevice.cpp libffado-2.0.1/src/ffadodevice.cpp +--- libffado-2.0.1-old/src/ffadodevice.cpp 2008-11-23 21:25:32.000000000 +1000 ++++ libffado-2.0.1/src/ffadodevice.cpp 2012-04-29 15:26:54.883998052 +1000 +@@ -34,6 +34,7 @@ + + #include <iostream> + #include <sstream> ++#include <unistd.h> + + #include <assert.h> + +diff -Naur libffado-2.0.1-old/src/fireworks/fireworks_device.cpp libffado-2.0.1/src/fireworks/fireworks_device.cpp +--- libffado-2.0.1-old/src/fireworks/fireworks_device.cpp 2009-11-23 00:40:08.000000000 +1000 ++++ libffado-2.0.1/src/fireworks/fireworks_device.cpp 2012-04-29 15:27:24.123105334 +1000 +@@ -44,6 +44,7 @@ + #define FIREWORKS_MIN_FIRMWARE_VERSION 0x04080000 + + #include <sstream> ++#include <unistd.h> + using namespace std; + + // FireWorks is the platform used and developed by ECHO AUDIO +diff -Naur libffado-2.0.1-old/src/libieee1394/IsoHandlerManager.cpp libffado-2.0.1/src/libieee1394/IsoHandlerManager.cpp +--- libffado-2.0.1-old/src/libieee1394/IsoHandlerManager.cpp 2010-04-18 05:15:54.000000000 +1000 ++++ libffado-2.0.1/src/libieee1394/IsoHandlerManager.cpp 2012-04-29 15:27:44.515816147 +1000 +@@ -34,6 +34,7 @@ + #include "libutil/Configuration.h" + + #include <cstring> ++#include <unistd.h> + #include <assert.h> + + IMPL_DEBUG_MODULE( IsoHandlerManager, IsoHandlerManager, DEBUG_LEVEL_NORMAL ); +diff -Naur libffado-2.0.1-old/support/dbus/test-dbus.cpp libffado-2.0.1/support/dbus/test-dbus.cpp +--- libffado-2.0.1-old/support/dbus/test-dbus.cpp 2008-04-27 03:30:41.000000000 +1000 ++++ libffado-2.0.1/support/dbus/test-dbus.cpp 2012-04-29 15:28:31.531047923 +1000 +@@ -24,6 +24,7 @@ + #include <argp.h> + #include <stdlib.h> + #include <iostream> ++#include <unistd.h> + #include <signal.h> + + #include "controlclient.h" diff --git a/extra/libva-driver-intel/PKGBUILD b/extra/libva-driver-intel/PKGBUILD index 371c319db..55f0d3237 100644 --- a/extra/libva-driver-intel/PKGBUILD +++ b/extra/libva-driver-intel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141738 2011-11-02 16:42:28Z ibiru $ +# $Id: PKGBUILD 157792 2012-04-29 15:12:31Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=libva-driver-intel -pkgver=1.0.15 +pkgver=1.0.17 pkgrel=1 pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family." arch=('i686' 'x86_64') @@ -11,19 +11,19 @@ license=('MIT') depends=('libva') options=('!libtool') source=(http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-${pkgver}.tar.bz2) -md5sums=('9dbd642f18993335146480a3a2987874') +md5sums=('3421dcaed1df346b9070b85ec8b238cd') build() { - cd ${srcdir}/intel-driver-${pkgver} + cd intel-driver-$pkgver ./autogen.sh ./configure --prefix=/usr make } package() { - cd ${srcdir}/intel-driver-${pkgver} - make DESTDIR="${pkgdir}" install - install -m644 -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + cd intel-driver-$pkgver + make DESTDIR="$pkgdir" install + install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } # vim:set ts=2 sw=2 et: diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 85ad485e0..73c9628c4 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157227 2012-04-26 08:49:24Z giovanni $ +# $Id: PKGBUILD 157806 2012-04-29 18:29:57Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.04.26 +pkgver=2012.04.27 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('4c7202e0611951998325b0e41ae63041') +md5sums=('463acc2cab4640544d120af933fde9f1') build() { cd ${srcdir}/live diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD index 052e071a7..ec76e7e3a 100644 --- a/extra/modemmanager/PKGBUILD +++ b/extra/modemmanager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153526 2012-03-15 14:49:43Z ibiru $ +# $Id: PKGBUILD 157746 2012-04-29 05:53:55Z allan $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=modemmanager _realname=ModemManager pkgver=0.5.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mobile broadband modem management service" arch=('i686' 'x86_64') url="http://cgit.freedesktop.org/ModemManager/ModemManager/" @@ -20,6 +20,7 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --with-udev-base-dir=/usr/lib/udev \ --disable-static make } diff --git a/extra/ossp/PKGBUILD b/extra/ossp/PKGBUILD index 587ac1415..5a29e8eb7 100644 --- a/extra/ossp/PKGBUILD +++ b/extra/ossp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149814 2012-02-11 04:06:47Z heftig $ +# $Id: PKGBUILD 157748 2012-04-29 05:59:42Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jonathan Liu <net147@gmail.com> pkgname=ossp pkgver=1.3.2 -pkgrel=13 +pkgrel=14 pkgdesc="Emulate OSS device using CUSE" arch=(i686 x86_64) url="http://sourceforge.net/projects/osspd" @@ -31,11 +31,11 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" prefix=/usr UDEVDIR=/lib/udev/rules.d install + make DESTDIR="$pkgdir" prefix=/usr UDEVDIR=/usr/lib/udev/rules.d install # Make compatible with udev ACLs sed -e 's/GROUP="audio"/SUBSYSTEM=="cuse", MODE="0666"/' \ - -i "$pkgdir/lib/udev/rules.d/98-osscuse.rules" + -i "$pkgdir/usr/lib/udev/rules.d/98-osscuse.rules" install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" @@ -44,6 +44,6 @@ package() { install -Dm644 "$srcdir/osspd.conf.d" "$pkgdir/etc/conf.d/osspd" # systemd - install -Dm644 "$srcdir/osspd.service" "$pkgdir/lib/systemd/system/osspd.service" + install -Dm644 "$srcdir/osspd.service" "$pkgdir/usr/lib/systemd/system/osspd.service" install -Dm644 "$srcdir/osspd.modules-load" "$pkgdir/usr/lib/modules-load.d/osspd.conf" } diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index fbfb18060..c752ca0f9 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157462 2012-04-28 17:12:24Z heftig $ +# $Id: PKGBUILD 157751 2012-04-29 06:33:27Z allan $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -8,7 +8,7 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=1.1 -pkgrel=3 +pkgrel=4 arch=(i686 x86_64) url="http://pulseaudio.org/" license=(GPL LGPL) @@ -28,6 +28,7 @@ build() { --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ + --with-udev-rules-dir=/usr/lib/udev/rules.d \ --with-database=tdb \ --disable-hal \ --disable-tcpwrap \ diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD new file mode 100644 index 000000000..02731754c --- /dev/null +++ b/extra/python2/PKGBUILD @@ -0,0 +1,84 @@ +# $Id: PKGBUILD 157413 2012-04-28 09:27:14Z allan $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributer: Allan McRae <allan@archlinux.org> +# Contributer: Jason Chu <jason@archlinux.org> + +pkgname=python2 +pkgver=2.7.3 +pkgrel=2 +_pybasever=2.7 +pkgdesc="A high-level scripting language" +arch=('i686' 'x86_64') +license=('PSF') +url="http://www.python.org/" +depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi') +makedepends=('tk') +optdepends=('tk: for IDLE') +conflicts=('python<3') +options=('!makeflags') +source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) +sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357') + +build() { + cd "${srcdir}/Python-${pkgver}" + + # Temporary workaround for FS#22322 + # See http://bugs.python.org/issue10835 for upstream report + sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c + + # Enable built-in SQLite module to load extensions (fix FS#22122) + sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py + + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py + + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), + # rather than copies shipped in the tarball + rm -r Modules/expat + rm -r Modules/zlib + rm -r Modules/_ctypes/{darwin,libffi}* + + export OPT="${CFLAGS}" + ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \ + --enable-unicode=ucs4 --with-system-expat --with-system-ffi \ + --with-dbmliborder=gdbm:ndbm + + make +} + +package() { + cd "${srcdir}/Python-${pkgver}" + make DESTDIR="${pkgdir}" altinstall maninstall + + ln -sf python${_pybasever} "${pkgdir}/usr/bin/python2" + ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config" + ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python2.1" + + ln -sf ../../libpython${_pybasever}.so \ + "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so" + + mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/" + + # some useful "stuff" + install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts} + install -m755 Tools/i18n/{msgfmt,pygettext}.py \ + "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/" + install -m755 Tools/scripts/{README,*py} \ + "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/" + + # fix conflicts with python + mv "${pkgdir}"/usr/bin/idle{,2} + mv "${pkgdir}"/usr/bin/pydoc{,2} + mv "${pkgdir}"/usr/bin/2to3{,-2.7} + + # clean up #!s + find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \ + xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" + + # clean-up reference to build directory + sed -i "s#${srcdir}/Python-${pkgver}:##" \ + "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile" + + # license + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD index c240df1e1..7ab0d162c 100644 --- a/extra/rtkit/PKGBUILD +++ b/extra/rtkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149435 2012-02-07 17:06:43Z heftig $ +# $Id: PKGBUILD 157777 2012-04-29 10:12:33Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=rtkit pkgver=0.10 -pkgrel=3 +pkgrel=4 pkgdesc="Realtime Policy and Watchdog Daemon" arch=('i686' 'x86_64') url="http://git.0pointer.de/?p=rtkit.git" @@ -21,7 +21,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=/usr/lib/systemd/system make } diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index 89fb54c23..f42a0ee01 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152194 2012-03-05 07:53:46Z tpowa $ +# $Id: PKGBUILD 157761 2012-04-29 06:49:21Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,7 +6,7 @@ pkgname=sane pkgver=1.0.22 -pkgrel=7 +pkgrel=8 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64') @@ -48,14 +48,14 @@ package () { echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf" # install udev files install -D -m0644 tools/udev/libsane.rules \ - "${pkgdir}/lib/udev/rules.d/53-sane.rules" + "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules" # fix udev rules - sed -i 's|NAME="%k", ||g' "${pkgdir}/lib/udev/rules.d/53-sane.rules" + sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules" # install xinetd file install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane" # Install the pkg-config file install -D -m644 tools/sane-backends.pc \ - "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc " + "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc" } diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index fca464709..d60ca334f 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156513 2012-04-20 01:11:09Z bisson $ +# $Id: PKGBUILD 157786 2012-04-29 11:52:40Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim -pkgver=1.4.12 +pkgver=1.4.13 pkgrel=1 pkgdesc='Input method user interface and development platform' url='http://www.scim-im.org/projects/scim' @@ -14,22 +14,15 @@ arch=('i686' 'x86_64') makedepends=('intltool') depends=('libltdl' 'gtk2') backup=('etc/scim/config' 'etc/scim/global') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'ftp://ftp.archlinux.org/other/scim/scim-docs-20120420.tar.xz') -sha1sums=('948180ec0af18e435a95edbdb840cf41f3b24d32' - 'b2cccb43673e1760abf6825768bc4354a981a0ad') - -# Docs tarball temporarily generated with: -# svn co https://scim.svn.sourceforge.net/svnroot/scim/scim/trunk/docs docs +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('dafe08bbdd3faa0324800cb63e44926d71be2e47') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - mv ../docs . - ./bootstrap - sed 's/\$nls_cv_use_gnu_gettext/yes/' -i configure + export CXXFLAGS+=' -fpermissive' # so configure detects gettext with gcc-4.7 ./configure \ --prefix=/usr \ diff --git a/extra/scim/install b/extra/scim/install index c05312bfd..ae6ea9d56 100644 --- a/extra/scim/install +++ b/extra/scim/install @@ -1,5 +1,7 @@ post_install() { - /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + [[ -x usr/bin/gtk-query-immodules-2.0 ]] && usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + [[ -x usr/bin/gtk-query-immodules-3.0 ]] && usr/bin/gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules + true } post_upgrade() { diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index a82a303bb..73ec9cdda 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144364 2011-12-05 10:53:50Z ibiru $ +# $Id: PKGBUILD 157763 2012-04-29 07:02:42Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower pkgver=0.9.15 -pkgrel=1 +pkgrel=3 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" @@ -16,6 +16,10 @@ sha256sums=('d5941480f32dcee47401b3f650485c71f70e7eb0d92537bf4b62410248a6238c') build() { cd "$srcdir/$pkgname-$pkgver" + + # put udev files in /usr/lib + sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/upower --disable-static make diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index cfce9bffb..a429579a1 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156508 2012-04-20 01:03:19Z tdziedzic $ +# $Id: PKGBUILD 157798 2012-04-29 16:19:15Z tdziedzic $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -10,7 +10,7 @@ _patchlevel=495 __hgrev=a104dae7f903 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('custom:vim') url="http://www.vim.org" @@ -53,7 +53,7 @@ mksource() { build() { # remove -O2 because there is a crash with python because of it - export CFLAGS="-march=x86-64 -mtune=generic -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" + export CFLAGS="${CFLAGS/-O2 /}" cd "${srcdir}" diff --git a/extra/yasm/PKGBUILD b/extra/yasm/PKGBUILD index 0affd661c..d1096c2ff 100644 --- a/extra/yasm/PKGBUILD +++ b/extra/yasm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142979 2011-11-19 15:19:43Z roman $ +# $Id: PKGBUILD 157779 2012-04-29 10:55:02Z allan $ # Maintainer: Роман Кирилич (Roman Kyrylych) <roman@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=yasm pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)" arch=('i686' 'x86_64') license=('custom') @@ -21,6 +21,11 @@ build() { make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install |