Fri Apr 27 00:01:30 UTC 2012

11 files changed, 134 insertions, 28 deletions

diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 6088c88ad..5600a7a8b 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156521 2012-04-20 06:48:44Z andrea $
+# $Id: PKGBUILD 157165 2012-04-25 06:58:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
 pkgver=2.8.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/"
@@ -13,12 +13,17 @@ depends=('curl' 'libarchive' 'shared-mime-info')
 makedepends=('qt')
 optdepends=('qt: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ba74b22c788a0c8547976b880cd02b17')
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
+        'fix-pkg-config.patch')
+md5sums=('ba74b22c788a0c8547976b880cd02b17'
+         '32c6a4360a2ba12dc77b6a840fa7672b')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
+  # FS#29545
+  patch -p1 -i "${srcdir}"/fix-pkg-config.patch
+
   ./bootstrap --prefix=/usr \
     --mandir=/share/man \
     --docdir=/share/doc/cmake \
diff --git a/extra/cmake/fix-pkg-config.patch b/extra/cmake/fix-pkg-config.patch
new file mode 100644
index 000000000..c9390aec2
--- /dev/null
+++ b/extra/cmake/fix-pkg-config.patch
@@ -0,0 +1,31 @@
+X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindPkgConfig.cmake;h=39d3a76abd852df4a32eab5f8d5672fa24a7e4cf;hp=5d93ab151de792b4565cbef1927f372be633f4a6;hb=3ea850a5023060b84dcc0e6f0098c32c28b15807;hpb=ad3d2b450f1c2454cd1a3f416ef97631e2937eef
+
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index 5d93ab1..39d3a76 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -13,11 +13,10 @@
+ # When the 'QUIET' argument is set, no status messages will be printed.
+ #
+ # It sets the following variables:
+-#   PKG_CONFIG_FOUND          ... true if pkg-config works on the system
++#   PKG_CONFIG_FOUND          ... if pkg-config executable was found
+ #   PKG_CONFIG_EXECUTABLE     ... pathname of the pkg-config program
+ #   PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
+ #                                 (since CMake 2.8.8)
+-#   PKG_CONFIG_FOUND          ... if pkg-config executable was found
+ #
+ # For the following variables two sets of values exist; first one is the
+ # common one and has the given PREFIX. The second set contains flags
+@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig
+                                   REQUIRED_VARS PKG_CONFIG_EXECUTABLE
+                                   VERSION_VAR PKG_CONFIG_VERSION_STRING)
+ 
++# This is needed because the module name is "PkgConfig" but the name of
++# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
++# handled by FPHSA.
++set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
++
+ # Unsets the given variables
+ macro(_pkgconfig_unset var)
+   set(${var} "" CACHE INTERNAL "")
diff --git a/extra/cups-filters/PKGBUILD b/extra/cups-filters/PKGBUILD
index b1eef9fce..8483f5f02 100644
--- a/extra/cups-filters/PKGBUILD
+++ b/extra/cups-filters/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 155821 2012-04-07 06:09:20Z andyrtr $
+# $Id: PKGBUILD 157192 2012-04-25 13:19:30Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters
-pkgver=1.0.12
+pkgver=1.0.17
 pkgrel=1
 pkgdesc="OpenPrinting CUPS Filters"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ backup=()
 #options=(!makeflags)
 install=
 source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz)
-md5sums=('aace03cc690dde7809d6cb5394accfa4')
+md5sums=('5132b018cc503e9338fbd029acf56e55')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gnome-pilot/PKGBUILD b/extra/gnome-pilot/PKGBUILD
index 9a780339e..f558b2713 100644
--- a/extra/gnome-pilot/PKGBUILD
+++ b/extra/gnome-pilot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139311 2011-10-01 18:58:09Z ibiru $
+# $Id: PKGBUILD 157208 2012-04-26 02:01:26Z eric $
 # Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-pilot
 pkgver=2.91.93
-pkgrel=1
+pkgrel=2
 pkgdesc="Pilot Support for Gnome"
 arch=(i686 x86_64)
 license=('GPL')
