[oe] [meta-gnome 2/2] libnotify: update to 0.7.5 and drop libnotify3

[Andreas Müller]

removing tests drops dependencies on gtk

Tested by:

* building nautilus3 (the only recipe found depending on libnotify3)
* running xfce-based image and checked notififations

Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
---
 .../libnotify/libnotify/0001-disable-tests.patch   |   54 ++++++++++++++++++++
 .../recipes-gnome/libnotify/libnotify3_0.7.3.bb    |   13 -----
 .../recipes-gnome/libnotify/libnotify_0.6.0.bb     |   17 ------
 .../recipes-gnome/libnotify/libnotify_0.7.5.bb     |   17 ++++++
 4 files changed, 71 insertions(+), 30 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/libnotify/libnotify/0001-disable-tests.patch
 delete mode 100644 meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb
 delete mode 100644 meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb
 create mode 100644 meta-gnome/recipes-gnome/libnotify/libnotify_0.7.5.bb

diff --git a/meta-gnome/recipes-gnome/libnotify/libnotify/0001-disable-tests.patch b/meta-gnome/recipes-gnome/libnotify/libnotify/0001-disable-tests.patch
new file mode 100644
index 0000000..372e6fd
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libnotify/libnotify/0001-disable-tests.patch
@@ -0,0 +1,54 @@
+From ff403cb57c307850cadddec2b6b1c0c5ee609249 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at googlemail.com>
+Date: Wed, 17 Apr 2013 14:00:32 +0200
+Subject: [PATCH] disable tests
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+tests depend on gtk3 but many of us are still using gtk+.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
+---
+ Makefile.am  |    2 +-
+ configure.ac |    4 ----
+ 2 files changed, 1 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 9e12a02..609fae0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = libnotify docs tools tests
++SUBDIRS = libnotify docs tools
+ 
+ pcdata_DATA = libnotify.pc
+ pcdatadir = $(libdir)/pkgconfig
+diff --git a/configure.ac b/configure.ac
+index ae2d2d7..e13adcf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,16 +86,12 @@ AC_EXEEXT
+ LT_PREREQ([2.2])
+ LT_INIT
+ 
+-REQ_GTK_VERSION=2.90
+ REQ_GLIB_VERSION=2.26.0
+ 
+ pkg_modules="gdk-pixbuf-2.0 glib-2.0 >= $REQ_GLIB_VERSION gio-2.0 >= $REQ_GLIB_VERSION"
+ AC_SUBST([pkg_modules])
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ 
+-tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION"
+-PKG_CHECK_MODULES(TESTS, [$tests_modules])
+-
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+ AC_SUBST(GLIB_GENMARSHAL)
+ 
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb b/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb
deleted file mode 100644
index 4c46ec4..0000000
--- a/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Send desktop notifications to a notification daemon"
-SECTION = "libs"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-DEPENDS = "dbus gtk+3"
-
-BPN = "libnotify"
-
-inherit gnome lib_package
-
-SRC_URI[archive.md5sum] = "d20676bde7bd2d276508d019dc7276f1"
-SRC_URI[archive.sha256sum] = "322541fdf276eb803686df81763a5186af041b2ee3e9cc5fa1dc86c550388c88"
diff --git a/meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb b/meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb
deleted file mode 100644
index 0a590e3..0000000
--- a/meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Send desktop notifications to a notification daemon"
-SECTION = "libs"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-PR = "r1"
-
-DEPENDS = "dbus gtk+"
-
-inherit gnome
-SRC_URI[archive.md5sum] = "732c9d2cd5eb6a9069264a319d330516"
-SRC_URI[archive.sha256sum] = "73b16a79bb2fed62dcf146b11c4405776cb96a09dce66379ca541da7dbd64210"
-
-do_configure_prepend() {
-    sed -i /GTK3/d configure.ac
-    sed -i -e /test-gtk3/d -e 's/test-xy-stress \\/test-xy-stress/' tests/Makefile.am
-}
diff --git a/meta-gnome/recipes-gnome/libnotify/libnotify_0.7.5.bb b/meta-gnome/recipes-gnome/libnotify/libnotify_0.7.5.bb
new file mode 100644
index 0000000..718d504
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libnotify/libnotify_0.7.5.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Send desktop notifications to a notification daemon"
+SECTION = "libs"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+DEPENDS = "dbus glib-2.0"
+
+inherit gnome
+GNOME_COMPRESS_TYPE = "xz"
+
+SRC_URI += "file://0001-disable-tests.patch"
+SRC_URI[archive.md5sum] = "8e9f8bd26517bc197ab1df748df289a9"
+SRC_URI[archive.sha256sum] = "4378cb47874ba4d5f759b7890d8d28d086e81d3f0bd4f6e84e5ab66d82ffb652"
+
+PROVIDES += "libnotify3"
+RPROVIDES_${PN} += "libnotify3"
+RREPLACES_${PN} += "libnotify3"
-- 
1.7.6.5