Patchwork python-pygtk:add gtk-types.defs into gdk.c dependence

login
register
mail settings
Submitter Song.Li@windriver.com
Date Sept. 13, 2012, 9:29 a.m.
Message ID <1347528566-20039-1-git-send-email-Song.Li@windriver.com>
Download mbox | patch
Permalink /patch/36455/
State Not Applicable, archived
Headers show

Comments

Song.Li@windriver.com - Sept. 13, 2012, 9:29 a.m.
From: "Song.Li" <Song.Li@windriver.com>

gdk.c depends on gtk-types.defs but
gdk/Makefile.am miss this.This will cause
build error sometimes when built
with multi-jobbing,so add gtk-types.defs into
gdk.c dependence.

[YOCTO #3103]

Signed-off-by: Song.Li <Song.Li@windriver.com>
---
 .../add-gtk-types.defs-into-gdk.c-dependence.patch |   34 ++++++++++++++++++++
 .../recipes-devtools/python/python-pygtk_2.24.0.bb |    6 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/python/python-pygtk/add-gtk-types.defs-into-gdk.c-dependence.patch

Patch

diff --git a/meta/recipes-devtools/python/python-pygtk/add-gtk-types.defs-into-gdk.c-dependence.patch b/meta/recipes-devtools/python/python-pygtk/add-gtk-types.defs-into-gdk.c-dependence.patch
new file mode 100644
index 0000000..9c42ef5
--- /dev/null
+++ b/meta/recipes-devtools/python/python-pygtk/add-gtk-types.defs-into-gdk.c-dependence.patch
@@ -0,0 +1,34 @@ 
+From 5892e2f02a00a21aa905809741f66647d1ed659e Mon Sep 17 00:00:00 2001
+From: "Song.Li" <Song.Li@windriver.com>
+Date: Tue, 11 Sep 2012 16:15:46 +0800
+Subject: [PATCH] add gtk-types.defs into gdk.c dependence
+
+gdk.c depends on gtk-types.defs but
+gdk/Makefile.am miss this.This will cause
+build error sometimes when built
+with multi-jobbing,so add gtk-types.defs into
+gdk.c dependence.
+
+Upstream-Status:Pending
+
+Signed-off-by: Song.Li <Song.Li@windriver.com>
+---
+ gtk/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index c02a0e2..28332f7 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -177,7 +177,7 @@ gtkunixprint.defs: $(GTKUNIXPRINT_DEFS) Makefile
+ gtkunixprint-types.defs: $(GTKUNIXPRINT_TYPES_DEFS) Makefile
+ 	$(CREATEDEFS) $@ $(GTKUNIXPRINT_TYPES_DEFS)
+ 
+-gdk.c: gdk-types.defs gdk.defs $(GDK_OVERRIDES)
++gdk.c: gdk-types.defs gtk-types.defs gdk.defs $(GDK_OVERRIDES)
+ gtk.c: gdk-types.defs gtk-types.defs gtk.defs gdk-types.defs $(GTK_OVERRIDES)
+ _gtk_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTK_CFLAGS)
+ _gtk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb
index 20d54a3..f7e52bc 100644
--- a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb
+++ b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb
@@ -8,11 +8,15 @@  SRCNAME = "pygtk"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
 
+PR = "r1"
+
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.24/${SRCNAME}-${PV}.tar.bz2 \
            file://fix-gtkunixprint.patch \
            file://prevent_to_get_display_during_import.patch \
            file://nodocs.patch \
-           file://acinclude.m4"
+           file://acinclude.m4 \
+           file://add-gtk-types.defs-into-gdk.c-dependence.patch \
+           "
 
 SRC_URI[md5sum] = "a1051d5794fd7696d3c1af6422d17a49"
 SRC_URI[sha256sum] = "cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912"