Fri Feb 15 00:05:49 PST 2013

7 files changed, 111 insertions, 19 deletions

diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index af54cc2ed..f96005cd6 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178006 2013-02-13 12:35:32Z bisson $
+# $Id: PKGBUILD 178053 2013-02-14 21:32:25Z 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=2.9
+pkgver=2.9.1
 pkgrel=1
 pkgdesc='Fast and light imlib2-based image viewer'
 url='http://feh.finalrewind.org/'
@@ -16,7 +16,7 @@ optdepends=('perl: feh-cam, webcam wrapper for feh'
             'imagemagick: support more file formats')
 makedepends=('libxt')
 source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('efaeb598bd613f20b010c8f9c8a301e6878e2d9d')
+sha1sums=('d6effb0bb3074315114b2590722fae9712a531ad')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 050867755..019d8bc35 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 178025 2013-02-13 18:59:41Z heftig $
+# $Id: PKGBUILD 178051 2013-02-14 18:47:31Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
 pkgver=3.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64)
 url="http://live.gnome.org/GnomeShell"
@@ -17,11 +17,14 @@ optdepends=('gnome-control-center: System settings'
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('05b2341a0f84835644881743873d3eaccaed12f00aa7b424d876780e81723db2')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        fs33855.patch)
+sha256sums=('05b2341a0f84835644881743873d3eaccaed12f00aa7b424d876780e81723db2'
+            '259e69256ae597f1d04c7a0070c1c90cec20afbf494d6b89e72d86b8b9c7f0ba')
 
 build() {
   cd $pkgname-$pkgver
+  patch -Np1 -i ../fs33855.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/fs33855.patch b/extra/gnome-shell/fs33855.patch
new file mode 100644
index 000000000..b935e0923
--- /dev/null
+++ b/extra/gnome-shell/fs33855.patch
@@ -0,0 +1,65 @@
+From 9d931b5e013475be5733fc92bd105b3a691a4097 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Fri, 30 Nov 2012 15:05:38 +0000
+Subject: MessageTray: fix notification height expansion
+
+MessageTray._tween removes all tweens now, so it removes also
+those setting the height to expanded for critical notifications.
+
+This is a regression from 1a27d7dfc02c06bd0ccf4258a9108207b8832ce4
+
+https://bugzilla.gnome.org/show_bug.cgi?id=689295
+---
+diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
+index ce61e25..ef0cc02 100644
+--- a/js/ui/messageTray.js
++++ b/js/ui/messageTray.js
+@@ -2200,40 +2200,28 @@ const MessageTray = new Lang.Class({
+     _updateShowingNotification: function() {
+         this._notification.acknowledged = true;
+ 
+-        Tweener.removeTweens(this._notificationWidget);
+-
+         // We auto-expand notifications with CRITICAL urgency.
+-        // We use Tweener.removeTweens() to remove a tween that was hiding the notification we are
+-        // updating, in case that notification was in the process of being hidden. However,
+-        // Tweener.removeTweens() would also remove a tween that was updating the position of the
+-        // notification we are updating, in case that notification was already expanded and its height
+-        // changed. Therefore we need to call this._expandNotification() for expanded notifications
+-        // to make sure their position is updated.
+-        if (this._notification.urgency == Urgency.CRITICAL || this._notification.expanded)
++        if (this._notification.urgency == Urgency.CRITICAL)
+             this._expandNotification(true);
+ 
+         // We tween all notifications to full opacity. This ensures that both new notifications and
+         // notifications that might have been in the process of hiding get full opacity.
+         //
+-        // We tween any notification showing in the banner mode to banner height
+-        // (this._notificationWidget.y = -this._notificationWidget.height).
++        // We tween any notification showing in the banner mode to the appropriate height
++        // (which is banner height or expanded height, depending on the notification state)
+         // This ensures that both new notifications and notifications in the banner mode that might
+-        // have been in the process of hiding are shown with the banner height.
++        // have been in the process of hiding are shown with the correct height.
+         //
+         // We use this._showNotificationCompleted() onComplete callback to extend the time the updated
+         // notification is being shown.
+-        //
+-        // We don't set the y parameter for the tween for expanded notifications because
+-        // this._expandNotification() will result in getting this._notificationWidget.y set to the appropriate
+-        // fully expanded value.
++
+         let tweenParams = { opacity: 255,
++                            y: -this._notificationWidget.height,
+                             time: ANIMATION_TIME,
+                             transition: 'easeOutQuad',
+                             onComplete: this._showNotificationCompleted,
+                             onCompleteScope: this
+                           };
+-        if (!this._notification.expanded)
+-            tweenParams.y = -this._notificationWidget.height;
+ 
+         this._tween(this._notificationWidget, '_notificationState', State.SHOWN, tweenParams);
+    },
+--
+cgit v0.9.0.2
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 0b0d070b9..e32fe24e5 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177827 2013-02-09 19:07:04Z giovanni $
+# $Id: PKGBUILD 178048 2013-02-14 17:38:00Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2013.02.05
+pkgver=2013.02.11
 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=('ca18bcf954c6531b8de8e1a10be6df54')
+md5sums=('1dc7bc4dee0c63efe1eefe13478d168d')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index bb43785ee..2bb6c93cc 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178012 2013-02-13 16:03:52Z foutrelis $
+# $Id: PKGBUILD 178040 2013-02-14 01:37:10Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.10.7
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
 license=('GPL')
@@ -15,12 +15,18 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
              'tk' 'ca-certificates' 'intltool' 'networkmanager')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+        pidgin-2.10.7-link-libirc-to-libsasl2.patch)
+sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192'
+            '063723d5dc5726c43137b4b383c9d07c2c008391f6a626faaf6cedd31a2f1e8f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # https://developer.pidgin.im/ticket/15517
+  patch -Np1 -i "$srcdir/pidgin-2.10.7-link-libirc-to-libsasl2.patch"
+  autoreconf -vi
+
   # Use Python 2
   sed -i 's/env python$/&2/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}
diff --git a/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch b/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch
new file mode 100644
index 000000000..abffa20b8
--- /dev/null
+++ b/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch
@@ -0,0 +1,12 @@
+diff -upr pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am pidgin-2.10.7/libpurple/protocols/irc/Makefile.am
+--- pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am	2013-02-14 02:44:47.000000000 +0200
++++ pidgin-2.10.7/libpurple/protocols/irc/Makefile.am	2013-02-14 02:49:58.000000000 +0200
+@@ -27,7 +27,7 @@ else
+ st =
+ pkg_LTLIBRARIES   = libirc.la
+ libirc_la_SOURCES = $(IRCSOURCES)
+-libirc_la_LIBADD  = $(GLIB_LIBS)
++libirc_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS)
+ 
+ endif
+ 
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
index 7e8a3a2b5..f465c739f 100644
--- a/extra/qtwebkit/PKGBUILD
+++ b/extra/qtwebkit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175761 2013-01-21 13:09:08Z andrea $
+# $Id: PKGBUILD 178044 2013-02-14 09:17:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtwebkit
-pkgver=2.3.beta1
-_pkgver=2.3-beta1
+pkgver=2.3.beta2
+_pkgver=2.3-beta2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://trac.webkit.org/wiki/QtWebKit'
@@ -17,7 +17,7 @@ source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/
         "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz"
         'use-python2.patch'
         'qwebview.patch')
-sha1sums=('e5a8ffe62fc57dbbea2110241077bebbcd605fd2'
+sha1sums=('b1bfa9e3303ce9c95eec0a1e66b2b812b844bf08'
           'f5880f11c139d7d8d01ecb8d874535f7d9553198'
           '315b6ff603f35e5492a036f7082f6aa075dfb607'
           'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f')
@@ -27,11 +27,17 @@ build() {
 
   patch -p1 -i "${srcdir}"/use-python2.patch
 
+  OPTS="--no-webkit2"
+  if [ "${CARCH}" = "i686" ]; then
+      # FS#33418
+      OPTS="${OPTS} --no-sse2"
+  fi
+
   export QTDIR=/usr
   Tools/Scripts/build-webkit --qt \
     --makeargs="${MAKEFLAGS}" \
     --prefix=/usr \
-    --no-webkit2
+    ${OPTS}
 
   cd ../