Pull request #16

PATCH Applied Martin Jansa 3 participants 6 messages Jun 2, 2011 – Jun 3, 2011

Share & tools

Martin Jansa

author

2011-06-02 18:54 UTC #0 lore raw

cover Pull request #16

gobject-introspection from oe-core is not compatible with glib-2.0_git we have here, added newer version also with D_P -1 (as glib-2.0) has.

The following changes since commit e69c7519399c06e82e25dcbfdd300e975393b00a:

connman: enable service when using systemd (2011-06-02 16:26:04 +0200)

are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/meta-oe
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/meta-oe

Martin Jansa (2):
gobject-introspection: add newer git version compatible with

    glib-2.0_git

gobject-introspection: move to recipes-gnome to match oe-core
structure

 .../use-usr-bin-env-for-python.patch               |    0
 .../gnome}/gobject-introspection_0.9.10.bb         |    0
 .../gnome/gobject-introspection_git.bb             |   33 ++++++++++++++++++++
 3 files changed, 33 insertions(+), 0 deletions(-)
 rename meta-oe/{recipes-devtools/gobject-introspection => recipes-gnome/gnome}/gobject-introspection/use-usr-bin-env-for-python.patch (100%)
 rename meta-oe/{recipes-devtools/gobject-introspection => recipes-gnome/gnome}/gobject-introspection_0.9.10.bb (100%)
 create mode 100644 meta-oe/recipes-gnome/gnome/gobject-introspection_git.bb

Signature · 1 line

1.7.5.3

Martin Jansa

author

2011-06-02 18:54 UTC #1 lore raw

PATCH 1/2 gobject-introspection: add newer git version compatible with glib-2.0_git

Signed-off-by Martin Jansa <[email protected]>

---
 .../gobject-introspection_git.bb                   |   33 ++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb

meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb new file +33 -0

new file mode 100644
index 0000000..2a7f30c
@@ -0,0 +1,33 @@
+# NOTE: WIP! This recipe does not cross-compile atm., only -native
+DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native"
+DEPENDS_virtclass-native = "libffi-native python-native bison-native flex-native"
+BBCLASSEXTEND = "native"
+
+SRC_URI = "git://git.gnome.org/gobject-introspection;protocol=git \
+  file://use-usr-bin-env-for-python.patch \
+"
+
+LICENSE = "GPLv2+ & LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \
+		    file://COPYING.lib;md5=3bf50002aefd002f49e7bb854063f7e7"
+
+SRCREV = "8d64bc23d2b837421ecf9c7b0e4b8d5d95ca0d21"
+PV = "1.29.0+gitr${SRCPV}"
+DEFAULT_PREFERENCE = "-1"
+
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+BBCLASSEXTEND = "native"
+
+do_configure_prepend () {
+        echo "EXTRA_DIST = " > ${S}/gtk-doc.make
+}
+
+EXTRA_OECONF = "\
+  --disable-gtk-doc \
+  --disable-gtk-doc-html \
+  --disable-gtk-doc-pdf \
+  --disable-tests \
+"

Signature · 1 line

1.7.5.3

Martin Jansa

author

2011-06-02 18:54 UTC #2 lore raw

PATCH 2/2 gobject-introspection: move to recipes-gnome to match oe-core structure

Signed-off-by Martin Jansa <[email protected]>

---
 .../use-usr-bin-env-for-python.patch               |    0
 .../gnome}/gobject-introspection_0.9.10.bb         |    0
 .../gnome}/gobject-introspection_git.bb            |    0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-oe/{recipes-devtools/gobject-introspection => recipes-gnome/gnome}/gobject-introspection/use-usr-bin-env-for-python.patch (100%)
 rename meta-oe/{recipes-devtools/gobject-introspection => recipes-gnome/gnome}/gobject-introspection_0.9.10.bb (100%)
 rename meta-oe/{recipes-devtools/gobject-introspection => recipes-gnome/gnome}/gobject-introspection_git.bb (100%)

