<div dir="ltr"><div>Are the pygtk changes directly related to the introspection changes? If not then maybe they should happen in another patch set. <br></div><div><br></div><div>Jussi</div><div class="gmail_extra"><br><div class="gmail_quote">On 9 November 2015 at 16:50, Alexander Kanavin <span dir="ltr"><<a href="mailto:alexander.kanavin@linux.intel.com" target="_blank">alexander.kanavin@linux.intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">python-pygtk hasn't been updated in several years, is incompatible<br>
with the current version of pygobject, and is generally obsolete as<br>
all modern python gtk apps use introspection directly.<br>
<br>
Signed-off-by: Alexander Kanavin <<a href="mailto:alexander.kanavin@linux.intel.com">alexander.kanavin@linux.intel.com</a>><br>
---<br>
meta/conf/distro/include/distro_alias.inc | 1 -<br>
.../packagegroups/<a href="http://packagegroup-self-hosted.bb" rel="noreferrer" target="_blank">packagegroup-self-hosted.bb</a> | 1 -<br>
.../python/python-pygtk/acinclude.m4 | 90 ----------------------<br>
.../add-gtk-types.defs-into-gdk.c-dependence.patch | 32 --------<br>
.../python/python-pygtk/fix-gtkunixprint.patch | 20 -----<br>
.../python/python-pygtk/fix-pygtk-2.0.pc.patch | 13 ----<br>
.../python/python-pygtk/nodocs.patch | 15 ----<br>
.../prevent_to_get_display_during_import.patch | 16 ----<br>
.../python/python-pygtk/python-pygtk2/acinclude.m4 | 90 ----------------------<br>
.../update-dependences-of-defs.c.patch | 38 ---------<br>
.../recipes-devtools/python/<a href="http://python-pygtk_2.24.0.bb" rel="noreferrer" target="_blank">python-pygtk_2.24.0.bb</a> | 55 -------------<br>
11 files changed, 371 deletions(-)<br>
delete mode 100644 meta/recipes-devtools/python/python-pygtk/acinclude.m4<br>
delete mode 100644 meta/recipes-devtools/python/python-pygtk/add-gtk-types.defs-into-gdk.c-dependence.patch<br>
delete mode 100644 meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch<br>
delete mode 100644 meta/recipes-devtools/python/python-pygtk/fix-pygtk-2.0.pc.patch<br>
delete mode 100644 meta/recipes-devtools/python/python-pygtk/nodocs.patch<br>
delete mode 100644 meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch<br>
delete mode 100644 meta/recipes-devtools/python/python-pygtk/python-pygtk2/acinclude.m4<br>
delete mode 100644 meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch<br>
delete mode 100644 meta/recipes-devtools/python/<a href="http://python-pygtk_2.24.0.bb" rel="noreferrer" target="_blank">python-pygtk_2.24.0.bb</a><br>
<br>
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc<br>
index ca333c8..6368d6d 100644<br>
--- a/meta/conf/distro/include/distro_alias.inc<br>
+++ b/meta/conf/distro/include/distro_alias.inc<br>
@@ -402,7 +402,6 @@ DISTRO_PN_ALIAS_pn-python-mako = "Fedora=python-mako Opensuse=python-Mako"<br>
DISTRO_PN_ALIAS_pn-python-pycairo = "Meego=pycairo Fedora=pycairo Ubuntu=pycairo Debian=pycairo"<br>
DISTRO_PN_ALIAS_pn-python-pycurl = "Debian=python-pycurl Ubuntu=python-pycurl"<br>
DISTRO_PN_ALIAS_pn-python-pygobject = "Meego=pygobject2 Fedora=pygobject2 Ubuntu=pygobject Debian=pygobject"<br>
-DISTRO_PN_ALIAS_pn-python-pygtk = "Debian=python-gtk2 Fedora=pygtk2 OpenSuSE=python-gtk"<br>
DISTRO_PN_ALIAS_pn-python-pyrex = "Mandriva=python-pyrex Ubuntu=python-pyrex"<br>
DISTRO_PN_ALIAS_pn-python-scons = "Fedora=scons OpenSuSE=scons Ubuntu=scons Mandriva=scons Debian=scons"<br>
DISTRO_PN_ALIAS_pn-python-setuptools = "Mandriva=python-setup OpenSuSE=python-setup-git"<br>
diff --git a/meta/recipes-core/packagegroups/<a href="http://packagegroup-self-hosted.bb" rel="noreferrer" target="_blank">packagegroup-self-hosted.bb</a> b/meta/recipes-core/packagegroups/<a href="http://packagegroup-self-hosted.bb" rel="noreferrer" target="_blank">packagegroup-self-hosted.bb</a><br>
index d38be26..b8573fb 100644<br>
--- a/meta/recipes-core/packagegroups/<a href="http://packagegroup-self-hosted.bb" rel="noreferrer" target="_blank">packagegroup-self-hosted.bb</a><br>
+++ b/meta/recipes-core/packagegroups/<a href="http://packagegroup-self-hosted.bb" rel="noreferrer" target="_blank">packagegroup-self-hosted.bb</a><br>
@@ -190,7 +190,6 @@ RDEPENDS_packagegroup-self-hosted-graphics = "\<br>
libsdl \<br>
libsdl-dev \<br>
libx11-dev \<br>
- python-pygtk \<br>
gtk-theme-clearlooks \<br>
xdg-utils \<br>
epiphany \<br>
diff --git a/meta/recipes-devtools/python/python-pygtk/acinclude.m4 b/meta/recipes-devtools/python/python-pygtk/acinclude.m4<br>
deleted file mode 100644<br>
index 53518fb..0000000<br>
--- a/meta/recipes-devtools/python/python-pygtk/acinclude.m4<br>
+++ /dev/null<br>
@@ -1,90 +0,0 @@<br>
-## this one is commonly used with AM_PATH_PYTHONDIR ...<br>
-dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])<br>
-dnl Check if a module containing a given symbol is visible to python.<br>
-AC_DEFUN(AM_CHECK_PYMOD,<br>
-[AC_REQUIRE([AM_PATH_PYTHON])<br>
-py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`<br>
-AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)<br>
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [<br>
-ifelse([$2],[], [prog="<br>
-import sys<br>
-try:<br>
- import $1<br>
-except ImportError:<br>
- sys.exit(1)<br>
-except:<br>
- sys.exit(0)<br>
-sys.exit(0)"], [prog="<br>
-import $1<br>
-$1.$2"])<br>
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC<br>
- then<br>
- eval "py_cv_mod_$py_mod_var=yes"<br>
- else<br>
- eval "py_cv_mod_$py_mod_var=no"<br>
- fi<br>
-])<br>
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`<br>
-if test "x$py_val" != xno; then<br>
- AC_MSG_RESULT(yes)<br>
- ifelse([$3], [],, [$3<br>
-])dnl<br>
-else<br>
- AC_MSG_RESULT(no)<br>
- ifelse([$4], [],, [$4<br>
-])dnl<br>
-fi<br>
-])<br>
-<br>
-dnl a macro to check for ability to create python extensions<br>
-dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])<br>
-dnl function also defines PYTHON_INCLUDES<br>
-AC_DEFUN([AM_CHECK_PYTHON_HEADERS],<br>
-[AC_REQUIRE([AM_PATH_PYTHON])<br>
-AC_MSG_CHECKING(for headers required to compile python extensions)<br>
-dnl deduce PYTHON_INCLUDES<br>
-AC_ARG_WITH(python-includes,<br>
- [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval)<br>
-if test x$py_exec_prefix != x; then<br>
-PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"<br>
-else<br>
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`<br>
-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`<br>
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"<br>
-if test "$py_prefix" != "$py_exec_prefix"; then<br>
- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"<br>
-fi<br>
-fi<br>
-AC_SUBST(PYTHON_INCLUDES)<br>
-dnl check if the headers exist:<br>
-save_CPPFLAGS="$CPPFLAGS"<br>
-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"<br>
-AC_TRY_CPP([#include <Python.h>],dnl<br>
-[AC_MSG_RESULT(found)<br>
-$1],dnl<br>
-[AC_MSG_RESULT(not found)<br>
-$2])<br>
-CPPFLAGS="$save_CPPFLAGS"<br>
-])<br>
-<br>
-dnl<br>
-dnl JH_ADD_CFLAG(FLAG)<br>
-dnl checks whether the C compiler supports the given flag, and if so, adds<br>
-dnl it to $CFLAGS. If the flag is already present in the list, then the<br>
-dnl check is not performed.<br>
-AC_DEFUN([JH_ADD_CFLAG],<br>
-[<br>
-case " $CFLAGS " in<br>
-*@<:@\ \ @:>@$1@<:@\ \ @:>@*)<br>
- ;;<br>
-*)<br>
- save_CFLAGS="$CFLAGS"<br>
- CFLAGS="$CFLAGS $1"<br>
- AC_MSG_CHECKING([whether [$]CC understands $1])<br>
- AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])<br>
- AC_MSG_RESULT($jh_has_option)<br>
- if test $jh_has_option = no; then<br>
- CFLAGS="$save_CFLAGS"<br>
- fi<br>
- ;;<br>
-esac])<br>
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<br>
deleted file mode 100644<br>
index df0f9cd..0000000<br>
--- a/meta/recipes-devtools/python/python-pygtk/add-gtk-types.defs-into-gdk.c-dependence.patch<br>
+++ /dev/null<br>
@@ -1,32 +0,0 @@<br>
-Upstream-Status: Submitted<br>
-<br>
-add gtk-types.defs into gdk.c dependence<br>
-<br>
-gdk.c depends on gtk-types.defs but<br>
-gdk/Makefile.am miss this. This will cause<br>
-build error sometimes when built<br>
-with multi-jobbing, so add gtk-types.defs into<br>
-gdk.c dependence.<br>
-<br>
-Signed-off-by: Song.Li <<a href="mailto:Song.Li@windriver.com">Song.Li@windriver.com</a>><br>
-Signed-off-by: Jackie Huang <<a href="mailto:jackie.huang@windriver.com">jackie.huang@windriver.com</a>><br>
----<br>
- gtk/Makefile.am | 2 +-<br>
- 1 files changed, 1 insertions(+), 1 deletions(-)<br>
-<br>
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am<br>
-index 7bb5d0c..4a88351 100644<br>
---- a/gtk/Makefile.am<br>
-+++ b/gtk/Makefile.am<br>
-@@ -214,7 +214,7 @@ gtkunixprint.defs: $(GTKUNIXPRINT_DEFS) Makefile<br>
- gtkunixprint-types.defs: $(GTKUNIXPRINT_TYPES_DEFS) Makefile<br>
- $(CREATEDEFS) $@ $(GTKUNIXPRINT_TYPES_DEFS)<br>
-<br>
--gdk.c: gdk-types.defs gdk.defs $(GDK_OVERRIDES)<br>
-+gdk.c: gdk-types.defs gtk-types.defs gdk.defs $(GDK_OVERRIDES)<br>
- gtk.c: gdk-types.defs gtk-types.defs gtk.defs gdk-types.defs $(GTK_OVERRIDES)<br>
- _gtk_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTK_CFLAGS)<br>
- _gtk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk<br>
---<br>
-1.7.4<br>
-<br>
diff --git a/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch b/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch<br>
deleted file mode 100644<br>
index 16c0e8e..0000000<br>
--- a/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch<br>
+++ /dev/null<br>
@@ -1,20 +0,0 @@<br>
-Upstream-Status: Inappropriate [configuration]<br>
-<br>
-Signed-off-by: Saul Wold <<a href="mailto:sgw@linux.intel.com">sgw@linux.intel.com</a>><br>
-<br>
-Index: pygtk-2.24.0/gtk/gtkunixprint.override<br>
-===================================================================<br>
---- pygtk-2.24.0.orig/gtk/gtkunixprint.override<br>
-+++ pygtk-2.24.0/gtk/gtkunixprint.override<br>
-@@ -102,11 +102,6 @@ _wrap_gtk_print_job_get_surface(PyGObjec<br>
- if (pyg_error_check(&error))<br>
- return NULL;<br>
-<br>
--#if PYCAIRO_VERSION_HEX >= 0x1010600<br>
-- return PycairoSurface_FromSurface(cairo_surface_reference(surface), NULL);<br>
--#else<br>
-- return PycairoSurface_FromSurface(cairo_surface_reference(surface), NULL, NULL);<br>
--#endif<br>
- }<br>
- %%<br>
- override gtk_print_job_send kwargs<br>
diff --git a/meta/recipes-devtools/python/python-pygtk/fix-pygtk-2.0.pc.patch b/meta/recipes-devtools/python/python-pygtk/fix-pygtk-2.0.pc.patch<br>
deleted file mode 100644<br>
index b6156540..0000000<br>
--- a/meta/recipes-devtools/python/python-pygtk/fix-pygtk-2.0.pc.patch<br>
+++ /dev/null<br>
@@ -1,13 +0,0 @@<br>
-Upstream-Status: Inappropriate [configuration]<br>
-<br>
-Index: pygtk-2.24.0/<a href="http://pygtk-2.0.pc.in" rel="noreferrer" target="_blank">pygtk-2.0.pc.in</a><br>
-===================================================================<br>
---- pygtk-2.24.0.orig/<a href="http://pygtk-2.0.pc.in" rel="noreferrer" target="_blank">pygtk-2.0.pc.in</a><br>
-+++ pygtk-2.24.0/<a href="http://pygtk-2.0.pc.in" rel="noreferrer" target="_blank">pygtk-2.0.pc.in</a><br>
-@@ -1,5 +1,6 @@<br>
- prefix=@prefix@<br>
- exec_prefix=@exec_prefix@<br>
-+libdir=@libdir@<br>
- includedir=@includedir@<br>
- datarootdir=@datarootdir@<br>
- datadir=@datadir@<br>
diff --git a/meta/recipes-devtools/python/python-pygtk/nodocs.patch b/meta/recipes-devtools/python/python-pygtk/nodocs.patch<br>
deleted file mode 100644<br>
index f07309a..0000000<br>
--- a/meta/recipes-devtools/python/python-pygtk/nodocs.patch<br>
+++ /dev/null<br>
@@ -1,15 +0,0 @@<br>
-Upstream-Status: Inappropriate [configuration]<br>
-<br>
-Index: pygtk-2.17.0/Makefile.am<br>
-===================================================================<br>
---- pygtk-2.17.0.orig/Makefile.am<br>
-+++ pygtk-2.17.0/Makefile.am<br>
-@@ -4,7 +4,7 @@ if BUILD_GTK<br>
- GTK_SUBDIR = gtk<br>
- endif<br>
-<br>
--SUBDIRS = . $(GTK_SUBDIR) examples tests docs<br>
-+SUBDIRS = . $(GTK_SUBDIR) examples tests<br>
-<br>
- PLATFORM_VERSION = 2.0<br>
-<br>
diff --git a/meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch b/meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch<br>
deleted file mode 100644<br>
index 833038e..0000000<br>
--- a/meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch<br>
+++ /dev/null<br>
@@ -1,16 +0,0 @@<br>
-Upstream-Status: Pending<br>
-<br>
-Index: pygtk-2.10.4/gtk/__init__.py<br>
-===================================================================<br>
---- pygtk-2.10.4.orig/gtk/__init__.py 2007-11-27 19:27:05.000000000 -0300<br>
-+++ pygtk-2.10.4/gtk/__init__.py 2007-11-27 19:28:22.000000000 -0300<br>
-@@ -78,7 +78,8 @@<br>
-<br>
- keysyms = LazyModule('keysyms', locals())<br>
-<br>
--_init()<br>
-+if not hasattr(sys.modules['__main__'], 'python_launcher_enabled'):<br>
-+ _init()<br>
-<br>
- # CAPI<br>
- _PyGtk_API = _gtk._PyGtk_API<br>
diff --git a/meta/recipes-devtools/python/python-pygtk/python-pygtk2/acinclude.m4 b/meta/recipes-devtools/python/python-pygtk/python-pygtk2/acinclude.m4<br>
deleted file mode 100644<br>
index 53518fb..0000000<br>
--- a/meta/recipes-devtools/python/python-pygtk/python-pygtk2/acinclude.m4<br>
+++ /dev/null<br>
@@ -1,90 +0,0 @@<br>
-## this one is commonly used with AM_PATH_PYTHONDIR ...<br>
-dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])<br>
-dnl Check if a module containing a given symbol is visible to python.<br>
-AC_DEFUN(AM_CHECK_PYMOD,<br>
-[AC_REQUIRE([AM_PATH_PYTHON])<br>
-py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`<br>
-AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)<br>
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [<br>
-ifelse([$2],[], [prog="<br>
-import sys<br>
-try:<br>
- import $1<br>
-except ImportError:<br>
- sys.exit(1)<br>
-except:<br>
- sys.exit(0)<br>
-sys.exit(0)"], [prog="<br>
-import $1<br>
-$1.$2"])<br>
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC<br>
- then<br>
- eval "py_cv_mod_$py_mod_var=yes"<br>
- else<br>
- eval "py_cv_mod_$py_mod_var=no"<br>
- fi<br>
-])<br>
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`<br>
-if test "x$py_val" != xno; then<br>
- AC_MSG_RESULT(yes)<br>
- ifelse([$3], [],, [$3<br>
-])dnl<br>
-else<br>
- AC_MSG_RESULT(no)<br>
- ifelse([$4], [],, [$4<br>
-])dnl<br>
-fi<br>
-])<br>
-<br>
-dnl a macro to check for ability to create python extensions<br>
-dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])<br>
-dnl function also defines PYTHON_INCLUDES<br>
-AC_DEFUN([AM_CHECK_PYTHON_HEADERS],<br>
-[AC_REQUIRE([AM_PATH_PYTHON])<br>
-AC_MSG_CHECKING(for headers required to compile python extensions)<br>
-dnl deduce PYTHON_INCLUDES<br>
-AC_ARG_WITH(python-includes,<br>
- [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval)<br>
-if test x$py_exec_prefix != x; then<br>
-PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"<br>
-else<br>
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`<br>
-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`<br>
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"<br>
-if test "$py_prefix" != "$py_exec_prefix"; then<br>
- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"<br>
-fi<br>
-fi<br>
-AC_SUBST(PYTHON_INCLUDES)<br>
-dnl check if the headers exist:<br>
-save_CPPFLAGS="$CPPFLAGS"<br>
-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"<br>
-AC_TRY_CPP([#include <Python.h>],dnl<br>
-[AC_MSG_RESULT(found)<br>
-$1],dnl<br>
-[AC_MSG_RESULT(not found)<br>
-$2])<br>
-CPPFLAGS="$save_CPPFLAGS"<br>
-])<br>
-<br>
-dnl<br>
-dnl JH_ADD_CFLAG(FLAG)<br>
-dnl checks whether the C compiler supports the given flag, and if so, adds<br>
-dnl it to $CFLAGS. If the flag is already present in the list, then the<br>
-dnl check is not performed.<br>
-AC_DEFUN([JH_ADD_CFLAG],<br>
-[<br>
-case " $CFLAGS " in<br>
-*@<:@\ \ @:>@$1@<:@\ \ @:>@*)<br>
- ;;<br>
-*)<br>
- save_CFLAGS="$CFLAGS"<br>
- CFLAGS="$CFLAGS $1"<br>
- AC_MSG_CHECKING([whether [$]CC understands $1])<br>
- AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])<br>
- AC_MSG_RESULT($jh_has_option)<br>
- if test $jh_has_option = no; then<br>
- CFLAGS="$save_CFLAGS"<br>
- fi<br>
- ;;<br>
-esac])<br>
diff --git a/meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch b/meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch<br>
deleted file mode 100644<br>
index 3ed954e..0000000<br>
--- a/meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch<br>
+++ /dev/null<br>
@@ -1,38 +0,0 @@<br>
-From dc024e9079bbffbb44436ba3e70a758ebad5520f Mon Sep 17 00:00:00 2001<br>
-From: "Song.Li" <<a href="mailto:Song.Li@windriver.com">Song.Li@windriver.com</a>><br>
-Date: Sat, 5 Jan 2013 14:55:59 +0800<br>
-Subject: [PATCH] update dependences of defs.c in Makefile.am<br>
-<br>
-In gtk/Makefile.am, defs.c should dependes on gdk-types.defs and<br>
-gtk-types.defs, otherwise it fails occasionally when parallel compile.<br>
-The error message:<br>
-"IOError: [Errno 2] No such file or directory: 'gtk-types.defs'"<br>
-<br>
-Add them to dependences of defs.c to fix this issue.<br>
-<br>
-Upstream-Status: Submitted<br>
-<a href="https://bugzilla.gnome.org/show_bug.cgi?id=702706" rel="noreferrer" target="_blank">https://bugzilla.gnome.org/show_bug.cgi?id=702706</a><br>
-<br>
-Signed-off-by: Song.Li <<a href="mailto:Song.Li@windriver.com">Song.Li@windriver.com</a>><br>
-Signed-off-by: Kai Kang <<a href="mailto:kai.kang@windriver.com">kai.kang@windriver.com</a>><br>
-<br>
----<br>
- gtk/Makefile.am | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am<br>
-index 7bb5d0c..91826cb 100644<br>
---- a/gtk/Makefile.am<br>
-+++ b/gtk/Makefile.am<br>
-@@ -289,7 +289,7 @@ if HAVE_GIO_TYPES_DEFS<br>
- extra_codegen_args += --register $(PYGOBJECT_DEFSDIR)/gio-types.defs<br>
- endif<br>
-<br>
--.defs.c:<br>
-+.defs.c: gdk-types.defs gtk-types.defs<br>
- ($(PYTHON) $(CODEGENDIR)/codegen.py \<br>
- $(PYGTK_CODEGEN_DEFINES) \<br>
- -I $(srcdir) \<br>
---<br>
-1.7.9.5<br>
-<br>
diff --git a/meta/recipes-devtools/python/<a href="http://python-pygtk_2.24.0.bb" rel="noreferrer" target="_blank">python-pygtk_2.24.0.bb</a> b/meta/recipes-devtools/python/<a href="http://python-pygtk_2.24.0.bb" rel="noreferrer" target="_blank">python-pygtk_2.24.0.bb</a><br>
deleted file mode 100644<br>
index 79b3110..0000000<br>
--- a/meta/recipes-devtools/python/<a href="http://python-pygtk_2.24.0.bb" rel="noreferrer" target="_blank">python-pygtk_2.24.0.bb</a><br>
+++ /dev/null<br>
@@ -1,55 +0,0 @@<br>
-SUMMARY = "Python bindings for the GTK+ UI toolkit"<br>
-SECTION = "devel/python"<br>
-# needs gtk+ 2.17.x<br>
-DEPENDS = "gtk+ libglade python-pycairo python-pygobject"<br>
-RDEPENDS_${PN} = "python-shell python-pycairo python-pygobject"<br>
-PROVIDES = "python-pygtk2"<br>
-SRCNAME = "pygtk"<br>
-LICENSE = "LGPLv2.1"<br>
-LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"<br>
-<br>
-PR = "r1"<br>
-<br>
-SRC_URI = "<a href="ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.24/${SRCNAME}-${PV}.tar.bz2" rel="noreferrer" target="_blank">ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.24/${SRCNAME}-${PV}.tar.bz2</a> \<br>
- file://add-gtk-types.defs-into-gdk.c-dependence.patch \<br>
- file://fix-gtkunixprint.patch \<br>
- file://prevent_to_get_display_during_import.patch \<br>
- file://nodocs.patch \<br>
- file://fix-pygtk-2.0.pc.patch \<br>
- file://acinclude.m4 \<br>
- file://update-dependences-of-defs.c.patch"<br>
-<br>
-SRC_URI[md5sum] = "a1051d5794fd7696d3c1af6422d17a49"<br>
-SRC_URI[sha256sum] = "cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912"<br>
-<br>
-S = "${WORKDIR}/${SRCNAME}-${PV}"<br>
-<br>
-EXTRA_OECONF = "--disable-docs --with-python-includes=${STAGING_INCDIR}/../"<br>
-<br>
-inherit autotools pkgconfig distutils-base distro_features_check<br>
-<br>
-ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"<br>
-<br>
-do_configure_prepend() {<br>
- install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/<br>
- sed -i \<br>
- -e s:'`$PKG_CONFIG --variable defsdir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/defs\":g \<br>
- -e s:'`$PKG_CONFIG --variable=pygtkincludedir pygobject-2.0`':\"${STAGING_INCDIR}/pygtk-2.0\":g \<br>
- -e s:'`$PKG_CONFIG --variable=datadir pygobject-2.0`':\"${STAGING_DATADIR}\":g \<br>
- -e s:'`$PKG_CONFIG --variable codegendir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/codegen\":g \<br>
- -e s:'`$PKG_CONFIG --variable=fixxref pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/xsl/fixxref.py\":g \<br>
- ${S}/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
-}<br>
-<br>
-# dirty fix #2: fix build system paths leaking in<br>
-do_install_append() {<br>
- sed -i -e '1s|^#!.*python|#!/usr/bin/env python|' ${D}${bindir}/pygtk-demo<br>
-}<br>
-<br>
-PACKAGES =+ "${PN}-demo"<br>
-FILES_${PN}-demo = " ${bindir}/pygtk-demo ${libdir}/pygtk "<br>
-RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-lang"<br>
-<br>
-# todo: revamp packaging, package demo seperatly<br>
-FILES_${PN}-dev += " ${libdir}/pygtk/2.0 ${bindir}/pygtk-* ${datadir}/pygtk/2.0"<br>
-<br>
<span class=""><font color="#888888">--<br>
2.1.4<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br></div></div>