@@ -30,6 +30,6 @@ package() {
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
+  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
 }
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 60da0cb70..4cf1daec8 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156847 2012-04-23 09:07:29Z ibiru $
+# $Id: PKGBUILD 157198 2012-04-25 14:06:29Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,14 +15,30 @@ install=gnome-settings-daemon.install
 url="http://www.gnome.org"
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        systemd-fallback.patch)
+        systemd-fallback.patch
+        evironment.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=9d7ea1d0b8b90b55f916751858a210a2e02a06b6
+        arguments.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=00681573ad6ebeb127ec72ac61d30d69be6459f8
+        mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=053f48b3b1b9a3b2ab0714d470da4354735d0c4b
+        glist-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=214a832820f6448f07d438f6686267eaf8301dd1
+        mouse-mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=09c215b42312ca5bb63b215c2f95231613b3103d)
 sha256sums=('d5d4a270ec5692cdc56a58cfb57bc7f8fa93374566912a65e78c1c3db7faf4ed'
-            '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008')
+            '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008'
+            '1ba33f6eadac4c54f3f08f4bce075d2bef8124f857f5af22eaee010c8d38bc3b'
+            '884a959b334f864f75dcb4eec8c137785f587c7c2ae57906f8b4e60e04c29246'
+            '3a3f8b2964406b9b3c85c05f25e677e8c9eaa221779b95826ffbc0474740decc'
+            'af3bda801befdbd3d318723ae6de3aaf7df1e16bccd84e13f15b57f2dceaefcd'
+            '43b7397e622a2c19091b3665822e9461067fb6a497b9507418a3bbb100a69e1b')
 
 build() {
   cd $pkgname-$pkgver
 
   patch -Np1 -i ../systemd-fallback.patch
+  patch -Np1 -i ../evironment.patch
+  patch -Np1 -i ../arguments.patch
+  patch -Np1 -i ../mem-leak.patch
+  patch -Np1 -i ../glist-leak.patch
+  patch -Np1 -i ../mouse-mem-leak.patch
+
   gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \
       --enable-systemd
diff --git a/extra/lv2/PKGBUILD b/extra/lv2/PKGBUILD
new file mode 100644
index 000000000..a45496af2
--- /dev/null
+++ b/extra/lv2/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 157185 2012-04-25 12:13:02Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+
+pkgname=lv2
+pkgver=1.0.0
+pkgrel=2
+pkgdesc="Successor to the LADSPA audio plug-in standard"
+url="http://lv2plug.in/"
+license=('LGPL' 'custom')
+arch=('i686' 'x86_64')
+makedepends=('python2' 'libsndfile' 'gtk2')
+optdepends=('libsndfile: lv2-eg-sampler'
+            'gtk2: lv2-eg-sampler')
+provides=('lv2core')
+conflicts=('lv2core')
+replaces=('lv2core')
+source=("http://lv2plug.in/spec/$pkgname-$pkgver.tar.bz2")
+md5sums=('af98a50d8dfa8318a69800ea48b421f6')
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	python2 waf configure --prefix=/usr
+	python2 waf build $MAKEFLAGS
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	python2 waf install --destdir="$pkgdir"
+
+	install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index fb34b6640..112dbfaac 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148047 2012-01-30 18:21:09Z andrea $
+# $Id: PKGBUILD 157183 2012-04-25 11:45:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgname=virtuoso
-pkgver=6.1.4
-pkgrel=2
+pkgver=6.1.5
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality'
 url='http://virtuoso.openlinksw.com/wiki/main/Main/'
@@ -13,7 +13,7 @@ depends=('libldap')
 makedepends=('bison' 'flex')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz")
-md5sums=('7110a0b4b171b84850d346f4fe648172')
+md5sums=('61b53395e14a11dd7e7715b50261b9eb')
 
 build() {
   cd ${srcdir}/${pkgname}-opensource-${pkgver}
diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD
index b4e26c64e..e094acd03 100644
--- a/extra/webmin/PKGBUILD
+++ b/extra/webmin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152241 2012-03-05 19:12:45Z tpowa $
+# $Id: PKGBUILD 157190 2012-04-25 13:14:12Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
 pkgver=1.580
-pkgrel=1
+pkgrel=2
 pkgdesc="a web-based interface for system administration"
 arch=(i686 x86_64)
 license=('custom:webmin')
@@ -86,7 +86,8 @@ install=webmin.install
 source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
 	ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 
 	ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2
-	webmin.rc) 
+	webmin.rc
+	webmin.service) 
 options=(!strip)
 
 build() {
@@ -203,6 +204,9 @@ build() {
   #install rc file
   install -D -m 755 $startdir/src/webmin.rc $startdir/pkg/etc/rc.d/webmin
 
+  # install systemd files
+  install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service
+
   # delete temp dir
   rm -r $startdir/pkg/tmp
   # change sticky bit
@@ -213,4 +217,5 @@ build() {
 md5sums=('2aa5378bc3ed6471c460d18e87a06fa3'
          '43a77243acd519c4efe9577090b59912'
          'bfebb75bb94029b48c46b7f1ba1aa811'
-         '0673e51af0e81418b4a6c1e205f7e5cd')
+         'c77dfcd621b417a7826d25f56a1e60ae'
+         'fc29ecb6a5cd8c278abe054e60381095')
diff --git a/extra/webmin/webmin.rc b/extra/webmin/webmin.rc
index ee83fbea2..6aac8941d 100644
--- a/extra/webmin/webmin.rc
+++ b/extra/webmin/webmin.rc
@@ -14,6 +14,7 @@ case "$1" in
      RETVAL=$?
      if [ "$RETVAL" = "0" ]; then
      touch $lockfile >/dev/null 2>&1
+     add_daemon webmin
      stat_done
      else
      stat_fail
@@ -26,6 +27,7 @@ fi
      RETVAL=$?
      if [ "$RETVAL" = "0" ]; then
      rm -f $lockfile
+     rm_daemon webmin
      stat_done
      else
      stat_fail
@@ -33,8 +35,8 @@ fi
 ;;
 
 'restart')
-     $stop && $start
-     RETVAL=$?
+     $0 stop
+     $0 start
 ;;
 *)
 echo "Usage: $0 { start | stop | restart }"
diff --git a/extra/webmin/webmin.service b/extra/webmin/webmin.service
new file mode 100644
index 000000000..a8a384a8c
--- /dev/null
+++ b/extra/webmin/webmin.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Webmin
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/etc/webmin/start
+ExecStop=/etc/webmin/stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/xfce4-mount-plugin/PKGBUILD b/extra/xfce4-mount-plugin/PKGBUILD
index f179c66e8..f0d684d2c 100644
--- a/extra/xfce4-mount-plugin/PKGBUILD
+++ b/extra/xfce4-mount-plugin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156689 2012-04-22 23:46:49Z eric $
+# $Id: PKGBUILD 157202 2012-04-25 17:31:31Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-mount-plugin
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="Plugin for the Xfce4 panel to mount and unmount volumes"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('intltool')
 options=('!libtool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0b9dee13886639aea8b4ca3158b9cdf7')
+sha1sums=('dbbf8e29c50ec1cd9ba0fa65f7255ca0788a372e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"