Patchwork [meta-oe,3/5] libwnck: use gobject-introspection-stub instead of -native which was removed in oe-core

login
register
mail settings
Submitter Martin Jansa
Date July 28, 2012, 12:33 p.m.
Message ID <4a5a3a693bc3a78813f11c7858b3e9aa957d1bb9.1343478744.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/33251/
State Accepted
Commit 4a5a3a693bc3a78813f11c7858b3e9aa957d1bb9
Headers show

Comments

Martin Jansa - July 28, 2012, 12:33 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb |   10 +++-------
 meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb |   10 ++--------
 2 files changed, 5 insertions(+), 15 deletions(-)
Andreas Müller - July 30, 2012, 8:40 a.m.
On Sat, Jul 28, 2012 at 2:33 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb |   10 +++-------
>  meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb |   10 ++--------
>  2 files changed, 5 insertions(+), 15 deletions(-)
>
> diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
> index e2a3e3d..e54b8d3 100644
> --- a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
> +++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
> @@ -5,14 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
>  BPN = "libwnck"
>
>  SECTION = "x11/libs"
> -DEPENDS = "gobject-introspection-native gtk+3 gdk-pixbuf-native"
> +DEPENDS = "gobject-introspection-stub gtk+3 gdk-pixbuf-native"
> +
> +PR = "r1"
>
>  inherit gnome
>  SRC_URI[archive.md5sum] = "e4ea87320dd0600a81c50186e3804aae"
>  SRC_URI[archive.sha256sum] = "4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083"
> -
> -EXTRA_OECONF += "--enable-introspection=no"
> -
> -do_configure_prepend() {
> -       sed -i '/GOBJECT_INTROSPECTION_CHECK([0.6.14])/d' configure.ac
> -}
> diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
> index 6c8ca28..935d4a3 100644
> --- a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
> +++ b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
> @@ -2,17 +2,11 @@ DESCRIPTION = "Window navigation construction toolkit"
>  LICENSE = "LGPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
>
> -PR = "r1"
> +PR = "r2"
>
>  SECTION = "x11/libs"
> -DEPENDS = "gobject-introspection-native gtk+ gdk-pixbuf-native"
> +DEPENDS = "gobject-introspection-stub gtk+ gdk-pixbuf-native"
>
>  inherit gnome
>  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
> -}
> --
> 1.7.8.6
>
Acked-by: Andreas Müller <schnitzeltony@googlemail.com>

Patch

diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
index e2a3e3d..e54b8d3 100644
--- a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb
@@ -5,14 +5,10 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 BPN = "libwnck"
 
 SECTION = "x11/libs"
-DEPENDS = "gobject-introspection-native gtk+3 gdk-pixbuf-native"
+DEPENDS = "gobject-introspection-stub gtk+3 gdk-pixbuf-native"
+
+PR = "r1"
 
 inherit gnome
 SRC_URI[archive.md5sum] = "e4ea87320dd0600a81c50186e3804aae"
 SRC_URI[archive.sha256sum] = "4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083"
-
-EXTRA_OECONF += "--enable-introspection=no"
-
-do_configure_prepend() {
-	sed -i '/GOBJECT_INTROSPECTION_CHECK([0.6.14])/d' configure.ac
-}
diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
index 6c8ca28..935d4a3 100644
--- a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb
@@ -2,17 +2,11 @@  DESCRIPTION = "Window navigation construction toolkit"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
-PR = "r1"
+PR = "r2"
 
 SECTION = "x11/libs"
-DEPENDS = "gobject-introspection-native gtk+ gdk-pixbuf-native"
+DEPENDS = "gobject-introspection-stub gtk+ gdk-pixbuf-native"
 
 inherit gnome
 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
-}