aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-11-16 19:23:51 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-11-16 19:23:51 +0000
commit36a5815db17dcf75fa0af39ef4c7c3ccb9c3db36 (patch)
treeea411fcd4ad7894bcbbfcc799fd31e312cd0c7e2
parent339341856d8fbd1d4faa8fe52cf18d4081b79a70 (diff)
downloadaports-36a5815db17dcf75fa0af39ef4c7c3ccb9c3db36.tar.bz2
aports-36a5815db17dcf75fa0af39ef4c7c3ccb9c3db36.tar.xz
main/gnome-screensaver: rebuild against libnotify-0.7
-rw-r--r--main/gnome-screensaver/APKBUILD10
-rw-r--r--main/gnome-screensaver/gnome-screensaver-2.30.2-libnotify-0.7.patch26
2 files changed, 32 insertions, 4 deletions
diff --git a/main/gnome-screensaver/APKBUILD b/main/gnome-screensaver/APKBUILD
index 1b675a89ca..bcc9d9f26b 100644
--- a/main/gnome-screensaver/APKBUILD
+++ b/main/gnome-screensaver/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=gnome-screensaver
pkgver=2.30.2
-pkgrel=0
+pkgrel=1
pkgdesc="GNOME screensaver collection"
url="http://www.gnome.org"
arch="all"
@@ -31,8 +31,9 @@ depends_dev="gtk+-dev
libxrandr-dev"
makedepends="$depends_dev intltool gobject-introspection-dev"
install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
-subpackages=
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
+subpackages="$pkgname-lang"
+source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+ gnome-screensaver-2.30.2-libnotify-0.7.patch"
_builddir="${srcdir}/${pkgname}-${pkgver}"
prepare() {
@@ -61,4 +62,5 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="0fbe6e610e6847ac1e69d49b1e1f0582 gnome-screensaver-2.30.2.tar.bz2"
+md5sums="0fbe6e610e6847ac1e69d49b1e1f0582 gnome-screensaver-2.30.2.tar.bz2
+e517e9d432e97f89b706655dae21ed71 gnome-screensaver-2.30.2-libnotify-0.7.patch"
diff --git a/main/gnome-screensaver/gnome-screensaver-2.30.2-libnotify-0.7.patch b/main/gnome-screensaver/gnome-screensaver-2.30.2-libnotify-0.7.patch
new file mode 100644
index 0000000000..6eeb168190
--- /dev/null
+++ b/main/gnome-screensaver/gnome-screensaver-2.30.2-libnotify-0.7.patch
@@ -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);