Sun Oct 2 23:14:32 UTC 2011

9 files changed, 82 insertions, 53 deletions

diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index 668a9cec5..a0abac0c4 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49792 2011-06-21 05:03:51Z foutrelis $
+# $Id: PKGBUILD 56117 2011-10-02 02:52:22Z ebelanger $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 
 pkgname=collectd
 pkgver=5.0.0
-pkgrel=6
+pkgrel=7
 pkgdesc='Daemon which collects system performance statistics periodically'
 arch=('i686' 'x86_64')
 url='http://collectd.org/'
@@ -41,24 +41,28 @@ makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'iptables' 'libmemcached'
 
 depends=('libtool')
 
-source=("${url}files/$pkgname-$pkgver.tar.gz"
+source=("${url}files/${pkgname}-${pkgver}.tar.gz"
         'libnotify-0.7.patch'
         'yajl-2.x.patch'
+        'libperl.patch'
         'rc.d')
 sha1sums=('026e5121348f0e525dedb3844fe61c7713994bb7'
           'f6fed097c16f6c9c90b9a32a5b8e48d54b35b337'
           'd3854c39c9596b4f6dcf67a9eb8decea4d17120d'
+          'b221352447b2d42cade4a65ced322bcff8a40366'
           '0f441718d5519cb043b1130e5a1d0379078adbcc')
 
 install=install
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	unset LDFLAGS # or libperl not found
+	patch -p1 -i ../libperl.patch
+	autoconf
+
+	sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c
 	patch -p1 -i ../libnotify-0.7.patch
 	patch -p1 -i ../yajl-2.x.patch
-	sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c
 
 	./configure \
 		--prefix=/usr \
@@ -67,17 +71,16 @@ build() {
 		--enable-static=no \
 		--with-python=/usr/bin/python2
 
-	# avoid -Werror with gcc 4.6
-	sed -i '/^AM_CFLAGS/s/ -Werror//' src/Makefile
+	sed -i 's/ -Werror//g' */Makefile* */*/Makefile*
 
 	make all
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="${pkgdir}" install
 
-	install -D -m 755 ../rc.d "$pkgdir/etc/rc.d/$pkgname"
-	install -D -m 644 contrib/collectd2html.pl "$pkgdir"/usr/share/collectd/collectd2html.pl
+	install -D -m 755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
+	install -D -m 644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
 }
diff --git a/community/collectd/libperl.patch b/community/collectd/libperl.patch
new file mode 100644
index 000000000..d6184f29d
--- /dev/null
+++ b/community/collectd/libperl.patch
@@ -0,0 +1,30 @@
+diff -aur old/configure.in new/configure.in
+--- old/configure.in	2011-09-29 20:38:56.725672831 +1000
++++ new/configure.in	2011-09-29 20:39:07.975658829 +1000
+@@ -2810,11 +2810,13 @@
+ then
+   SAVE_CFLAGS="$CFLAGS"
+   SAVE_LDFLAGS="$LDFLAGS"
++  SAVE_LIBS="$LIBS"
+ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
+   PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
+   PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
+   CFLAGS="$CFLAGS $PERL_CFLAGS"
+   LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
++  LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl"
+ 
+   AC_CACHE_CHECK([for libperl],
+     [c_cv_have_libperl],
+@@ -2833,7 +2835,10 @@
+ 			 Nullsv);
+       ]]),
+       [c_cv_have_libperl="yes"],
+-      [c_cv_have_libperl="no"]
++      [ 
++        c_cv_have_libperl="no" 
++        LIBS="$SAVE_LIBS"
++      ]
+     )
+   )
+ 
+Only in new: configure.in.orig
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index 12211f9ca..a4dbf7ccb 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 52230 2011-07-22 09:30:43Z ibiru $
+# $Id: PKGBUILD 56108 2011-10-01 18:56:09Z ibiru $
 #Maintainer:  Ionut Biru <ibiru@archlinux.org>
 #Contributor: Hugo Doria <hugo@archlinux.org>
 #Contributor: Sergej Chodarev <sergejx@centrum.sk>
 #Contributor: zhuqin <zhuqin83@gmail.com>
 
 pkgname=gedit-plugins
-pkgver=3.0.5
-pkgrel=2
+pkgver=3.2.0
+pkgrel=1
 pkgdesc="Set of plugins for gedit"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,8 +16,8 @@ optdepends=('gucharmap: for charmap plugin')
 makedepends=('intltool' 'gnome-doc-utils')
 options=('!libtool' '!emptydirs')
 install=gedit-plugins.install
-source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.0/$pkgname-$pkgver.tar.xz)
-sha256sums=('e878d4c1bdf9ee38bf23440f3550f854078727233432bfe2f4062794e4b0f3a9')
+source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.2/$pkgname-$pkgver.tar.xz)
+sha256sums=('c8d617a107478dba6ef0ab16e87707c5526e97eefab24a65891dbf9aa32e7839')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index 684c604b7..935654838 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 55211 2011-09-06 11:02:14Z jconder $
+# $Id: PKGBUILD 56112 2011-10-01 19:02:07Z ibiru $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 pkgname=gnome-packagekit
-pkgver=3.0.3
-pkgrel=2
+pkgver=3.2.0
+pkgrel=1
 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
 arch=('i686' 'x86_64')
 url='http://www.packagekit.org/'
@@ -16,7 +16,7 @@ options=('!emptydirs' '!libtool')
 install="$pkgname.install"
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
         'arch.patch')
-sha256sums=('3042bb008548f70a98ff4d90da86ad7ddbdd2ec03c37daaf87b8e6341a03d211'
+sha256sums=('a91efca58ac0781f925927772281e72abf16314ef3b9577bf42f8ab3f5b5c0e9'
             '9c809ac3c8bbf870442e7bc4123c70b144930a287b28626be1b8bae95edf71ac')
 
 build() {
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index 8ee5371b0..ba1159032 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 54886 2011-08-27 12:46:49Z jconder $
+# $Id: PKGBUILD 56110 2011-10-01 19:01:59Z ibiru $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 _pkgname=gnome-settings-daemon
 pkgname=$_pkgname-updates
-pkgver=3.0.3
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="Updates plugin for the GNOME Settings daemon"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org"
 license=('GPL')
-depends=('gnome-packagekit' "$_pkgname" 'upower')
-makedepends=('intltool' 'gtk-doc')
+depends=('gnome-packagekit' "$_pkgname")
+makedepends=('intltool' 'gtk-doc' 'gnome-desktop')
 options=('!emptydirs' '!libtool')
 install=$_pkgname.install
 source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
         'arch.patch')
-sha256sums=('9c6e3bb5c4b3a98ab83a917b7be15578d11831330f7f2deeecfbb625568e3e03'
-            '91700d5c7c52cb6e15ed46ec61a150af58e073de7332351a1f7863a41042d134')
+sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b'
+            'e5029915c423f72256c4170f917363c385b6fcd180b87ceba0d7bb11a841d7e9')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
@@ -24,9 +24,10 @@ build() {
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
 	      --localstatedir=/var \
-	      --libexecdir=/usr/bin \
+	      --libexecdir=/usr/lib/gnome-settings-daemon \
 	      --disable-static \
-	      --enable-pulse
+	      --enable-pulse \
+	      --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids
   #https://bugzilla.gnome.org/show_bug.cgi?id=656231
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make -s
diff --git a/community/gnome-settings-daemon-updates/arch.patch b/community/gnome-settings-daemon-updates/arch.patch
index d5a5382fa..f405d7593 100644
--- a/community/gnome-settings-daemon-updates/arch.patch
+++ b/community/gnome-settings-daemon-updates/arch.patch
@@ -1,5 +1,5 @@
 diff --git a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
-index 67c551e..7f9f5ba 100644
+index c09096a..3fa4159 100644
 --- a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
 +++ b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
 @@ -31,7 +31,7 @@
@@ -8,8 +8,8 @@ index 67c551e..7f9f5ba 100644
      <key name="auto-update-type" enum="org.gnome.settings-daemon.GsdUpdateType">
 -      <default>'security'</default>
 +      <default>'none'</default>
-       <_summary>Automatically update these types of updates</_summary>
-       <_description>Automatically update these types of updates.</_description>
+       <_summary>Automatically install these types of updates</_summary>
+       <_description>Automatically install these types of updates.</_description>
      </key>
 @@ -56,7 +56,7 @@
        <_description>The last time we notified the user about non-critical updates. Value is in seconds since the epoch, or zero for never.</_description>
@@ -36,7 +36,7 @@ index 9510c65..191092d 100644
  libupdates_la_CPPFLAGS = \
  	-I$(top_srcdir)/gnome-settings-daemon \
 diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c
-index 64373bd..275c171 100644
+index 90ea246..d79455c 100644
 --- a/plugins/updates/gsd-updates-manager.c
 +++ b/plugins/updates/gsd-updates-manager.c
 @@ -32,6 +32,7 @@
@@ -47,7 +47,7 @@ index 64373bd..275c171 100644
  #include "gsd-updates-common.h"
  #include "gnome-settings-profile.h"
  
-@@ -44,6 +45,7 @@ struct GsdUpdatesManagerPrivate
+@@ -46,6 +47,7 @@ struct GsdUpdatesManagerPrivate
          GCancellable            *cancellable;
          GsdUpdatesRefresh       *refresh;
          GsdUpdatesFirmware      *firmware;
@@ -65,7 +65,7 @@ index 64373bd..275c171 100644
          /* get http settings */
          manager->priv->settings_http = g_settings_new ("org.gnome.system.proxy.http");
          g_signal_connect (manager->priv->settings_http, "changed",
-@@ -1467,6 +1472,10 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager)
+@@ -1464,6 +1469,10 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager)
                  g_object_unref (manager->priv->firmware);
                  manager->priv->firmware = NULL;
          }
