Skip to contentSkip to conversation

libwnck: Fix build without needing introspection-native

PATCH In review Khem Raj 2 participants 7 messages Aug 24, 2012 – Aug 27, 2012

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/5 libwnck: Fix build without needing introspection-native

---
 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
recipes/gnome/libwnck/introspection.patch new file +13 -0
new file mode 100644
index 0000000..0c0c24f
@@ -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
recipes/gnome/libwnck_2.30.5.bb +5 -6
index 6a981a3..fa3c0ce 100644
@@ -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
-}
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 2/5 qt-4.7.1: Dont create symlinks for non existing binaries

---
 recipes/qt4/qt-4.7.1.inc |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
recipes/qt4/qt-4.7.1.inc +4 -5
index bf3f39e..7177d26 100644
@@ -49,10 +49,6 @@ do_compile() {
     fi
 
     unset CFLAGS CXXFLAGS
-    install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
-    install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
-    install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
-    install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
 
     oe_runmake ${EXTRA_ENV}
 }
@@ -60,7 +56,10 @@ do_compile() {
 do_install_append() {
 	install -d ${D}${bindir}
 	for i in rcc uic moc ; do
-		install -m 0755 ${S}/bin/$i ${D}${bindir}/
+		if [ -e ${S}/bin/$i ]
+		then
+			install -m 0755 ${S}/bin/$i ${D}${bindir}/
+		fi
 	done
 
         #Append an E to the qtdemo file
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 3/5 orc: Add recipe for 0.4.16

In reply to Khem Raj
---
 recipes/orc/orc_0.4.16.bb |    3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 recipes/orc/orc_0.4.16.bb
recipes/orc/orc_0.4.16.bb new file +3 -0
new file mode 100644
index 0000000..efef664
@@ -0,0 +1,3 @@
+require orc.inc
+SRC_URI[orc.md5sum] = "e482932e544c847761449b106ecbc483"
+SRC_URI[orc.sha256sum] = "700e4edba20a0ed42164b645da26ce515b883d4c4633b222302f1e541f2a58ab"
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH 4/5 schroedinger: Add recipe for 1.0.11

In reply to Khem Raj
---
 recipes/schroedinger/schroedinger_1.0.11.bb |   15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 recipes/schroedinger/schroedinger_1.0.11.bb
recipes/schroedinger/schroedinger_1.0.11.bb new file +15 -0
new file mode 100644
index 0000000..9f03a12
@@ -0,0 +1,15 @@
+require schroedinger.inc
+
+LICENSE = "MPL-1.1 | LGPLv2 | GPLv2 | MIT"
+
+PR = "${INC_PR}.0"
+
+inherit autotools
+
+SRC_URI[schroedingertargz.md5sum] = "da6af08e564ca1157348fb8d92efc891"
+SRC_URI[schroedingertargz.sha256sum] = "1e572a0735b92aca5746c4528f9bebd35aa0ccf8619b22fa2756137a8cc9f912"
+
+PACKAGES =+ "gst-plugin-schroedinger-dbg gst-plugin-schroedinger-dev gst-plugin-schroedinger"
+FILES_gst-plugin-schroedinger = "${libdir}/gstreamer-0.10/*.so"
+FILES_gst-plugin-schroedinger-dbg = "${libdir}/gstreamer-0.10/.debug"
+FILES_gst-plugin-schroedinger-dev = "${libdir}/gstreamer-0.10/*.*a"
Signature · 1 line
1.7.9.5
author
#4 lore raw

PATCH 5/5 binutils-2.20.1: Fix SRC_URI checksums

In reply to Khem Raj
---
 recipes/binutils/binutils_2.20.1.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes/binutils/binutils_2.20.1.bb +2 -2
index 5154e2d..f40b676 100644
@@ -24,8 +24,8 @@ SRC_URI_append_nios2 =" \
 	file://binutils-nios2.patch \
 	"
 
-SRC_URI[tarball.sha256sum] = "228b84722d87e88e7fdd36869e590e649ab523a0800a7d53df906498afe6f6f8"
-SRC_URI[tarball.md5sum] = "9cdfb9d6ec0578c166d3beae5e15c4e5"
+SRC_URI[tarball.sha256sum] = "71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64"
+SRC_URI[tarball.md5sum] = "2b9dc8f2b7dbd5ec5992c6e29de0b764"
 
 # powerpc patches
 SRC_URI += "\
Signature · 1 line
1.7.9.5
author
#6 lore raw
Quoted 5 lines · Tom Rini
Quoted 1 line · Khem Raj

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.

Quoted 9 lines

--
Tom

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel