Sun Dec 30 01:50:38 PST 2012

6 files changed, 79 insertions, 30 deletions

diff --git a/community/awn-extras-applets/PKGBUILD b/community/awn-extras-applets/PKGBUILD
index 59fd1bcdd..7ce9fca85 100644
--- a/community/awn-extras-applets/PKGBUILD
+++ b/community/awn-extras-applets/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=awn-extras-applets
 _pkgname=awn-extras
 pkgver=0.4.0
-pkgrel=14
+pkgrel=15
 pkgdesc="Collection of applets for avant-window-navigator"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/awn-extras"
@@ -37,6 +37,7 @@ source=(http://launchpad.net/$_pkgname/0.4/$pkgver/+download/$_pkgname-$pkgver.t
         fix-shinyswitcher-scrolling.patch
         fix-weather-applet.patch
         awn-extras-glib2.32.patch
+        cairo-menu-upower.patch
         check-dependencies.patch)
 md5sums=('b559d68cd6ad295c961c20fcc5d9f9c0'
          '2df8dfd8f0f1d458c09b56983c7d049f'
@@ -45,6 +46,7 @@ md5sums=('b559d68cd6ad295c961c20fcc5d9f9c0'
          '755c57dfbb65a314f247277918ec95ac'
          'bc22bb3e81aca0f651ae8acee1ce2f00'
          '1cfcd1e5dc92c4c7c306472d42a21c2d'
+         'f9715f531947967d6549a358ea8d2979'
          '8f920c7dde987d66eef7d3739df1051d')
 
 build() {
@@ -55,6 +57,7 @@ build() {
   patch -Np0 -i "$srcdir/fix-shinyswitcher-scrolling.patch"
   patch -Np1 -i "$srcdir/fix-weather-applet.patch"
   patch -Np0 -i "$srcdir/awn-extras-glib2.32.patch"
+  patch -Np1 -i "$srcdir/cairo-menu-upower.patch"
   patch -Np1 -i "$srcdir/check-dependencies.patch"
 
   # Python2 fix
diff --git a/community/awn-extras-applets/cairo-menu-upower.patch b/community/awn-extras-applets/cairo-menu-upower.patch
new file mode 100644
index 000000000..08e79a68d
--- /dev/null
+++ b/community/awn-extras-applets/cairo-menu-upower.patch
@@ -0,0 +1,51 @@
+diff -Naur awn-extras-0.4.0.orig/applets/maintained/cairo-menu/gnome-menu-builder.c awn-extras-0.4.0/applets/maintained/cairo-menu/gnome-menu-builder.c
+--- awn-extras-0.4.0.orig/applets/maintained/cairo-menu/gnome-menu-builder.c	2010-04-10 01:26:19.000000000 +0200
++++ awn-extras-0.4.0/applets/maintained/cairo-menu/gnome-menu-builder.c	2012-12-29 05:46:45.971364855 +0100
+@@ -104,7 +104,7 @@
+ 
+   if (have_gnome_session_manager)
+   {
+-    add_special_item (menu,_("Logout"),"gnome-logout","gnome-session-save","--logout-dialog --gui");
++    add_special_item (menu,_("Logout"),"gnome-logout","gnome-session-quit","--logout");
+   }
+   else if (dbus_service_exists ("org.xfce.SessionManager") )
+   {
+@@ -121,35 +121,13 @@
+   {
+     add_special_item (menu,_("Lock Screen"),"system-lock-screen","xscreensaver-command","-lock");
+   }
+-  if (dbus_service_exists ("org.freedesktop.PowerManagement"))
+-  {
+-    if (!add_special_item (menu,_("Suspend"),"gnome-session-suspend","gnome-power-cmd","suspend"))
+-    {
+-      add_special_item (menu,_("Suspend"),"gnome-session-suspend","dbus-send","--session --dest=org.freedesktop.PowerManagement --type=method_call --print-reply --reply-timeout=2000 /org/freedesktop/PowerManagement org.freedesktop.PowerManagement.Suspend");
+-    }
+-    
+-    if (!add_special_item (menu,_("Hibernate"),"gnome-session-hibernate","gnome-power-cmd","hibernate"))
+-    {
+-      add_special_item (menu,_("Hibernate"),"gnome-session-hibernate","dbus-send","--session --dest=org.freedesktop.PowerManagement --type=method_call --print-reply --reply-timeout=2000 /org/freedesktop/PowerManagement org.freedesktop.PowerManagement.Hibernate");
+-    }
+ 
+-  }
+-  else if (dbus_service_exists ("org.gnome.PowerManagement"))
+-  {
+-    if (!add_special_item (menu,_("Suspend"),"gnome-session-suspend","gnome-power-cmd","suspend"))
+-    {
+-
+-    }
+-      
+-    if (!add_special_item (menu,_("Hibernate"),"gnome-session-hibernate","gnome-power-cmd","hibernate"))
+-    {
++  add_special_item (menu,_("Suspend"),"gnome-session-suspend","dbus-send","--system --dest=org.freedesktop.UPower --type=method_call --print-reply --reply-timeout=2000 /org/freedesktop/UPower org.freedesktop.UPower.Suspend");
++  add_special_item (menu,_("Hibernate"),"gnome-session-hibernate","dbus-send","--system --dest=org.freedesktop.UPower --type=method_call --print-reply --reply-timeout=2000 /org/freedesktop/UPower org.freedesktop.UPower.Hibernate");
+ 
+-    }
+-  }
+-  
+   if (have_gnome_session_manager)
+   {
+-    add_special_item (menu,_("Shutdown"),"gnome-logout","gnome-session-save","--shutdown-dialog --gui");  
++    add_special_item (menu,_("Shutdown"),"gnome-shutdown","gnome-session-quit","--power-off");  
+   }
+   gtk_widget_show_all (menu);
+   return FALSE;
diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD
index d4189a026..cc4de1481 100644
--- a/community/murmur/PKGBUILD
+++ b/community/murmur/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 73303 2012-07-06 03:27:30Z svenstaro $
+# $Id: PKGBUILD 81777 2012-12-29 07:18:42Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com>
 # Contributor: Malte Rabenseifner <malte@zearan.de> 
 
 pkgname=murmur
 pkgver=1.2.3
-pkgrel=8
+pkgrel=9
 pkgdesc="The voice chat application server for Mumble"
 arch=('i686' 'x86_64')
 url="http://mumble.sourceforge.net"
diff --git a/community/murmur/murmur.install b/community/murmur/murmur.install
index ecd116a82..562ec4171 100644
--- a/community/murmur/murmur.install
+++ b/community/murmur/murmur.install
@@ -1,7 +1,5 @@
 post_install() {
-    # bug: dbus reload here doesn't work
-    # workaround: it seems to work if you do it a few seconds later, manually
-    /etc/rc.d/dbus reload > /dev/null 
+    systemd-tmpfiles --create usr/lib/tmpfiles.d/murmur.conf
 
 	getent group murmur > /dev/null || groupadd -r -g 86 murmur 1>/dev/null
 	getent passwd murmur > /dev/null || useradd -r -u 86 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null
@@ -9,23 +7,13 @@ post_install() {
 	chown -R murmur:murmur /var/lib/murmur 
 	chown -R murmur:murmur /var/log/murmur
 
-	echo
-	echo '==> Set the SuperUser password with (as root):'
-	echo '==>   murmurd -ini /etc/murmur.ini -supw PASSWORD'
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	[ -f /var/run/daemons/murmur ] && /etc/rc.d/murmur stop > /dev/null
-	killall -u murmur -5
-	sleep 1
+	echo "You might have to reload dbus before launching murmur:"
+    echo "    systemctl reload bus"
+	echo "Don't forget to set the superuser password:"
+	echo "    murmurd -ini /etc/murmur.ini -supw <your-password>"
 }
 
 post_remove() {
-    /etc/rc.d/dbus reload > /dev/null
 	getent passwd murmur > /dev/null && userdel murmur 1>/dev/null
 	getent group murmur > /dev/null && groupdel murmur 1>/dev/null
 }
diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD
index 915e7cf4d..5657eed00 100644
--- a/community/rekonq/PKGBUILD
+++ b/community/rekonq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79425 2012-11-04 20:15:12Z plewis $
+# $Id: PKGBUILD 81783 2012-12-29 12:37:02Z andrea $
 # Maintainer: Peter Lewis <plewis@aur.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net>
 
 pkgname=rekonq
-pkgver=1.3
+pkgver=2.0
 pkgrel=1
 pkgdesc='A WebKit based web browser for KDE'
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('qca-ossl: to use the sync handler')
 install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha256sums=('8db67e674b3dd013a6511f9612829f958ca95a2d515f89fb999f5568bfed7ffb')
+sha256sums=('380aa337b561ee0c5eb1aa8401f7bd8d98a2b18e645e92f3387baae06d501d84')
 
 build(){
   mkdir build
diff --git a/community/supertuxkart/PKGBUILD b/community/supertuxkart/PKGBUILD
index bd5122bd8..a31909eef 100644
--- a/community/supertuxkart/PKGBUILD
+++ b/community/supertuxkart/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81266 2012-12-15 06:19:59Z svenstaro $
+# $Id: PKGBUILD 81785 2012-12-29 16:57:50Z arodseth $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -6,19 +6,25 @@
 
 pkgname=supertuxkart
 pkgver=0.8
-pkgrel=2
-pkgdesc="A kart racing game featuring Tux and his friends"
+pkgrel=3
+pkgdesc='Kart racing game featuring Tux and his friends'
 arch=('i686' 'x86_64')
-url="http://supertuxkart.sourceforge.net/"
+url='http://supertuxkart.sourceforge.net/'
 license=('GPL2')
 depends=('openal' 'libvorbis' 'libgl' 'fribidi' 'curl')
-makedepends=('cmake' 'subversion' 'mesa')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2)
+makedepends=('cmake' 'subversion' 'mesa' 'imagemagick' 'setconf')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2")
 md5sums=('0b939ce601374758938119e0b0dd1fec')
 
 build() {
   cd ${srcdir}/SuperTuxKart-${pkgver}
 
+  convert "data/${pkgname}_64.xpm" "data/$pkgname.png"
+  _fn="data/${pkgname}_desktop.template"
+  setconf "$_fn" Exec "$pkgname --log=file"
+  setconf "$_fn" TryExec "$pkgname"
+  setconf "$_fn" Icon "$pkgname"
+
   cd lib/irrlicht/source/Irrlicht
   NDEBUG=1 make
 
@@ -43,7 +49,8 @@ package() {
   cd build
   make DESTDIR=${pkgdir} install
 
-  sed -i "s#usr/games/supertuxkart#usr/bin/supertuxkart#" ${pkgdir}/usr/share/applications/supertuxkart.desktop
+  cd ../data
+  install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
 }
 
 # vim:set ts=2 sw=2 et: