Patchwork [2011.03-maintenance,1/5] libwnck: Fix build without needing introspection-native

login
mail settings
Submitter Khem Raj
Date Aug. 24, 2012, 5:57 a.m.
Message ID <1345787825-9950-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/35269/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Khem Raj - Aug. 24, 2012, 5:57 a.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes/gnome/libwnck/introspection.patch |   13 +++++++++++++
 recipes/gnome/libwnck_2.30.5.bb           |   11 +++++------
 2 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 recipes/gnome/libwnck/introspection.patch
Tom Rini - Aug. 27, 2012, 10:39 p.m.
On Thu, Aug 23, 2012 at 10:57:01PM -0700, Khem Raj wrote:

> Signed-off-by: Khem Raj <raj.khem@gmail.com>

Along with the rest of the series, applied, thanks.
Khem Raj - Aug. 27, 2012, 10:50 p.m.
On Mon, Aug 27, 2012 at 3:39 PM, Tom Rini <tom.rini@gmail.com> wrote:
> On Thu, Aug 23, 2012 at 10:57:01PM -0700, Khem Raj wrote:
>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
> Along with the rest of the series, applied, thanks.

Thanks, I realised that I havent sent one last patch which I have sent
as a separate patch now. Please consider that one too.
>
> --
> Tom
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Patch

diff --git a/recipes/gnome/libwnck/introspection.patch b/recipes/gnome/libwnck/introspection.patch
new file mode 100644
index 0000000..0c0c24f
--- /dev/null
+++ b/recipes/gnome/libwnck/introspection.patch
@@ -0,0 +1,13 @@ 
+Index: libwnck-2.30.5/configure.ac
+===================================================================
+--- libwnck-2.30.5.orig/configure.ac	2012-07-02 05:17:34.118158298 -0700
++++ libwnck-2.30.5/configure.ac	2012-07-02 05:23:19.071869288 -0700
+@@ -167,7 +167,7 @@
+ ##################################################
+ GTK_DOC_CHECK([1.9])
+ 
+-GOBJECT_INTROSPECTION_CHECK([0.6.14])
++AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
+ 
+ AC_OUTPUT([
+ Makefile
diff --git a/recipes/gnome/libwnck_2.30.5.bb b/recipes/gnome/libwnck_2.30.5.bb
index 6a981a3..fa3c0ce 100644
--- a/recipes/gnome/libwnck_2.30.5.bb
+++ b/recipes/gnome/libwnck_2.30.5.bb
@@ -1,14 +1,13 @@ 
 DESCRIPTION = "Window navigation construction toolkit"
 LICENSE = "LGPL"
 SECTION = "x11/libs"
-DEPENDS = "gobject-introspection-native gtk+ gtk+-native"
-
+DEPENDS = "gtk+ gtk+-native"
+PR = "r1"
 inherit gnome
+
+SRC_URI += "file://introspection.patch"
+
 SRC_URI[archive.md5sum] = "4162d5b96151e6d24ec02ae3a822203c"
 SRC_URI[archive.sha256sum] = "56b6681e89cd45491bb640165d62276d81369a08974042b26645dc1e0e954cc1"
 
 EXTRA_OECONF += "--enable-introspection=no"
-
-do_configure_prepend() {
-	sed -i '/GOBJECT_INTROSPECTION_CHECK([0.6.14])/d' configure.ac
-}