diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-03-09 17:01:56 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-12 22:11:44 +0000 |
commit | d2e0dc1b1313671ab98d6d3be43fd35f24f1209f (patch) | |
tree | 035d98718083a39bf21c603f5166e06963c3f72d /meta | |
parent | 0c6d7cb95ea9e6a44f50560d6d2dd5a5da355a70 (diff) | |
download | poky-d2e0dc1b1313671ab98d6d3be43fd35f24f1209f.tar.gz |
python-pygtk: remove the recipe
python-pygtk hasn't been updated in several years, is incompatible
with the current version of pygobject, and is generally obsolete as
all modern python gtk apps use introspection directly.
(From OE-Core rev: 14f62d1663b7a9082b8026cd5d22eea66ad75174)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
11 files changed, 0 insertions, 371 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index d37aefb5ba..c8f93955d3 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc | |||
@@ -343,7 +343,6 @@ DISTRO_PN_ALIAS_pn-python-mako = "Fedora=python-mako Opensuse=python-Mako" | |||
343 | DISTRO_PN_ALIAS_pn-python-pycairo = "Meego=pycairo Fedora=pycairo Ubuntu=pycairo Debian=pycairo" | 343 | DISTRO_PN_ALIAS_pn-python-pycairo = "Meego=pycairo Fedora=pycairo Ubuntu=pycairo Debian=pycairo" |
344 | DISTRO_PN_ALIAS_pn-python-pycurl = "Debian=python-pycurl Ubuntu=python-pycurl" | 344 | DISTRO_PN_ALIAS_pn-python-pycurl = "Debian=python-pycurl Ubuntu=python-pycurl" |
345 | DISTRO_PN_ALIAS_pn-python-pygobject = "Meego=pygobject2 Fedora=pygobject2 Ubuntu=pygobject Debian=pygobject" | 345 | DISTRO_PN_ALIAS_pn-python-pygobject = "Meego=pygobject2 Fedora=pygobject2 Ubuntu=pygobject Debian=pygobject" |
346 | DISTRO_PN_ALIAS_pn-python-pygtk = "Debian=python-gtk2 Fedora=pygtk2 OpenSuSE=python-gtk" | ||
347 | DISTRO_PN_ALIAS_pn-python-pyrex = "Mandriva=python-pyrex Ubuntu=python-pyrex" | 346 | DISTRO_PN_ALIAS_pn-python-pyrex = "Mandriva=python-pyrex Ubuntu=python-pyrex" |
348 | DISTRO_PN_ALIAS_pn-python-scons = "Fedora=scons OpenSuSE=scons Ubuntu=scons Mandriva=scons Debian=scons" | 347 | DISTRO_PN_ALIAS_pn-python-scons = "Fedora=scons OpenSuSE=scons Ubuntu=scons Mandriva=scons Debian=scons" |
349 | DISTRO_PN_ALIAS_pn-python-setuptools = "Mandriva=python-setup OpenSuSE=python-setup-git" | 348 | DISTRO_PN_ALIAS_pn-python-setuptools = "Mandriva=python-setup OpenSuSE=python-setup-git" |
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 15024cf152..68949b76da 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | |||
@@ -189,7 +189,6 @@ RDEPENDS_packagegroup-self-hosted-graphics = "\ | |||
189 | libsdl \ | 189 | libsdl \ |
190 | libsdl-dev \ | 190 | libsdl-dev \ |
191 | libx11-dev \ | 191 | libx11-dev \ |
192 | python-pygtk \ | ||
193 | gtk-theme-clearlooks \ | 192 | gtk-theme-clearlooks \ |
194 | xdg-utils \ | 193 | xdg-utils \ |
195 | epiphany \ | 194 | epiphany \ |
diff --git a/meta/recipes-devtools/python/python-pygtk/acinclude.m4 b/meta/recipes-devtools/python/python-pygtk/acinclude.m4 deleted file mode 100644 index 53518fb2eb..0000000000 --- a/meta/recipes-devtools/python/python-pygtk/acinclude.m4 +++ /dev/null | |||
@@ -1,90 +0,0 @@ | |||
1 | ## this one is commonly used with AM_PATH_PYTHONDIR ... | ||
2 | dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) | ||
3 | dnl Check if a module containing a given symbol is visible to python. | ||
4 | AC_DEFUN(AM_CHECK_PYMOD, | ||
5 | [AC_REQUIRE([AM_PATH_PYTHON]) | ||
6 | py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` | ||
7 | AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) | ||
8 | AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ | ||
9 | ifelse([$2],[], [prog=" | ||
10 | import sys | ||
11 | try: | ||
12 | import $1 | ||
13 | except ImportError: | ||
14 | sys.exit(1) | ||
15 | except: | ||
16 | sys.exit(0) | ||
17 | sys.exit(0)"], [prog=" | ||
18 | import $1 | ||
19 | $1.$2"]) | ||
20 | if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC | ||
21 | then | ||
22 | eval "py_cv_mod_$py_mod_var=yes" | ||
23 | else | ||
24 | eval "py_cv_mod_$py_mod_var=no" | ||
25 | fi | ||
26 | ]) | ||
27 | py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` | ||
28 | if test "x$py_val" != xno; then | ||
29 | AC_MSG_RESULT(yes) | ||
30 | ifelse([$3], [],, [$3 | ||
31 | ])dnl | ||
32 | else | ||
33 | AC_MSG_RESULT(no) | ||
34 | ifelse([$4], [],, [$4 | ||
35 | ])dnl | ||
36 | fi | ||
37 | ]) | ||
38 | |||
39 | dnl a macro to check for ability to create python extensions | ||
40 | dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) | ||
41 | dnl function also defines PYTHON_INCLUDES | ||
42 | AC_DEFUN([AM_CHECK_PYTHON_HEADERS], | ||
43 | [AC_REQUIRE([AM_PATH_PYTHON]) | ||
44 | AC_MSG_CHECKING(for headers required to compile python extensions) | ||
45 | dnl deduce PYTHON_INCLUDES | ||
46 | AC_ARG_WITH(python-includes, | ||
47 | [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) | ||
48 | if test x$py_exec_prefix != x; then | ||
49 | PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
50 | else | ||
51 | py_prefix=`$PYTHON -c "import sys; print sys.prefix"` | ||
52 | py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` | ||
53 | PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" | ||
54 | if test "$py_prefix" != "$py_exec_prefix"; then | ||
55 | PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
56 | fi | ||
57 | fi | ||
58 | AC_SUBST(PYTHON_INCLUDES) | ||
59 | dnl check if the headers exist: | ||
60 | save_CPPFLAGS="$CPPFLAGS" | ||
61 | CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" | ||
62 | AC_TRY_CPP([#include <Python.h>],dnl | ||
63 | [AC_MSG_RESULT(found) | ||
64 | $1],dnl | ||
65 | [AC_MSG_RESULT(not found) | ||
66 | $2]) | ||
67 | CPPFLAGS="$save_CPPFLAGS" | ||
68 | ]) | ||
69 | |||
70 | dnl | ||
71 | dnl JH_ADD_CFLAG(FLAG) | ||
72 | dnl checks whether the C compiler supports the given flag, and if so, adds | ||
73 | dnl it to $CFLAGS. If the flag is already present in the list, then the | ||
74 | dnl check is not performed. | ||
75 | AC_DEFUN([JH_ADD_CFLAG], | ||
76 | [ | ||
77 | case " $CFLAGS " in | ||
78 | *@<:@\ \ @:>@$1@<:@\ \ @:>@*) | ||
79 | ;; | ||
80 | *) | ||
81 | save_CFLAGS="$CFLAGS" | ||
82 | CFLAGS="$CFLAGS $1" | ||
83 | AC_MSG_CHECKING([whether [$]CC understands $1]) | ||
84 | AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no]) | ||
85 | AC_MSG_RESULT($jh_has_option) | ||
86 | if test $jh_has_option = no; then | ||
87 | CFLAGS="$save_CFLAGS" | ||
88 | fi | ||
89 | ;; | ||
90 | esac]) | ||
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 deleted file mode 100644 index df0f9cd6c0..0000000000 --- a/meta/recipes-devtools/python/python-pygtk/add-gtk-types.defs-into-gdk.c-dependence.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | |||
3 | add gtk-types.defs into gdk.c dependence | ||
4 | |||
5 | gdk.c depends on gtk-types.defs but | ||
6 | gdk/Makefile.am miss this. This will cause | ||
7 | build error sometimes when built | ||
8 | with multi-jobbing, so add gtk-types.defs into | ||
9 | gdk.c dependence. | ||
10 | |||
11 | Signed-off-by: Song.Li <Song.Li@windriver.com> | ||
12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
13 | --- | ||
14 | gtk/Makefile.am | 2 +- | ||
15 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
16 | |||
17 | diff --git a/gtk/Makefile.am b/gtk/Makefile.am | ||
18 | index 7bb5d0c..4a88351 100644 | ||
19 | --- a/gtk/Makefile.am | ||
20 | +++ b/gtk/Makefile.am | ||
21 | @@ -214,7 +214,7 @@ gtkunixprint.defs: $(GTKUNIXPRINT_DEFS) Makefile | ||
22 | gtkunixprint-types.defs: $(GTKUNIXPRINT_TYPES_DEFS) Makefile | ||
23 | $(CREATEDEFS) $@ $(GTKUNIXPRINT_TYPES_DEFS) | ||
24 | |||
25 | -gdk.c: gdk-types.defs gdk.defs $(GDK_OVERRIDES) | ||
26 | +gdk.c: gdk-types.defs gtk-types.defs gdk.defs $(GDK_OVERRIDES) | ||
27 | gtk.c: gdk-types.defs gtk-types.defs gtk.defs gdk-types.defs $(GTK_OVERRIDES) | ||
28 | _gtk_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTK_CFLAGS) | ||
29 | _gtk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk | ||
30 | -- | ||
31 | 1.7.4 | ||
32 | |||
diff --git a/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch b/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch deleted file mode 100644 index 16c0e8e770..0000000000 --- a/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
4 | |||
5 | Index: pygtk-2.24.0/gtk/gtkunixprint.override | ||
6 | =================================================================== | ||
7 | --- pygtk-2.24.0.orig/gtk/gtkunixprint.override | ||
8 | +++ pygtk-2.24.0/gtk/gtkunixprint.override | ||
9 | @@ -102,11 +102,6 @@ _wrap_gtk_print_job_get_surface(PyGObjec | ||
10 | if (pyg_error_check(&error)) | ||
11 | return NULL; | ||
12 | |||
13 | -#if PYCAIRO_VERSION_HEX >= 0x1010600 | ||
14 | - return PycairoSurface_FromSurface(cairo_surface_reference(surface), NULL); | ||
15 | -#else | ||
16 | - return PycairoSurface_FromSurface(cairo_surface_reference(surface), NULL, NULL); | ||
17 | -#endif | ||
18 | } | ||
19 | %% | ||
20 | override gtk_print_job_send kwargs | ||
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 deleted file mode 100644 index b6156540bd..0000000000 --- a/meta/recipes-devtools/python/python-pygtk/fix-pygtk-2.0.pc.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: pygtk-2.24.0/pygtk-2.0.pc.in | ||
4 | =================================================================== | ||
5 | --- pygtk-2.24.0.orig/pygtk-2.0.pc.in | ||
6 | +++ pygtk-2.24.0/pygtk-2.0.pc.in | ||
7 | @@ -1,5 +1,6 @@ | ||
8 | prefix=@prefix@ | ||
9 | exec_prefix=@exec_prefix@ | ||
10 | +libdir=@libdir@ | ||
11 | includedir=@includedir@ | ||
12 | datarootdir=@datarootdir@ | ||
13 | datadir=@datadir@ | ||
diff --git a/meta/recipes-devtools/python/python-pygtk/nodocs.patch b/meta/recipes-devtools/python/python-pygtk/nodocs.patch deleted file mode 100644 index f07309a7ba..0000000000 --- a/meta/recipes-devtools/python/python-pygtk/nodocs.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: pygtk-2.17.0/Makefile.am | ||
4 | =================================================================== | ||
5 | --- pygtk-2.17.0.orig/Makefile.am | ||
6 | +++ pygtk-2.17.0/Makefile.am | ||
7 | @@ -4,7 +4,7 @@ if BUILD_GTK | ||
8 | GTK_SUBDIR = gtk | ||
9 | endif | ||
10 | |||
11 | -SUBDIRS = . $(GTK_SUBDIR) examples tests docs | ||
12 | +SUBDIRS = . $(GTK_SUBDIR) examples tests | ||
13 | |||
14 | PLATFORM_VERSION = 2.0 | ||
15 | |||
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 deleted file mode 100644 index 833038e7f8..0000000000 --- a/meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: pygtk-2.10.4/gtk/__init__.py | ||
4 | =================================================================== | ||
5 | --- pygtk-2.10.4.orig/gtk/__init__.py 2007-11-27 19:27:05.000000000 -0300 | ||
6 | +++ pygtk-2.10.4/gtk/__init__.py 2007-11-27 19:28:22.000000000 -0300 | ||
7 | @@ -78,7 +78,8 @@ | ||
8 | |||
9 | keysyms = LazyModule('keysyms', locals()) | ||
10 | |||
11 | -_init() | ||
12 | +if not hasattr(sys.modules['__main__'], 'python_launcher_enabled'): | ||
13 | + _init() | ||
14 | |||
15 | # CAPI | ||
16 | _PyGtk_API = _gtk._PyGtk_API | ||
diff --git a/meta/recipes-devtools/python/python-pygtk/python-pygtk2/acinclude.m4 b/meta/recipes-devtools/python/python-pygtk/python-pygtk2/acinclude.m4 deleted file mode 100644 index 53518fb2eb..0000000000 --- a/meta/recipes-devtools/python/python-pygtk/python-pygtk2/acinclude.m4 +++ /dev/null | |||
@@ -1,90 +0,0 @@ | |||
1 | ## this one is commonly used with AM_PATH_PYTHONDIR ... | ||
2 | dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) | ||
3 | dnl Check if a module containing a given symbol is visible to python. | ||
4 | AC_DEFUN(AM_CHECK_PYMOD, | ||
5 | [AC_REQUIRE([AM_PATH_PYTHON]) | ||
6 | py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` | ||
7 | AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) | ||
8 | AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ | ||
9 | ifelse([$2],[], [prog=" | ||
10 | import sys | ||
11 | try: | ||
12 | import $1 | ||
13 | except ImportError: | ||
14 | sys.exit(1) | ||
15 | except: | ||
16 | sys.exit(0) | ||
17 | sys.exit(0)"], [prog=" | ||
18 | import $1 | ||
19 | $1.$2"]) | ||
20 | if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC | ||
21 | then | ||
22 | eval "py_cv_mod_$py_mod_var=yes" | ||
23 | else | ||
24 | eval "py_cv_mod_$py_mod_var=no" | ||
25 | fi | ||
26 | ]) | ||
27 | py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` | ||
28 | if test "x$py_val" != xno; then | ||
29 | AC_MSG_RESULT(yes) | ||
30 | ifelse([$3], [],, [$3 | ||
31 | ])dnl | ||
32 | else | ||
33 | AC_MSG_RESULT(no) | ||
34 | ifelse([$4], [],, [$4 | ||
35 | ])dnl | ||
36 | fi | ||
37 | ]) | ||
38 | |||
39 | dnl a macro to check for ability to create python extensions | ||
40 | dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) | ||
41 | dnl function also defines PYTHON_INCLUDES | ||
42 | AC_DEFUN([AM_CHECK_PYTHON_HEADERS], | ||
43 | [AC_REQUIRE([AM_PATH_PYTHON]) | ||
44 | AC_MSG_CHECKING(for headers required to compile python extensions) | ||
45 | dnl deduce PYTHON_INCLUDES | ||
46 | AC_ARG_WITH(python-includes, | ||
47 | [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) | ||
48 | if test x$py_exec_prefix != x; then | ||
49 | PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
50 | else | ||
51 | py_prefix=`$PYTHON -c "import sys; print sys.prefix"` | ||
52 | py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` | ||
53 | PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" | ||
54 | if test "$py_prefix" != "$py_exec_prefix"; then | ||
55 | PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
56 | fi | ||
57 | fi | ||
58 | AC_SUBST(PYTHON_INCLUDES) | ||
59 | dnl check if the headers exist: | ||
60 | save_CPPFLAGS="$CPPFLAGS" | ||
61 | CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" | ||
62 | AC_TRY_CPP([#include <Python.h>],dnl | ||
63 | [AC_MSG_RESULT(found) | ||
64 | $1],dnl | ||
65 | [AC_MSG_RESULT(not found) | ||
66 | $2]) | ||
67 | CPPFLAGS="$save_CPPFLAGS" | ||
68 | ]) | ||
69 | |||
70 | dnl | ||
71 | dnl JH_ADD_CFLAG(FLAG) | ||
72 | dnl checks whether the C compiler supports the given flag, and if so, adds | ||
73 | dnl it to $CFLAGS. If the flag is already present in the list, then the | ||
74 | dnl check is not performed. | ||
75 | AC_DEFUN([JH_ADD_CFLAG], | ||
76 | [ | ||
77 | case " $CFLAGS " in | ||
78 | *@<:@\ \ @:>@$1@<:@\ \ @:>@*) | ||
79 | ;; | ||
80 | *) | ||
81 | save_CFLAGS="$CFLAGS" | ||
82 | CFLAGS="$CFLAGS $1" | ||
83 | AC_MSG_CHECKING([whether [$]CC understands $1]) | ||
84 | AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no]) | ||
85 | AC_MSG_RESULT($jh_has_option) | ||
86 | if test $jh_has_option = no; then | ||
87 | CFLAGS="$save_CFLAGS" | ||
88 | fi | ||
89 | ;; | ||
90 | esac]) | ||
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 deleted file mode 100644 index 3ed954eee5..0000000000 --- a/meta/recipes-devtools/python/python-pygtk/update-dependences-of-defs.c.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From dc024e9079bbffbb44436ba3e70a758ebad5520f Mon Sep 17 00:00:00 2001 | ||
2 | From: "Song.Li" <Song.Li@windriver.com> | ||
3 | Date: Sat, 5 Jan 2013 14:55:59 +0800 | ||
4 | Subject: [PATCH] update dependences of defs.c in Makefile.am | ||
5 | |||
6 | In gtk/Makefile.am, defs.c should dependes on gdk-types.defs and | ||
7 | gtk-types.defs, otherwise it fails occasionally when parallel compile. | ||
8 | The error message: | ||
9 | "IOError: [Errno 2] No such file or directory: 'gtk-types.defs'" | ||
10 | |||
11 | Add them to dependences of defs.c to fix this issue. | ||
12 | |||
13 | Upstream-Status: Submitted | ||
14 | https://bugzilla.gnome.org/show_bug.cgi?id=702706 | ||
15 | |||
16 | Signed-off-by: Song.Li <Song.Li@windriver.com> | ||
17 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
18 | |||
19 | --- | ||
20 | gtk/Makefile.am | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/gtk/Makefile.am b/gtk/Makefile.am | ||
24 | index 7bb5d0c..91826cb 100644 | ||
25 | --- a/gtk/Makefile.am | ||
26 | +++ b/gtk/Makefile.am | ||
27 | @@ -289,7 +289,7 @@ if HAVE_GIO_TYPES_DEFS | ||
28 | extra_codegen_args += --register $(PYGOBJECT_DEFSDIR)/gio-types.defs | ||
29 | endif | ||
30 | |||
31 | -.defs.c: | ||
32 | +.defs.c: gdk-types.defs gtk-types.defs | ||
33 | ($(PYTHON) $(CODEGENDIR)/codegen.py \ | ||
34 | $(PYGTK_CODEGEN_DEFINES) \ | ||
35 | -I $(srcdir) \ | ||
36 | -- | ||
37 | 1.7.9.5 | ||
38 | |||
diff --git a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb deleted file mode 100644 index 79b3110e30..0000000000 --- a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | SUMMARY = "Python bindings for the GTK+ UI toolkit" | ||
2 | SECTION = "devel/python" | ||
3 | # needs gtk+ 2.17.x | ||
4 | DEPENDS = "gtk+ libglade python-pycairo python-pygobject" | ||
5 | RDEPENDS_${PN} = "python-shell python-pycairo python-pygobject" | ||
6 | PROVIDES = "python-pygtk2" | ||
7 | SRCNAME = "pygtk" | ||
8 | LICENSE = "LGPLv2.1" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" | ||
10 | |||
11 | PR = "r1" | ||
12 | |||
13 | SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.24/${SRCNAME}-${PV}.tar.bz2 \ | ||
14 | file://add-gtk-types.defs-into-gdk.c-dependence.patch \ | ||
15 | file://fix-gtkunixprint.patch \ | ||
16 | file://prevent_to_get_display_during_import.patch \ | ||
17 | file://nodocs.patch \ | ||
18 | file://fix-pygtk-2.0.pc.patch \ | ||
19 | file://acinclude.m4 \ | ||
20 | file://update-dependences-of-defs.c.patch" | ||
21 | |||
22 | SRC_URI[md5sum] = "a1051d5794fd7696d3c1af6422d17a49" | ||
23 | SRC_URI[sha256sum] = "cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912" | ||
24 | |||
25 | S = "${WORKDIR}/${SRCNAME}-${PV}" | ||
26 | |||
27 | EXTRA_OECONF = "--disable-docs --with-python-includes=${STAGING_INCDIR}/../" | ||
28 | |||
29 | inherit autotools pkgconfig distutils-base distro_features_check | ||
30 | |||
31 | ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" | ||
32 | |||
33 | do_configure_prepend() { | ||
34 | install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ | ||
35 | sed -i \ | ||
36 | -e s:'`$PKG_CONFIG --variable defsdir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/defs\":g \ | ||
37 | -e s:'`$PKG_CONFIG --variable=pygtkincludedir pygobject-2.0`':\"${STAGING_INCDIR}/pygtk-2.0\":g \ | ||
38 | -e s:'`$PKG_CONFIG --variable=datadir pygobject-2.0`':\"${STAGING_DATADIR}\":g \ | ||
39 | -e s:'`$PKG_CONFIG --variable codegendir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/codegen\":g \ | ||
40 | -e s:'`$PKG_CONFIG --variable=fixxref pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/xsl/fixxref.py\":g \ | ||
41 | ${S}/configure.ac | ||
42 | } | ||
43 | |||
44 | # dirty fix #2: fix build system paths leaking in | ||
45 | do_install_append() { | ||
46 | sed -i -e '1s|^#!.*python|#!/usr/bin/env python|' ${D}${bindir}/pygtk-demo | ||
47 | } | ||
48 | |||
49 | PACKAGES =+ "${PN}-demo" | ||
50 | FILES_${PN}-demo = " ${bindir}/pygtk-demo ${libdir}/pygtk " | ||
51 | RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-lang" | ||
52 | |||
53 | # todo: revamp packaging, package demo seperatly | ||
54 | FILES_${PN}-dev += " ${libdir}/pygtk/2.0 ${bindir}/pygtk-* ${datadir}/pygtk/2.0" | ||
55 | |||