aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2013-05-16 18:50:38 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-21 12:45:49 +0200
commitcf4e3bbfe3c4d5fe4de02cad2501c73c3fcc6ac9 (patch)
treef6c584657d9c371eaae325fbce9a5287c174957b /meta-oe
parent600ee3b8b70c36ac8a6bdf0cb417320635f66d9d (diff)
downloadmeta-openembedded-cf4e3bbfe3c4d5fe4de02cad2501c73c3fcc6ac9.tar.gz
meta-openembedded-cf4e3bbfe3c4d5fe4de02cad2501c73c3fcc6ac9.tar.bz2
meta-openembedded-cf4e3bbfe3c4d5fe4de02cad2501c73c3fcc6ac9.zip
gtkhtml2: fix build with glib 2.36
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-gnome/gtkhtml2/files/0001-tests-main.c-fix-build-with-glib-2.36.patch32
-rw-r--r--meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb3
2 files changed, 34 insertions, 1 deletions
diff --git a/meta-oe/recipes-gnome/gtkhtml2/files/0001-tests-main.c-fix-build-with-glib-2.36.patch b/meta-oe/recipes-gnome/gtkhtml2/files/0001-tests-main.c-fix-build-with-glib-2.36.patch
new file mode 100644
index 000000000..b3eb3960c
--- /dev/null
+++ b/meta-oe/recipes-gnome/gtkhtml2/files/0001-tests-main.c-fix-build-with-glib-2.36.patch
@@ -0,0 +1,32 @@
+From 4b17eed4b8588569d11ec4bd2b6fa3c063830e6e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 16 May 2013 18:44:50 +0200
+Subject: [PATCH] tests/main.c: fix build with glib 2.36
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: project seems dead
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ tests/main.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/tests/main.c b/tests/main.c
+index 61cce82..18165ed 100644
+--- a/tests/main.c
++++ b/tests/main.c
+@@ -30,7 +30,9 @@ main (gint argc, gchar **argv)
+ {
+ GtkWidget *browser;
+
++#if !GLIB_CHECK_VERSION (2, 36, 0)
+ g_thread_init(NULL);
++#endif
+
+ gtk_init (&argc, &argv);
+
+--
+1.7.6.5
+
diff --git a/meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb b/meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
index 8e9df16be..58d41eefd 100644
--- a/meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
+++ b/meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
SRCREV = "1161"
PV = "2.11.0+svnr${SRCPV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "svn://svn.gnome.org/svn/gtkhtml2/;module=trunk;protocol=http \
http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/css-stylesheet-user.patch;striplevel=0;name=patch2 \
@@ -14,6 +14,7 @@ SRC_URI = "svn://svn.gnome.org/svn/gtkhtml2/;module=trunk;protocol=http \
http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/add-end-element-signal.patch;striplevel=0;name=patch4 \
http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/add-dom-functions.patch;striplevel=0;name=patch5 \
http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/iain-mem-leak.patch;striplevel=0;name=patch6 \
+ file://0001-tests-main.c-fix-build-with-glib-2.36.patch \
"
SRC_URI[patch2.md5sum] = "05fc3627ca364095702dc804f41c8391"