From 36a5815db17dcf75fa0af39ef4c7c3ccb9c3db36 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 16 Nov 2011 19:23:51 +0000
Subject: main/gnome-screensaver: rebuild against libnotify-0.7

---
 main/gnome-screensaver/APKBUILD                    | 10 +++++----
 .../gnome-screensaver-2.30.2-libnotify-0.7.patch   | 26 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 main/gnome-screensaver/gnome-screensaver-2.30.2-libnotify-0.7.patch

diff --git a/main/gnome-screensaver/APKBUILD b/main/gnome-screensaver/APKBUILD
index 1b675a89c..bcc9d9f26 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 000000000..6eeb16819
--- /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);
-- 
cgit v1.2.3