@@ -78,10 +78,10 @@ index 64373bd..275c171 100644
                  manager->priv->proxy_session = NULL;
 diff --git a/plugins/updates/gsd-updates-watch.c b/plugins/updates/gsd-updates-watch.c
 new file mode 100644
-index 0000000..cbc3794
+index 0000000..892acad
 --- /dev/null
 +++ b/plugins/updates/gsd-updates-watch.c
-@@ -0,0 +1,185 @@
+@@ -0,0 +1,179 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
 + *
 + * Copyright (C) 2007-2011 Richard Hughes <richard@hughsie.com>
@@ -149,21 +149,15 @@ index 0000000..cbc3794
 +
 +	/* display a notification */
 +        notification = notify_notification_new (title, message, NULL);
-+        if (notification == NULL) {
-+                g_warning ("failed to create notification");
-+                goto out;
-+        }
-+
++	notify_notification_set_app_name (notification, _("Software Updates"));
 +        notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
 +        notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);
 +
 +        if (!notify_notification_show (notification, &error)) {
 +                g_warning ("error: %s", error->message);
 +                g_error_free (error);
-+		goto out;
 +        }
 +
-+out:
 +	g_free (details);
 +}
 +
diff --git a/community/ibus-m17n/PKGBUILD b/community/ibus-m17n/PKGBUILD
index 1849c40dd..3539abb01 100644
--- a/community/ibus-m17n/PKGBUILD
+++ b/community/ibus-m17n/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 53482 2011-08-03 22:10:35Z ebelanger $
+# $Id: PKGBUILD 56123 2011-10-02 03:31:13Z ebelanger $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Lonfucius <Lonfucius@gmail.com>
 # Contributor: Jesse Jaara <jesse.jaara@gmail.com>
 
 pkgname=ibus-m17n
