[arch-commits] Commit in gnome-screensaver/repos (6 files)

Ionut Biru ibiru at archlinux.org
Mon Mar 7 09:08:53 UTC 2011


    Date: Monday, March 7, 2011 @ 04:08:52
  Author: ibiru
Revision: 112853

libnotify 0.7 rebuild

Added:
  gnome-screensaver/repos/staging-i686/
  gnome-screensaver/repos/staging-i686/gnome-screensaver-2.30.2-libnotify-0.7.patch
  gnome-screensaver/repos/staging-x86_64/
  gnome-screensaver/repos/staging-x86_64/gnome-screensaver-2.30.2-libnotify-0.7.patch
Modified:
  gnome-screensaver/repos/staging-i686/PKGBUILD
  gnome-screensaver/repos/staging-x86_64/PKGBUILD

-------------------------------------------------------------+
 PKGBUILD                                                    |   24 +++++----
 staging-i686/gnome-screensaver-2.30.2-libnotify-0.7.patch   |   26 ++++++++++
 staging-x86_64/gnome-screensaver-2.30.2-libnotify-0.7.patch |   26 ++++++++++
 3 files changed, 66 insertions(+), 10 deletions(-)

Modified: staging-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-03-06 14:16:33 UTC (rev 112757)
+++ staging-i686/PKGBUILD	2011-03-07 09:08:52 UTC (rev 112853)
@@ -3,26 +3,28 @@
 
 pkgname=gnome-screensaver
 pkgver=2.30.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://live.gnome.org/GnomeScreensaver"
 backup=(etc/pam.d/gnome-screensaver)
-depends=('gnome-menus>=2.30.4' 'libgnomekbd>=2.32.0' 'libgl' 'libnotify>=0.4.5' 'gnome-desktop>=2.32.0')
+depends=('gnome-menus>=2.30.4' 'libgnomekbd>=2.32.0' 'libgl' 'libnotify>=0.7.1' 'gnome-desktop>=2.32.0')
 makedepends=('pkgconfig' 'intltool' 'mesa' 'xscreensaver' 'libxss' 'libxslt')
 optdepends=('xscreensaver')
 groups=('gnome')
 options=(!emptydirs)
 install=gnome-screensaver.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
-	      gnome-screensaver.pam)
+	      gnome-screensaver.pam
+              gnome-screensaver-2.30.2-libnotify-0.7.patch)
 sha256sums=('dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa'
-            '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2')
+            '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2'
+            'fd79843008fb93d6caa5f84dd4766c99895ce520517b17a2a334da8c869041bb')
 
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/gnome-screensaver-2.30.2-libnotify-0.7.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-screensaver \
       --localstatedir=/var \

Added: staging-i686/gnome-screensaver-2.30.2-libnotify-0.7.patch
===================================================================
--- staging-i686/gnome-screensaver-2.30.2-libnotify-0.7.patch	                        (rev 0)
+++ staging-i686/gnome-screensaver-2.30.2-libnotify-0.7.patch	2011-03-07 09:08:52 UTC (rev 112853)
@@ -0,0 +1,26 @@
+diff -Nur gnome-screensaver-2.30.2.orig/src/gs-lock-plug.c gnome-screensaver-2.30.2/src/gs-lock-plug.c
+--- gnome-screensaver-2.30.2.orig/src/gs-lock-plug.c	2010-09-28 13:36:51.000000000 -0700
++++ gnome-screensaver-2.30.2/src/gs-lock-plug.c	2011-03-07 00:54:44.086669840 -0800
+@@ -47,6 +47,10 @@
+ #include <libnotify/notify.h>
+ #endif
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #include "gs-lock-plug.h"
+ 
+ #include "gs-debug.h"
+@@ -1090,7 +1094,11 @@
+         strftime (summary, 128, "%X", tmp);
+ 
+         notify_init ("gnome-screensaver-dialog");
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++        note = notify_notification_new (summary, escaped_text, NULL);
++#else
+         note = notify_notification_new (summary, escaped_text, NULL, NULL);
++#endif
+         notify_notification_set_timeout (note, NOTIFY_EXPIRES_NEVER);
+         notify_notification_show (note, NULL);
+         g_object_unref (note);

Modified: staging-x86_64/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-03-06 14:16:33 UTC (rev 112757)
+++ staging-x86_64/PKGBUILD	2011-03-07 09:08:52 UTC (rev 112853)
@@ -3,26 +3,28 @@
 
 pkgname=gnome-screensaver
 pkgver=2.30.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://live.gnome.org/GnomeScreensaver"
 backup=(etc/pam.d/gnome-screensaver)
-depends=('gnome-menus>=2.30.4' 'libgnomekbd>=2.32.0' 'libgl' 'libnotify>=0.4.5' 'gnome-desktop>=2.32.0')
+depends=('gnome-menus>=2.30.4' 'libgnomekbd>=2.32.0' 'libgl' 'libnotify>=0.7.1' 'gnome-desktop>=2.32.0')
 makedepends=('pkgconfig' 'intltool' 'mesa' 'xscreensaver' 'libxss' 'libxslt')
 optdepends=('xscreensaver')
 groups=('gnome')
 options=(!emptydirs)
 install=gnome-screensaver.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
-	      gnome-screensaver.pam)
+	      gnome-screensaver.pam
+              gnome-screensaver-2.30.2-libnotify-0.7.patch)
 sha256sums=('dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa'
-            '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2')
+            '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2'
+            'fd79843008fb93d6caa5f84dd4766c99895ce520517b17a2a334da8c869041bb')
 
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/gnome-screensaver-2.30.2-libnotify-0.7.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-screensaver \
       --localstatedir=/var \

Added: staging-x86_64/gnome-screensaver-2.30.2-libnotify-0.7.patch
===================================================================
--- staging-x86_64/gnome-screensaver-2.30.2-libnotify-0.7.patch	                        (rev 0)
+++ staging-x86_64/gnome-screensaver-2.30.2-libnotify-0.7.patch	2011-03-07 09:08:52 UTC (rev 112853)
@@ -0,0 +1,26 @@
+diff -Nur gnome-screensaver-2.30.2.orig/src/gs-lock-plug.c gnome-screensaver-2.30.2/src/gs-lock-plug.c
+--- gnome-screensaver-2.30.2.orig/src/gs-lock-plug.c	2010-09-28 13:36:51.000000000 -0700
++++ gnome-screensaver-2.30.2/src/gs-lock-plug.c	2011-03-07 00:54:44.086669840 -0800
+@@ -47,6 +47,10 @@
+ #include <libnotify/notify.h>
+ #endif
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #include "gs-lock-plug.h"
+ 
+ #include "gs-debug.h"
+@@ -1090,7 +1094,11 @@
+         strftime (summary, 128, "%X", tmp);
+ 
+         notify_init ("gnome-screensaver-dialog");
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++        note = notify_notification_new (summary, escaped_text, NULL);
++#else
+         note = notify_notification_new (summary, escaped_text, NULL, NULL);
++#endif
+         notify_notification_set_timeout (note, NOTIFY_EXPIRES_NEVER);
+         notify_notification_show (note, NULL);
+         g_object_unref (note);




More information about the arch-commits mailing list