Fri Jan 20 23:14:48 UTC 2012

11 files changed, 290 insertions, 46 deletions

diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index 9c33cefba..e04077a1b 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 122574 2011-05-04 17:23:19Z ibiru $
+# $Id: PKGBUILD 146919 2012-01-19 07:41:51Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=cifs-utils
-pkgver=4.9
-pkgrel=3
+pkgver=5.2
+pkgrel=1
 pkgdesc="CIFS filesystem user-space tools"
 arch=(i686 x86_64)
 url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
 license=('GPL')
-depends=('libcap' 'keyutils' 'krb5' 'talloc')
+depends=('libcap-ng' 'keyutils' 'krb5' 'talloc')
 source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
-md5sums=('908d904e6b9e58f09f530de151a88ef8')
+# deinstall smbclient first!
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -24,3 +24,4 @@ package() {
   # set mount.cifs uid, to enable none root mounting form fstab
   chmod +s $pkgdir/sbin/mount.cifs
 }
+md5sums=('2ca839553cccd0c3042f7dd8737cc9de')
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 5f607d52a..219ad0edb 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146804 2012-01-18 16:24:18Z ibiru $
+# $Id: PKGBUILD 146931 2012-01-19 10:12:16Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The next generation GNOME Shell"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeShell"
@@ -15,12 +15,16 @@ optdepends=('network-manager-applet: shell integration for networkmanager')
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('68967b9d58ad0551d7d3d28a276526a15faf1fc1d27f4624eb405663910e2eb8')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        revert-notificationdaemon-group-based-on-pid-and-titles.patch)
+sha256sums=('68967b9d58ad0551d7d3d28a276526a15faf1fc1d27f4624eb405663910e2eb8'
+            '9e0337cd25d29d7215561d6fa30612d69c89fe7c27aa563a0c0b8a5b6f6cf12a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  patch -Np1 -R -i "$srcdir/revert-notificationdaemon-group-based-on-pid-and-titles.patch"
+
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-shell \
       --localstatedir=/var --disable-static \
diff --git a/extra/gnome-shell/revert-notificationdaemon-group-based-on-pid-and-titles.patch b/extra/gnome-shell/revert-notificationdaemon-group-based-on-pid-and-titles.patch
new file mode 100644
index 000000000..cdb9140bf
--- /dev/null
+++ b/extra/gnome-shell/revert-notificationdaemon-group-based-on-pid-and-titles.patch
@@ -0,0 +1,224 @@
+From 7e654ab3ca6e8ac75ba5e45c2a411eb1c2904b26 Mon Sep 17 00:00:00 2001
+From: Marina Zhurakhinskaya <marinaz@redhat.com>
+Date: Tue, 20 Dec 2011 05:51:35 +0000
+Subject: notificationDaemon: group sources based on a combination of pid and title
+
+That way different system notifications, such as the ones about battery power
+and the ones about software updates, are shown with separate message tray
+sources.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=664138
+---
+diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
+index f40205d..c691efe 100644
+--- a/js/ui/notificationDaemon.js
++++ b/js/ui/notificationDaemon.js
+@@ -92,7 +92,7 @@ NotificationDaemon.prototype = {
+     _init: function() {
+         DBus.session.exportObject('/org/freedesktop/Notifications', this);
+ 
+-        this._sources = {};
++        this._sources = [];
+         this._senderToPid = {};
+         this._notifications = {};
+         this._busProxy = new Bus();
+@@ -150,14 +150,30 @@ NotificationDaemon.prototype = {
+         }
+     },
+ 
++    _lookupSource: function(title, pid, trayIcon) {
++        for (let i = 0; i < this._sources.length; i++) {
++            let source = this._sources[i];
++            if (source.pid == pid &&
++                (source.initialTitle == title || source.trayIcon || trayIcon))
++                return source;
++        }
++        return null;
++    },
++
+     // Returns the source associated with ndata.notification if it is set.
+-    // Otherwise, returns the source associated with the pid if one is
+-    // stored in this._sources and the notification is not transient.
+-    // Otherwise, creates a new source as long as pid is provided.
++    // Otherwise, returns the source associated with the title and pid if
++    // such source is stored in this._sources and the notification is not
++    // transient. If the existing or requested source is associated with
++    // a tray icon and passed in pid matches a pid of an existing source,
++    // the title match is ignored to enable representing a tray icon and
++    // notifications from the same application with a single source.
++    //
++    // If no existing source is found, a new source is created as long as
++    // pid is provided.
+     //
+     // Either a pid or ndata.notification is needed to retrieve or
+     // create a source.
+-    _getSource: function(title, pid, ndata, sender) {
++    _getSource: function(title, pid, ndata, sender, trayIcon) {
+         if (!pid && !(ndata && ndata.notification))
+             return null;
+ 
+@@ -174,20 +190,24 @@ NotificationDaemon.prototype = {
+         // with a transient one from the same sender, so we
+         // always create a new source object for new transient notifications
+         // and never add it to this._sources .
+-        if (!isForTransientNotification && this._sources[pid]) {
+-            let source = this._sources[pid];
+-            source.setTitle(title);
+-            return source;
++        if (!isForTransientNotification) {
++            let source = this._lookupSource(title, pid, trayIcon);
++            if (source) {
++                source.setTitle(title);
++                return source;
++            }
+         }
+ 
+-        let source = new Source(title, pid, sender);
++        let source = new Source(title, pid, sender, trayIcon);
+         source.setTransient(isForTransientNotification);
+ 
+         if (!isForTransientNotification) {
+-            this._sources[pid] = source;
++            this._sources.push(source);
+             source.connect('destroy', Lang.bind(this,
+                 function() {
+-                    delete this._sources[pid];
++                    let index = this._sources.indexOf(source);
++                    if (index >= 0)
++                        this._sources.splice(index, 1);
+                 }));
+         }
+ 
+@@ -261,7 +281,7 @@ NotificationDaemon.prototype = {
+         let sender = DBus.getCurrentMessageContext().sender;
+         let pid = this._senderToPid[sender];
+ 
+-        let source = this._getSource(appName, pid, ndata, sender);
++        let source = this._getSource(appName, pid, ndata, sender, null);
+ 
+         if (source) {
+             this._notifyForSource(source, ndata);
+@@ -282,7 +302,7 @@ NotificationDaemon.prototype = {
+                 if (!ndata)
+                     return;
+ 
+-                source = this._getSource(appName, pid, ndata, sender);
++                source = this._getSource(appName, pid, ndata, sender, null);
+ 
+                 // We only store sender-pid entries for persistent sources.
+                 // Removing the entries once the source is destroyed
+@@ -432,8 +452,8 @@ NotificationDaemon.prototype = {
+         if (!tracker.focus_app)
+             return;
+ 
+-        for (let id in this._sources) {
+-            let source = this._sources[id];
++        for (let i = 0; i < this._sources.length; i++) {
++            let source = this._sources[i];
+             if (source.app == tracker.focus_app) {
+                 source.destroyNonResidentNotifications();
+                 return;
+@@ -456,12 +476,11 @@ NotificationDaemon.prototype = {
+     },
+ 
+     _onTrayIconAdded: function(o, icon) {
+-        let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null, null);
+-        source.setTrayIcon(icon);
++        let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null, null, icon);
+     },
+ 
+     _onTrayIconRemoved: function(o, icon) {
+-        let source = this._sources[icon.pid];
++        let source = this._lookupSource(icon.pid, null, true);
+         if (source)
+             source.destroy();
+     }
+@@ -476,10 +495,12 @@ function Source(title, pid, sender) {
+ Source.prototype = {
+     __proto__:  MessageTray.Source.prototype,
+ 
+-    _init: function(title, pid, sender) {
++    _init: function(title, pid, sender, trayIcon) {
+         MessageTray.Source.prototype._init.call(this, title);
+ 
+-        this._pid = pid;
++        this.initialTitle = title;
++
++        this.pid = pid;
+         if (sender)
+             // TODO: dbus-glib implementation of watch_name() doesn’t return an id to be used for
+             // unwatch_name() or implement unwatch_name(), however when we move to using GDBus implementation,
+@@ -496,7 +517,12 @@ Source.prototype = {
+             this.title = this.app.get_name();
+         else
+             this.useNotificationIcon = true;
+-        this._trayIcon = null;
++
++        this.trayIcon = trayIcon;
++        if (this.trayIcon) {
++           this._setSummaryIcon(this.trayIcon);
++           this.useNotificationIcon = false;
++        }
+     },
+ 
+     _onNameVanished: function() {
+@@ -523,7 +549,7 @@ Source.prototype = {
+     },
+ 
+     handleSummaryClick: function() {
+-        if (!this._trayIcon)
++        if (!this.trayIcon)
+             return false;
+ 
+         let event = Clutter.get_current_event();
+@@ -544,11 +570,11 @@ Source.prototype = {
+             let id = global.connect('notify::stage-input-mode', Lang.bind(this,
+                 function () {
+                     global.disconnect(id);
+-                    this._trayIcon.click(event);
++                    this.trayIcon.click(event);
+                 }));
+             Main.overview.hide();
+         } else {
+-            this._trayIcon.click(event);
++            this.trayIcon.click(event);
+         }
+         return true;
+     },
+@@ -557,31 +583,25 @@ Source.prototype = {
+         if (this.app)
+             return;
+ 
+-        this.app = Shell.WindowTracker.get_default().get_app_from_pid(this._pid);
++        this.app = Shell.WindowTracker.get_default().get_app_from_pid(this.pid);
+         if (!this.app)
+             return;
+ 
+         // Only override the icon if we were previously using
+         // notification-based icons (ie, not a trayicon) or if it was unset before
+-        if (!this._trayIcon) {
++        if (!this.trayIcon) {
+             this.useNotificationIcon = false;
+             this._setSummaryIcon(this.app.create_icon_texture (this.ICON_SIZE));
+         }
+     },
+ 
+-    setTrayIcon: function(icon) {
+-        this._setSummaryIcon(icon);
+-        this.useNotificationIcon = false;
+-        this._trayIcon = icon;
+-    },
+-
+     open: function(notification) {
+         this.destroyNonResidentNotifications();
+         this.openApp();
+     },
+ 
+     _lastNotificationRemoved: function() {
+-        if (!this._trayIcon)
++        if (!this.trayIcon)
+             this.destroy();
+     },
+ 
+--
+cgit v0.9.0.2
diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD
index ce99e9c8a..3bf677188 100644
--- a/extra/libass/PKGBUILD
+++ b/extra/libass/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 143794 2011-11-29 11:56:48Z giovanni $
+# $Id: PKGBUILD 146950 2012-01-19 15:31:00Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 
 pkgname=libass
 pkgver=0.10.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A portable library for SSA/ASS subtitles rendering"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/libass/"
 license=('BSD')
-depends=('enca' 'fontconfig' 'libpng' 'fribidi')
+depends=('enca' 'fontconfig' 'fribidi')
 makedepends=('pkg-config')
 options=(!libtool)
 source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index bf13443ab..6491559d8 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145165 2011-12-18 18:44:31Z pierre $
+# $Id: PKGBUILD 146963 2012-01-19 18:03:44Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
 pkgver=1.4.30
-pkgrel=1
+pkgrel=2
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
@@ -22,8 +22,8 @@ source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}
 sha256sums=('c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b'
             '941ab747aeb97ca111fb670d21eefecdf745debc5e139bc5bd6881ee66b2742a'
             'ceff3a88e876f6104c094379d507b89bc504777d0f98a0930406a70624fcf024'
-            '6c5892830e77731d27e3ebb64a0d87ab9139c68eb703aec6741c591814cef26f'
-            '44267e8b670faaf5712ad0bc9fd84b8c52281ddd22ef2c22d4b474dbb1cf5d2a')
+            '550aa1abaced6bc9e8d65c2b069bfc96bf4d06734b17eeb140c5d00705de1230'
+            'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
diff --git a/extra/lighttpd/lighttpd.conf b/extra/lighttpd/lighttpd.conf
index 4ca1b23a4..ed192352a 100644
--- a/extra/lighttpd/lighttpd.conf
+++ b/extra/lighttpd/lighttpd.conf
@@ -9,4 +9,4 @@ server.document-root	= "/srv/http"
 server.errorlog		= "/var/log/lighttpd/error.log"
 dir-listing.activate	= "enable"
 index-file.names	= ( "index.html" )
-mimetype.assign		= ( ".html" => "text/html", ".txt" => "text/plain", ".jpg" => "image/jpeg", ".png" => "image/png" )
+mimetype.assign		= ( ".html" => "text/html", ".txt" => "text/plain", ".jpg" => "image/jpeg", ".png" => "image/png", "" => "application/octet-stream" )
diff --git a/extra/lighttpd/lighttpd.logrotate.d b/extra/lighttpd/lighttpd.logrotate.d
index 5ff32a0c5..5be47b863 100644
--- a/extra/lighttpd/lighttpd.logrotate.d
+++ b/extra/lighttpd/lighttpd.logrotate.d
@@ -1,5 +1,8 @@
 /var/log/lighttpd/*log {
 	missingok
+	copytruncate
+	notifempty
+	sharedscripts
 	postrotate
 	/etc/rc.d/lighttpd reload >/dev/null || true
 	endscript
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
index 23c2a1437..e31812148 100644
--- a/extra/lirc/PKGBUILD
+++ b/extra/lirc/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 142392 2011-11-08 22:38:56Z thomas $
+# $Id: PKGBUILD 146925 2012-01-19 10:00:36Z thomas $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=8
+pkgrel=10
 epoch=1
-_extramodules=extramodules-3.1-ARCH
+_extramodules=extramodules-3.2-ARCH
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
 arch=('i686' 'x86_64')
 url="http://www.lirc.org/"
 license=('GPL')
-makedepends=('help2man' 'linux-headers>=3.1' 'linux-headers<3.2' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-headers>=3.2' 'linux-headers<3.3' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
@@ -61,7 +61,7 @@ build() {
 
 package_lirc() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'linux>=3.1' 'linux<3.2')
+  depends=('lirc-utils' 'linux>=3.2' 'linux<3.3')
   replaces=('lirc+pctv')
   install=lirc.install
 
diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install
index 1e7c4f4a1..9bf905742 100644
--- a/extra/lirc/lirc.install
+++ b/extra/lirc/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.1-ARCH
+EXTRAMODULES=extramodules-3.2-ARCH
 
 post_install() {
   # updating module dependencies
diff --git a/extra/php-suhosin/PKGBUILD b/extra/php-suhosin/PKGBUILD
index 94a5c9c25..45adeb4ee 100644
--- a/extra/php-suhosin/PKGBUILD
+++ b/extra/php-suhosin/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 135864 2011-08-19 20:05:56Z pierre $
+# $Id: PKGBUILD 146961 2012-01-19 17:54:16Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-suhosin
-pkgver=0.9.32.1
-pkgrel=3
+pkgver=0.9.33
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='An advanced protection system for PHP installations'
 url='http://www.hardened-php.net/suhosin/'
 license='PHP'
-source=("http://download.suhosin.org/suhosin-${pkgver}.tar.gz")
+source=("http://download.suhosin.org/suhosin-${pkgver}.tgz"
+        "http://download.suhosin.org/suhosin-${pkgver}.tgz.sig")
 depends=('php')
 conflicts=('php-suhosin-extension')
 replaces=('php-suhosin-extension')
 backup=('etc/php/conf.d/suhosin.ini')
-md5sums=('26a86f0f684a656c3e789e3eb4ec1db3')
+md5sums=('0ce498a02a8281e4274ea8e390c2b487'
+         '6e9536cc71342bab0efb1e9a84f688a6')
 
 build() {
 	cd ${srcdir}/suhosin-${pkgver}
diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD
index fb9ca5360..69f4609af 100644
--- a/extra/tumbler/PKGBUILD
+++ b/extra/tumbler/PKGBUILD
@@ -1,34 +1,44 @@
-# $Id: PKGBUILD 144453 2011-12-06 03:29:55Z eric $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# $Id: PKGBUILD 146987 2012-01-19 22:31:36Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan Jezek <honzin.jezek@gmail.com>
 
 pkgname=tumbler
 pkgver=0.1.23
-pkgrel=1
+pkgrel=3
 pkgdesc="D-Bus service for applications to request thumbnails"
+arch=('i686' 'x86_64')
 url="http://git.xfce.org/xfce/tumbler/"
 license=('GPL2' 'LGPL')
-arch=('i686' 'x86_64')
 groups=('xfce4')
-depends=('poppler-glib' 'dbus-glib' 'gdk-pixbuf2')
-makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10')
-optdepends=('ffmpegthumbnailer:	for video thumbnails'
-            'gstreamer0.10: for video thumbnails')
+depends=('dbus-glib' 'gdk-pixbuf2')
+makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10' 'poppler-glib'
+             'libgsf' 'libopenraw' 'freetype2')
+optdepends=('ffmpegthumbnailer: for video thumbnails'
+            'gstreamer0.10: for video thumbnails'
+            'poppler-glib: for PDF thumbnails'
+            'libgsf: for ODF thumbnails'
+            'libopenraw: for RAW thumbnails'
+            'freetype2: for font thumbnails')
 options=('!libtool')
-source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('c6cf6821f5d884cbf2c26f45f2fecc74')
+source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2)
+sha256sums=('b3066d17b7e1fee5135eb876a7c2c50a1221bd0d447c3dd7c36efe6d7f3874cb')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/xfce4 \
-	--disable-static \
-	--disable-debug
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et: