Fri Dec 30 23:14:51 UTC 2011

9 files changed, 96 insertions, 19 deletions

diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index f079c7170..a372d0675 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145269 2011-12-20 21:38:03Z ibiru $
+# $Id: PKGBUILD 145727 2011-12-29 10:11:17Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
 pkgver=3.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+ is a multi-platform toolkit (v3)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -14,12 +14,15 @@ options=('!libtool' '!docs')
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz
-        settings.ini)
+        settings.ini
+        empty_grid.patch)
 sha256sums=('e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
+            'd05ccfeaf4c558668b72aaacdd11356b6419d2359def6c1b9af1b465fa5a3c25')
 
 build() {
     cd "$srcdir/gtk+-$pkgver"
+    patch -Np1 -i "$srcdir/empty_grid.patch"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
diff --git a/extra/gtk3/empty_grid.patch b/extra/gtk3/empty_grid.patch
new file mode 100644
index 000000000..45aefde47
--- /dev/null
+++ b/extra/gtk3/empty_grid.patch
@@ -0,0 +1,29 @@
+From 97c1df4bb05966a4ce53b07271eff2f53284e235 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Fri, 21 Oct 2011 20:23:03 +0000
+Subject: Fix natural/min widht calculations for empty grids
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660139
+---
+diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
+index a122ad4..78ae2ff 100644
+--- a/gtk/gtkgrid.c
++++ b/gtk/gtkgrid.c
+@@ -927,8 +927,13 @@ gtk_grid_request_sum (GtkGridRequest *request,
+   linedata = &priv->linedata[orientation];
+   lines = &request->lines[orientation];
+ 
+-  min = (nonempty - 1) * linedata->spacing;
+-  nat = (nonempty - 1) * linedata->spacing;
++  min = 0;
++  nat = 0;
++  if (nonempty > 0)
++    {
++      min = (nonempty - 1) * linedata->spacing;
++      nat = (nonempty - 1) * linedata->spacing;
++    }
+ 
+   for (i = 0; i < lines->max - lines->min; i++)
+     {
+--
+cgit v0.9.0.2
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index b3b8fc901..cba95a38d 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145657 2011-12-26 12:00:06Z andrea $
+# $Id: PKGBUILD 145730 2011-12-29 13:52:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
 pkgver=4.7.4
-pkgrel=3
+pkgrel=4
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -18,10 +18,12 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch')
+        'kde-applications-menu.patch' 'archlinux-menu.patch'
+        'fix-knotify-filepath.patch')
 sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+          '3312f6005aa56a9b992c74008fe5b314f1c8ffba')
 
 build() {
        cd "${srcdir}"/${pkgname}-${pkgver}
@@ -31,6 +33,9 @@ build() {
        # add Archlinux menu entry
        patch -p1 -i "${srcdir}"/archlinux-menu.patch
 
+       # https://bugs.kde.org/show_bug.cgi?id=285028
+       patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
+
        cd "${srcdir}"
        mkdir build
        cd build
diff --git a/extra/kdelibs/fix-knotify-filepath.patch b/extra/kdelibs/fix-knotify-filepath.patch
new file mode 100644
index 000000000..2cd995e97
--- /dev/null
+++ b/extra/kdelibs/fix-knotify-filepath.patch
@@ -0,0 +1,13 @@
+diff --git a/knotify/config/knotifyconfigactionswidget.cpp b/knotify/config/knotifyconfigactionswidget.cpp
+index 88d18b6..0e76658 100644
+--- a/knotify/config/knotifyconfigactionswidget.cpp
++++ b/knotify/config/knotifyconfigactionswidget.cpp
+@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay(  )
+ 	KUrl soundURL = m_ui.Sound_select->url();
+ 	if ( soundURL.isRelative() )
+ 	{
+-		QString soundString = soundURL.toLocalFile();
++		QString soundString = m_ui.Sound_select->text();
+ 		// we need a way to get the application name in order to ba able to do this :
+ 		/*QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
+ 		search = KGlobal::mainComponent().dirs()->findResource("data", search);
diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD
index 11f2ff735..c473d2bca 100644
--- a/extra/libvncserver/PKGBUILD
+++ b/extra/libvncserver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140764 2011-10-18 19:48:49Z andrea $
+# $Id: PKGBUILD 145736 2011-12-29 15:45:13Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libvncserver
-pkgver=0.9.8.1
+pkgver=0.9.8.2
 pkgrel=1
 pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('libjpeg' 'gnutls' 'libgcrypt')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz")
-md5sums=('51e972bd26c098b0b8d4687af6afbeb1')
+md5sums=('dfed1dcc25cb338c7fdbcda2c3df7f50')
 
 build() {
   cd "${srcdir}/LibVNCServer-${pkgver}"
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
index 7bcbef6c2..9a83fc925 100644
--- a/extra/mono/PKGBUILD
+++ b/extra/mono/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140778 2011-10-19 07:11:57Z daniel $
+# $Id: PKGBUILD 145729 2011-12-29 13:13:45Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Brice Carpentier <brice@dlfp.org>
 
 pkgname=mono
-pkgver=2.10.6
+pkgver=2.10.8
 pkgrel=1
 pkgdesc="Free implementation of the .NET platform including runtime and compiler"
 arch=(i686 x86_64)
@@ -14,9 +14,9 @@ makedepends=('pkgconfig')
 options=('!libtool' '!makeflags')
 provides=('monodoc')
 conflicts=('monodoc')
-source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz
         mono.rc.d)
-md5sums=('c442cef4cd6668b0a1391a661f6815a9'
+md5sums=('411a2d9bcfc37a61eb9aedba88b40533'
          '8315e46c6a6e9625502521fc0ad1a322')
 
 build() {
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index 18ed8e7a4..269a1cbcf 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id
+# $Id: PKGBUILD 145758 2011-12-30 04:10:39Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Douglas Soares de Andrade
@@ -6,7 +6,7 @@
 
 pkgname=varnish
 pkgver=3.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="High-performance HTTP accelerator"
 arch=('i686' 'x86_64')
 url="http://www.varnish-cache.org/"
@@ -20,8 +20,8 @@ source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
         "$pkgname.conf.d"
         "rc.$pkgname")
 md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a'
-         'd42eebc7f0ac429d9740125ff1e61daf'
-         '18b7747020ecfe2eac7445971a7014e3')
+         'edd1237d097d72173d9772754335890c'
+         'fc9bf7a47479c4ad01c0e555d4e74f91')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/varnish/rc.varnish b/extra/varnish/rc.varnish
index 2ebd97e33..4e4fde60d 100644
--- a/extra/varnish/rc.varnish
+++ b/extra/varnish/rc.varnish
@@ -4,6 +4,27 @@
 . /etc/rc.d/functions
 . /etc/conf.d/varnish
 
+reload_vcl() {
+  local activecfg newcfg
+
+  if [[ -z $VARNISH_CFG ]]; then
+    printf '==> ERROR: VARNISH_CFG is undefined in /etc/conf.d/varnish!\n'
+    return 1
+  fi
+
+  activecfg=$(varnishadm -T localhost:6082 "vcl.list" | awk '/active/{ print $3 }')
+  if [[ -z $activecfg ]]; then
+    printf '==> ERROR: No active VCL found!\n'
+    return 1
+  fi
+
+  printf -v newcfg 'vcl-%(%s)T' -1
+
+  varnishadm -T localhost:6082 "vcl.load $newcfg $VARNISH_CFG" &&
+  varnishadm -T localhost:6082 "vcl.use $newcfg" &&
+  varnishadm -T localhost:6082 "vcl.discard $activecfg" || return 1
+}
+
 pidfile=/run/varnish.pid
 if [[ -r $pidfile ]]; then
   read -r PID < "$pidfile"
@@ -40,6 +61,10 @@ case "$1" in
     sleep 1
     $0 start
     ;;
+  reload)
+    stat_busy "Recompiling and Reloading VCL"
+    reload_vcl && stat_done || stat_fail
+    ;;
   *)
     echo "usage: $0 {start|stop|restart}"
   ;;
diff --git a/extra/varnish/varnish.conf.d b/extra/varnish/varnish.conf.d
index 2970468b7..904ca119f 100644
--- a/extra/varnish/varnish.conf.d
+++ b/extra/varnish/varnish.conf.d
@@ -7,3 +7,5 @@ VARNISHD_OPTS="-a 0.0.0.0:80 \
                -T localhost:6082 \
                -s malloc,64M
                -u nobody -g nobody"
+
+VARNISH_CFG="/etc/varnish/default.vcl"