-pkgver=1.3.2
+pkgver=1.3.3
 pkgrel=1
 pkgdesc='M17N engine for IBus'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url='http://code.google.com/p/ibus/'
 license=('LGPL')
 depends=('python-pyenchant' 'ibus' 'm17n-db' 'm17n-lib')
 source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('4c406147318f94e5e805c408c4be075e')
+md5sums=('8fa050df5b2d25095d0e2df51946b0de')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/ibus-sunpinyin/PKGBUILD b/community/ibus-sunpinyin/PKGBUILD
index 694a6a67a..2d46c7555 100644
--- a/community/ibus-sunpinyin/PKGBUILD
+++ b/community/ibus-sunpinyin/PKGBUILD
@@ -1,8 +1,9 @@
+# $Id: PKGBUILD 56121 2011-10-02 03:13:11Z ebelanger $
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ibus-sunpinyin
 pkgver=2.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc='The SunPinYin Engine for IBus Input Framework. SunPinYin is a Statistical Language Model based pinyin IME by Sun.'
 arch=('i686' 'x86_64')
 url='http://sunpinyin.googlecode.com'
@@ -13,7 +14,7 @@ source=("http://sunpinyin.googlecode.com/files/ibus-sunpinyin-${pkgver}.tar.gz")
 md5sums=('e678b2e1ac70c325cfc64c02fef7041f')
 
 build() {
-  cd ibus-sunpinyin-${pkgver}
+  cd "${srcdir}/ibus-sunpinyin-${pkgver}"
 
   sed -i 's/python/&2/' setup/ibus-setup-sunpinyin.in
 
@@ -22,10 +23,10 @@ build() {
 }
 
 package() {
-  cd ibus-sunpinyin-${pkgver}
+  cd "${srcdir}/ibus-sunpinyin-${pkgver}"
 
   scons \
     --prefix=/usr \
-    --install-sandbox=${pkgdir} \
+    --install-sandbox="${pkgdir}" \
     install
 }
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index 1513e7fe7..651683a6e 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 55273 2011-09-08 12:30:20Z spupykin $
+# $Id: PKGBUILD 56119 2011-10-02 02:52:32Z ebelanger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
 pkgver=5.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
 arch=('i686' 'x86_64')