meta-oe/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch renamed from meta-oe/recipes-devtools/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch +0 -0

similarity index 100%
rename from meta-oe/recipes-devtools/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch
rename to meta-oe/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch

meta-oe/recipes-gnome/gnome/gobject-introspection_0.9.10.bb renamed from meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_0.9.10.bb +0 -0

similarity index 100%
rename from meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_0.9.10.bb
rename to meta-oe/recipes-gnome/gnome/gobject-introspection_0.9.10.bb

meta-oe/recipes-gnome/gnome/gobject-introspection_git.bb renamed from meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb +0 -0

similarity index 100%
rename from meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb
rename to meta-oe/recipes-gnome/gnome/gobject-introspection_git.bb

Signature · 1 line

1.7.5.3

Khem Raj

2011-06-02 21:55 UTC #3 lore raw

Re: [meta-oe][PATCH 1/2] gobject-introspection: add newer git version compatible with glib-2.0_git

In reply to Martin Jansa

Quoted 3 lines · Martin Jansa

Signed-off-by Martin Jansa <[email protected]>
---
.../gobject-introspection_git.bb |

Quoted 1 line

++++++++++++++++++++ 1 files changed, 33

insertions(+), 0 deletions(-)

Quoted 2 lines

 create mode 100644
meta-oe/recipes-devtools/gobject-

introspection/gobject-introspection_git.b

Quoted 4 lines

b
diff --git
a/meta-oe/recipes-devtools/gobject-

introspection/gobject-introspection_git

Quoted 2 lines

.bb
b/meta-oe/recipes-devtools/gobject-

introspection/gobject-introspection_git

Quoted 5 lines

.bb new file mode 100644
index 0000000..2a7f30c
--- /dev/null
+++
b/meta-oe/recipes-devtools/gobject-

introspection/gobject-introspection_git

Quoted 2 lines

.bb @@ -0,0 +1,33 @@
+# NOTE: WIP! This recipe does not cross-compile

atm., only -native

Quoted 1 line

+DEPENDS = "glib-2.0 libffi python-native gobject-

introspection-native"

Quoted 1 line

+DEPENDS_virtclass-native = "libffi-native python-

native bison-native

Review

Quoted 3 lines

flex-native" +BBCLASSEXTEND = "native"
(quoted diff) +2 -0
+
+SRC_URI = "git://git.gnome.org/gobject-

introspection;protocol=git \

meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb

Quoted 6 lines

meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb new file +5 -0
+  file://use-usr-bin-env-for-python.patch \
+"
+
+LICENSE = "GPLv2+ & LGPLv2+"
+LIC_FILES_CHKSUM =

"file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \ +

Quoted 1 line

file://COPYING.lib;md5=3bf50002aefd002f49e7bb854063f7e7"

meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb line 16

Quoted 4 lines

meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb new file +4 -0
+
+SRCREV = "8d64bc23d2b837421ecf9c7b0e4b8d5d95ca0d21"
+PV = "1.29.0+gitr${SRCPV}"
+DEFAULT_PREFERENCE = "-1"

why DP -1

Quoted 17 lines

meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb new file +17 -0

+
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+BBCLASSEXTEND = "native"
+
+do_configure_prepend () {
+        echo "EXTRA_DIST = " > ${S}/gtk-doc.make
+}
+
+EXTRA_OECONF = "\
+  --disable-gtk-doc \
+  --disable-gtk-doc-html \
+  --disable-gtk-doc-pdf \
+  --disable-tests \
+"

Martin Jansa

author

2011-06-03 03:54 UTC #4 lore raw

Re: [meta-oe][PATCH 1/2] gobject-introspection: add newer git version compatible with glib-2.0_git

Quoted 45 lines · Khem Raj

Quoted 3 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
.../gobject-introspection_git.bb |
33
Quoted 1 line
++++++++++++++++++++ 1 files changed, 33
insertions(+), 0 deletions(-)
Quoted 2 lines
 create mode 100644
meta-oe/recipes-devtools/gobject-
introspection/gobject-introspection_git.b
Quoted 4 lines
b
diff --git
a/meta-oe/recipes-devtools/gobject-
introspection/gobject-introspection_git
Quoted 2 lines
.bb
b/meta-oe/recipes-devtools/gobject-
introspection/gobject-introspection_git
Quoted 5 lines
.bb new file mode 100644
index 0000000..2a7f30c
--- /dev/null
+++
b/meta-oe/recipes-devtools/gobject-
introspection/gobject-introspection_git
Quoted 2 lines
.bb @@ -0,0 +1,33 @@
+# NOTE: WIP! This recipe does not cross-compile
atm., only -native
Quoted 1 line
+DEPENDS = "glib-2.0 libffi python-native gobject-
introspection-native"
Quoted 1 line
+DEPENDS_virtclass-native = "libffi-native python-
native bison-native
Review
Quoted 3 lines
flex-native" +BBCLASSEXTEND = "native"
(quoted diff) +2 -0
+
+SRC_URI = "git://git.gnome.org/gobject-
introspection;protocol=git \
meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb
Quoted 6 lines
meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb new file +5 -0
+  file://use-usr-bin-env-for-python.patch \
+"
+
+LICENSE = "GPLv2+ & LGPLv2+"
+LIC_FILES_CHKSUM =
"file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \ +
Quoted 1 line

Quoted 7 lines

file://COPYING.lib;md5=3bf50002aefd002f49e7bb854063f7e7"
meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb line 16
Quoted 4 lines
meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb new file +4 -0
+
+SRCREV = "8d64bc23d2b837421ecf9c7b0e4b8d5d95ca0d21"
+PV = "1.29.0+gitr${SRCPV}"
+DEFAULT_PREFERENCE = "-1"
why DP -1

because it's for glib-2.0_git with DP -1 and both are development snapshots. glib-2.0_git was added mostly for it's gdbus-codegen integration (before we had this in separate recipe gdbus-binding-tool, because it was also separate repo). And it needs also changed code and command line arguments to call gdbus-codegen were changed... so we've updated SHR code for it but I wanted to give other people more time before making it new default version.

Regards,

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Koen Kooi

Applied

2011-06-02 19:12 UTC #5 lore raw

In reply to Martin Jansa

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Thanks, applied

Quoted 17 lines · Martin Jansa

gobject-introspection from oe-core is not compatible with glib-2.0_git we have here, added newer version also with D_P -1 (as glib-2.0) has.
The following changes since commit e69c7519399c06e82e25dcbfdd300e975393b00a:
connman: enable service when using systemd (2011-06-02 16:26:04 +0200)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/meta-oe
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/meta-oe
Martin Jansa (2):
gobject-introspection: add newer git version compatible with
    glib-2.0_git
gobject-introspection: move to recipes-gnome to match oe-core
structure

Quoted 8 lines

 .../use-usr-bin-env-for-python.patch               |    0
 .../gnome}/gobject-introspection_0.9.10.bb         |    0
 .../gnome/gobject-introspection_git.bb             |   33 ++++++++++++++++++++
 3 files changed, 33 insertions(+), 0 deletions(-)
 rename meta-oe/{recipes-devtools/gobject-introspection => recipes-gnome/gnome}/gobject-introspection/use-usr-bin-env-for-python.patch (100%)
 rename meta-oe/{recipes-devtools/gobject-introspection => recipes-gnome/gnome}/gobject-introspection_0.9.10.bb (100%)
 create mode 100644 meta-oe/recipes-gnome/gnome/gobject-introspection_git.bb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFN59+xMkyGM64RGpERAhcjAKCZuSl5whdoDQfoo3+Pp/pBczvgpACdFzs3 zxi3McxB8eFGylvGY7l8UOA=
=3I0H
-----END PGP SIGNATURE-----