From ec04367f46c87d5d7046b7621ee266d5723bff26 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 14 Oct 2006 19:23:05 +0000 Subject: python: add heapq and bisect support to python-lang, remove bisect from python-threading --- packages/python/python-2.4.3-manifest.inc | 10 +++++----- packages/python/python_2.4.3.bb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-2.4.3-manifest.inc b/packages/python/python-2.4.3-manifest.inc index 3a460e562a..ad73cb9451 100644 --- a/packages/python/python-2.4.3-manifest.inc +++ b/packages/python/python-2.4.3-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2006 Michael 'Mickey' Lauer ] on Fri Aug 25 15:00:35 2006 +### AUTO-GENERATED by '/local/pkg/oe/org.openembedded.dev/contrib/python/generate-manifest.py' [(C) 2002-2006 Michael 'Mickey' Lauer ] on Sat Oct 14 21:22:20 2006 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -18,9 +18,9 @@ RDEPENDS_python-profile="python-core" FILES_python-profile="${libdir}/python2.4/profile.* ${libdir}/python2.4/pstats.* " DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml0" +PR_python-threading="ml1" RDEPENDS_python-threading="python-core python-lang" -FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* " +FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* " DESCRIPTION_python-distutils="Python Distribution Utilities" PR_python-distutils="ml0" @@ -258,9 +258,9 @@ RDEPENDS_python-idle="python-core python-tkinter" FILES_python-idle="/usr/bin/idle /usr/lib/python2.4/idlelib " DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml0" +PR_python-lang="ml1" RDEPENDS_python-lang="python-core" -FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* " +FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/lib-dynload/_bisect.so ${libdir}/python2.4/lib-dynload/_heapq.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/heapq.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* " DESCRIPTION_python-audio="Python Audio Handling" PR_python-audio="ml0" diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb index 1380c2e40f..2650926307 100644 --- a/packages/python/python_2.4.3.bb +++ b/packages/python/python_2.4.3.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" PRIORITY = "optional" DEPENDS = "python-native readline zlib gdbm openssl tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" -PR = "ml6" +PR = "ml7" PYTHON_MAJMIN = "2.4" -- cgit v1.2.3 From f1831cf3e22b8b6c55679d661007f0fdb344f260 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 15 Oct 2006 14:39:21 +0000 Subject: python-pyrex[-native]: upgrade to 0.9.3.1 fixing compatibility with Python 2.4 This fixes errors like the following: TypeError: swig_sources() takes exactly 2 arguments (3 given) --- packages/python/python-pyrex-native_0.9.3.1.bb | 9 +++++++++ packages/python/python-pyrex-native_0.9.3.bb | 9 --------- packages/python/python-pyrex_0.9.3.1.bb | 14 ++++++++++++++ packages/python/python-pyrex_0.9.3.bb | 14 -------------- 4 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 packages/python/python-pyrex-native_0.9.3.1.bb delete mode 100644 packages/python/python-pyrex-native_0.9.3.bb create mode 100644 packages/python/python-pyrex_0.9.3.1.bb delete mode 100644 packages/python/python-pyrex_0.9.3.bb (limited to 'packages/python') diff --git a/packages/python/python-pyrex-native_0.9.3.1.bb b/packages/python/python-pyrex-native_0.9.3.1.bb new file mode 100644 index 0000000000..d7ec81fd8e --- /dev/null +++ b/packages/python/python-pyrex-native_0.9.3.1.bb @@ -0,0 +1,9 @@ +require python-pyrex_${PV}.bb +inherit native +DEPENDS = "python-native" +RDEPENDS = "" + +do_stage() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR} +} diff --git a/packages/python/python-pyrex-native_0.9.3.bb b/packages/python/python-pyrex-native_0.9.3.bb deleted file mode 100644 index d7ec81fd8e..0000000000 --- a/packages/python/python-pyrex-native_0.9.3.bb +++ /dev/null @@ -1,9 +0,0 @@ -require python-pyrex_${PV}.bb -inherit native -DEPENDS = "python-native" -RDEPENDS = "" - -do_stage() { - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR} -} diff --git a/packages/python/python-pyrex_0.9.3.1.bb b/packages/python/python-pyrex_0.9.3.1.bb new file mode 100644 index 0000000000..d0a5f826e0 --- /dev/null +++ b/packages/python/python-pyrex_0.9.3.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Pyrex is a language specially designed for writing Python extension modules. \ +It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \ +and the messy, low-level world of C." +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +SRCNAME = "Pyrex" +PR = "ml0" + +SRC_URI = "http://nz.cosc.canterbury.ac.nz/~greg/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils diff --git a/packages/python/python-pyrex_0.9.3.bb b/packages/python/python-pyrex_0.9.3.bb deleted file mode 100644 index d0a5f826e0..0000000000 --- a/packages/python/python-pyrex_0.9.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Pyrex is a language specially designed for writing Python extension modules. \ -It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \ -and the messy, low-level world of C." -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -SRCNAME = "Pyrex" -PR = "ml0" - -SRC_URI = "http://nz.cosc.canterbury.ac.nz/~greg/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils -- cgit v1.2.3 From ee3eeb5f7fdde0d7a8dec06e404d96006775916f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 15 Oct 2006 14:41:07 +0000 Subject: upgrade python-dbus to 0.71. patches (seem to be) no longer necessary. close #1479 --- packages/python/python-dbus/.mtn2git_empty | 0 packages/python/python-dbus/cross.patch | 15 --- packages/python/python-dbus/gettext.patch | 164 ----------------------------- packages/python/python-dbus/tmpdir.patch | 30 ------ packages/python/python-dbus_0.23.bb | 22 ---- packages/python/python-dbus_0.71.bb | 13 +++ 6 files changed, 13 insertions(+), 231 deletions(-) delete mode 100644 packages/python/python-dbus/.mtn2git_empty delete mode 100644 packages/python/python-dbus/cross.patch delete mode 100644 packages/python/python-dbus/gettext.patch delete mode 100644 packages/python/python-dbus/tmpdir.patch delete mode 100644 packages/python/python-dbus_0.23.bb create mode 100644 packages/python/python-dbus_0.71.bb (limited to 'packages/python') diff --git a/packages/python/python-dbus/.mtn2git_empty b/packages/python/python-dbus/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/python/python-dbus/cross.patch b/packages/python/python-dbus/cross.patch deleted file mode 100644 index 6d1d9d8e7e..0000000000 --- a/packages/python/python-dbus/cross.patch +++ /dev/null @@ -1,15 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- dbus-0.20/configure.in~cross -+++ dbus-0.20/configure.in -@@ -466,6 +466,7 @@ - exit (0); - ]])], - [have_abstract_sockets=yes], -+ [have_abstract_sockets=no], - [have_abstract_sockets=no]) - AC_LANG_POP(C) - AC_MSG_RESULT($have_abstract_sockets) diff --git a/packages/python/python-dbus/gettext.patch b/packages/python/python-dbus/gettext.patch deleted file mode 100644 index 7042bd0903..0000000000 --- a/packages/python/python-dbus/gettext.patch +++ /dev/null @@ -1,164 +0,0 @@ -Index: dbus-0.23/configure.in -=================================================================== ---- dbus-0.23.orig/configure.in 2005-04-02 17:14:37.780040976 -0500 -+++ dbus-0.23/configure.in 2005-04-02 17:14:38.024003888 -0500 -@@ -22,6 +22,9 @@ - AC_ISC_POSIX - AC_HEADER_STDC - -+AM_GNU_GETTEXT_VERSION(0.11.5) -+AM_GNU_GETTEXT([external], [need-ngettext]) -+ - AC_ARG_ENABLE(qt, [ --enable-qt enable Qt-friendly client library],enable_qt=$enableval,enable_qt=auto) - AC_ARG_ENABLE(glib, [ --enable-glib enable GLib-friendly client library],enable_glib=$enableval,enable_glib=auto) - AC_ARG_ENABLE(gtk, [ --enable-gtk enable GTK-requiring executables],enable_gtk=$enableval,enable_gtk=auto) -Index: dbus-0.23/glib/Makefile.am -=================================================================== ---- dbus-0.23.orig/glib/Makefile.am 2004-07-29 04:00:45.000000000 -0400 -+++ dbus-0.23/glib/Makefile.am 2005-04-02 17:22:27.302662688 -0500 -@@ -15,7 +15,7 @@ - dbus-gvalue.c \ - dbus-gvalue.h - --libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(top_builddir)/dbus/libdbus-1.la -+libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(LIBINTL) $(top_builddir)/dbus/libdbus-1.la - ## don't export symbols that start with "_" (we use this - ## convention for internal symbols) - libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -Index: dbus-0.23/glib/dbus-glib-tool.c -=================================================================== ---- dbus-0.23.orig/glib/dbus-glib-tool.c 2004-08-09 23:07:00.000000000 -0400 -+++ dbus-0.23/glib/dbus-glib-tool.c 2005-04-02 17:14:38.024003888 -0500 -@@ -26,8 +26,13 @@ - #include "dbus-gparser.h" - #include "dbus-gutils.h" - #include -+ -+#ifdef HAVE_GETTEXT - #include - #define _(x) dgettext (GETTEXT_PACKAGE, x) -+#else -+#define _(x) x -+#endif - #define N_(x) x - #include - #include -Index: dbus-0.23/glib/dbus-glib.c -=================================================================== ---- dbus-0.23.orig/glib/dbus-glib.c 2004-08-09 23:07:00.000000000 -0400 -+++ dbus-0.23/glib/dbus-glib.c 2005-04-02 17:14:38.024003888 -0500 -@@ -27,8 +27,12 @@ - #include "dbus-gtest.h" - #include "dbus-gutils.h" - -+#ifdef HAVE_GETTEXT - #include - #define _(x) dgettext (GETTEXT_PACKAGE, x) -+#else -+#define _(x) x -+#endif - #define N_(x) x - - /** -Index: dbus-0.23/glib/dbus-gmain.c -=================================================================== ---- dbus-0.23.orig/glib/dbus-gmain.c 2004-11-13 02:07:47.000000000 -0500 -+++ dbus-0.23/glib/dbus-gmain.c 2005-04-02 17:14:38.025003736 -0500 -@@ -27,8 +27,12 @@ - #include "dbus-gtest.h" - #include "dbus-gutils.h" - -+#ifdef HAVE_GETTEXT - #include - #define _(x) dgettext (GETTEXT_PACKAGE, x) -+#else -+#define _(x) x -+#endif - #define N_(x) x - - /** -Index: dbus-0.23/glib/dbus-gparser.c -=================================================================== ---- dbus-0.23.orig/glib/dbus-gparser.c 2004-08-09 23:07:00.000000000 -0400 -+++ dbus-0.23/glib/dbus-gparser.c 2005-04-02 17:14:38.025003736 -0500 -@@ -20,12 +20,18 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -+ -+#include - #include "dbus-gparser.h" - #include "dbus-gidl.h" - #include - -+#ifdef HAVE_GETTEXT - #include - #define _(x) gettext ((x)) -+#else -+#define _(x) x -+#endif - #define N_(x) x - - #ifndef DOXYGEN_SHOULD_SKIP_THIS -Index: dbus-0.23/tools/Makefile.am -=================================================================== ---- dbus-0.23.orig/tools/Makefile.am 2004-04-21 17:29:07.000000000 -0400 -+++ dbus-0.23/tools/Makefile.am 2005-04-02 17:22:00.712704976 -0500 -@@ -37,8 +37,8 @@ - - dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la - dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la --dbus_launch_LDADD= $(DBUS_X_LIBS) --dbus_viewer_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_LIBS) -+dbus_launch_LDADD= $(DBUS_X_LIBS) $(LIBINTL) -+dbus_viewer_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(LIBINTL) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_LIBS) - - man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 - EXTRA_DIST = $(man_MANS) -Index: dbus-0.23/tools/dbus-launch.c -=================================================================== ---- dbus-0.23.orig/tools/dbus-launch.c 2004-08-09 23:07:01.000000000 -0400 -+++ dbus-0.23/tools/dbus-launch.c 2005-04-02 17:14:38.026003584 -0500 -@@ -22,6 +22,8 @@ - */ - #include - #include -+#include -+#include - #include - #include - #include -Index: dbus-0.23/tools/dbus-tree-view.c -=================================================================== ---- dbus-0.23.orig/tools/dbus-tree-view.c 2004-08-09 23:07:01.000000000 -0400 -+++ dbus-0.23/tools/dbus-tree-view.c 2005-04-02 17:14:38.026003584 -0500 -@@ -24,8 +24,12 @@ - #include - #include "dbus-tree-view.h" - -+#ifdef HAVE_GETTEXT - #include - #define _(x) dgettext (GETTEXT_PACKAGE, x) -+#else -+#define _(x) x -+#endif - #define N_(x) x - - enum -Index: dbus-0.23/tools/dbus-viewer.c -=================================================================== ---- dbus-0.23.orig/tools/dbus-viewer.c 2004-08-09 23:07:01.000000000 -0400 -+++ dbus-0.23/tools/dbus-viewer.c 2005-04-02 17:14:38.027003432 -0500 -@@ -30,8 +30,12 @@ - #include - #include - -+#ifdef HAVE_GETTEXT - #include - #define _(x) dgettext (GETTEXT_PACKAGE, x) -+#else -+#define _(x) x -+#endif - #define N_(x) x - - typedef struct diff --git a/packages/python/python-dbus/tmpdir.patch b/packages/python/python-dbus/tmpdir.patch deleted file mode 100644 index 838b903f0a..0000000000 --- a/packages/python/python-dbus/tmpdir.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200 -+++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100 -@@ -1047,15 +1048,18 @@ - AC_SUBST(ABSOLUTE_TOP_BUILDDIR) - - #### Find socket directories --if ! test -z "$TMPDIR" ; then -- DEFAULT_SOCKET_DIR=$TMPDIR --elif ! test -z "$TEMP" ; then -- DEFAULT_SOCKET_DIR=$TEMP --elif ! test -z "$TMP" ; then -- DEFAULT_SOCKET_DIR=$TMP --else -- DEFAULT_SOCKET_DIR=/tmp --fi -+#if ! test -z "$TMPDIR" ; then -+# DEFAULT_SOCKET_DIR=$TMPDIR -+#elif ! test -z "$TEMP" ; then -+# DEFAULT_SOCKET_DIR=$TEMP -+#elif ! test -z "$TMP" ; then -+# DEFAULT_SOCKET_DIR=$TMP -+#else -+# DEFAULT_SOCKET_DIR=/tmp -+#fi -+ -+# checks disabled to avoid expanding this at build time -+DEFAULT_SOCKET_DIR=/tmp - - if ! test -z "$with_test_socket_dir" ; then - TEST_SOCKET_DIR="$with_test_socket_dir" diff --git a/packages/python/python-dbus_0.23.bb b/packages/python/python-dbus_0.23.bb deleted file mode 100644 index cb208d6338..0000000000 --- a/packages/python/python-dbus_0.23.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication" -SECTION = "devel/python" -HOMEPAGE = "http://www.freedesktop.org/Software/dbus" -LICENSE = "GPL" -DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python" -RDEPENDS = "dbus" -PR = "ml1" - -SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ - file://cross.patch;patch=1 \ - file://tmpdir.patch;patch=1 \ - file://gettext.patch;patch=1" -S = "${WORKDIR}/dbus-${PV}" - -inherit autotools pkgconfig gettext - -EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \ - --disable-checks --disable-xml-docs --disable-doxygen-docs \ - --with-xml=expat --without-x --enable-python" - -FILES_${PN} = "${libdir}/python2.4/site-packages/dbus.* ${libdir}/python2.4/site-packages/dbus_bindings.so" - diff --git a/packages/python/python-dbus_0.71.bb b/packages/python/python-dbus_0.71.bb new file mode 100644 index 0000000000..2ef0ffa8dd --- /dev/null +++ b/packages/python/python-dbus_0.71.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication" +SECTION = "devel/python" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +LICENSE = "GPL" +DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python" +RDEPENDS = "dbus" +PR = "ml0" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" +S = "${WORKDIR}/dbus-python-${PV}" + +inherit distutils + -- cgit v1.2.3 From dd6bd168b3777d0c76c8159deb3c58b9771af327 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 15 Oct 2006 22:37:35 +0000 Subject: add python-gobject bindings --- packages/python/python-pygobject-native_2.12.2.bb | 3 +++ packages/python/python-pygobject_2.12.2.bb | 15 +++++++++++++++ packages/python/python-pygtk2_2.8.6.bb | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 packages/python/python-pygobject-native_2.12.2.bb create mode 100644 packages/python/python-pygobject_2.12.2.bb (limited to 'packages/python') diff --git a/packages/python/python-pygobject-native_2.12.2.bb b/packages/python/python-pygobject-native_2.12.2.bb new file mode 100644 index 0000000000..c93950b31b --- /dev/null +++ b/packages/python/python-pygobject-native_2.12.2.bb @@ -0,0 +1,3 @@ +require python-pygobject_${PV}.bb + +DEPENDS = "python-native" diff --git a/packages/python/python-pygobject_2.12.2.bb b/packages/python/python-pygobject_2.12.2.bb new file mode 100644 index 0000000000..b184599ee0 --- /dev/null +++ b/packages/python/python-pygobject_2.12.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Python GObject bindings" +SECTION = "devel/python" +LICENSE = "LGPL" +PR = "ml0" + +SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2" +S = "${WORKDIR}/pygobject-${PV}" + +inherit autotools distutils-base pkgconfig + +do_stage() { + autotools_stage_all + install -d ${STAGING_LIBDIR}/../share/pygobject/ + cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/ +} diff --git a/packages/python/python-pygtk2_2.8.6.bb b/packages/python/python-pygtk2_2.8.6.bb index 55e33eab43..d1f65ea3ce 100644 --- a/packages/python/python-pygtk2_2.8.6.bb +++ b/packages/python/python-pygtk2_2.8.6.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Python GTK+ Bindings" SECTION = "devel/python" -PRIORITY = "optional" +# needs gtk+-2.8.x DEPENDS = "gtk+ libglade" RDEPENDS = "python-shell" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "r0" +PR = "ml0" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.8/${SRCNAME}-${PV}.tar.bz2 \ file://acinclude.m4" -- cgit v1.2.3 From 12144a87891f5d08b84aebab20d5e97815403914 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 15 Oct 2006 22:38:04 +0000 Subject: add pygtk 2.10.0 (for usage with gtk+ 2.10.x) --- packages/python/python-pygtk2_2.10.0.bb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 packages/python/python-pygtk2_2.10.0.bb (limited to 'packages/python') diff --git a/packages/python/python-pygtk2_2.10.0.bb b/packages/python/python-pygtk2_2.10.0.bb new file mode 100644 index 0000000000..3f52051c17 --- /dev/null +++ b/packages/python/python-pygtk2_2.10.0.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Python GTK+ Bindings" +SECTION = "devel/python" +# needs gtk+ 2.10.x +DEPENDS = "gtk+ libglade python-pygobject-native" +RDEPENDS = "python-shell" +SRCNAME = "pygtk" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \ + file://acinclude.m4" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +EXTRA_OECONF = "--disable-docs" + +inherit autotools pkgconfig distutils-base + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ +} + +do_stage() { + autotools_stage_includes + install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR}/ +} -- cgit v1.2.3 From 46076a93f6f49884ab7efd3012702c5f8ddf8d50 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 16 Oct 2006 13:31:29 +0000 Subject: add python-pycairo, python bindings to the cairo canvas library --- packages/python/python-pycairo/.mtn2git_empty | 0 packages/python/python-pycairo/fix-pkgconfig-dir.patch | 13 +++++++++++++ packages/python/python-pycairo_1.2.2.bb | 17 +++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 packages/python/python-pycairo/.mtn2git_empty create mode 100644 packages/python/python-pycairo/fix-pkgconfig-dir.patch create mode 100644 packages/python/python-pycairo_1.2.2.bb (limited to 'packages/python') diff --git a/packages/python/python-pycairo/.mtn2git_empty b/packages/python/python-pycairo/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python-pycairo/fix-pkgconfig-dir.patch b/packages/python/python-pycairo/fix-pkgconfig-dir.patch new file mode 100644 index 0000000000..15f4b3d786 --- /dev/null +++ b/packages/python/python-pycairo/fix-pkgconfig-dir.patch @@ -0,0 +1,13 @@ +Index: pycairo-1.2.2/setup.py +=================================================================== +--- pycairo-1.2.2.orig/setup.py ++++ pycairo-1.2.2/setup.py +@@ -57,7 +57,7 @@ dic.setup( + ) + + pkgconfig_dir = os.path.join (sys.prefix, 'lib', 'pkgconfig') +-pkgconfig_file = os.path.join (pkgconfig_dir, 'pycairo.pc') ++pkgconfig_file = os.path.join ('.', 'pycairo.pc') + print 'creating %s' % pkgconfig_file + fo = file (pkgconfig_file, 'w') + fo.write ("""\ diff --git a/packages/python/python-pycairo_1.2.2.bb b/packages/python/python-pycairo_1.2.2.bb new file mode 100644 index 0000000000..548d972c50 --- /dev/null +++ b/packages/python/python-pycairo_1.2.2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Python Bindings for the Cairo canvas library" +SECTION = "python-devel" +HOMEPAGE = "http://cairographics.org/pycairo" +LICENSE = "LGPL MPL" +DEPENDS = "cairo" + +SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \ + file://fix-pkgconfig-dir.patch;patch=1" +S = "${WORKDIR}/pycairo-${PV}" + +inherit distutils + +do_stage() { + install -d ${STAGING_INCDIR} + install -m 0644 cairo/pycairo.h ${STAGING_INCDIR} +} + -- cgit v1.2.3 From 498da442cc5f9503c7a37376b9da364213c35f77 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 16 Oct 2006 13:32:05 +0000 Subject: python-pygtk2 2.10.0 add patch to make it cross-build --- packages/python/python-pygobject_2.12.2.bb | 5 ++++- packages/python/python-pygtk2/fix-gtkunixprint.patch | 16 ++++++++++++++++ packages/python/python-pygtk2_2.10.0.bb | 5 +++-- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 packages/python/python-pygtk2/fix-gtkunixprint.patch (limited to 'packages/python') diff --git a/packages/python/python-pygobject_2.12.2.bb b/packages/python/python-pygobject_2.12.2.bb index b184599ee0..a79032f301 100644 --- a/packages/python/python-pygobject_2.12.2.bb +++ b/packages/python/python-pygobject_2.12.2.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Python GObject bindings" SECTION = "devel/python" LICENSE = "LGPL" -PR = "ml0" +DEPENDS = "python-pygobject-native" +PR = "ml2" SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2" S = "${WORKDIR}/pygobject-${PV}" @@ -12,4 +13,6 @@ do_stage() { autotools_stage_all install -d ${STAGING_LIBDIR}/../share/pygobject/ cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/ + install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ + cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ } diff --git a/packages/python/python-pygtk2/fix-gtkunixprint.patch b/packages/python/python-pygtk2/fix-gtkunixprint.patch new file mode 100644 index 0000000000..dca19ce5ed --- /dev/null +++ b/packages/python/python-pygtk2/fix-gtkunixprint.patch @@ -0,0 +1,16 @@ +Index: pygtk-2.10.0/gtk/gtkunixprint.override +=================================================================== +--- pygtk-2.10.0.orig/gtk/gtkunixprint.override ++++ pygtk-2.10.0/gtk/gtkunixprint.override +@@ -105,11 +105,7 @@ _wrap_gtk_print_job_get_surface(PyGObjec + if (pyg_error_check(&error)) + return NULL; + +-#if PYCAIRO_VERSION_HEX >= 0x1010600 + return PycairoSurface_FromSurface(surface, NULL); +-#else +- return PycairoSurface_FromSurface(surface, NULL, NULL); +-#endif + } + %% + override gtk_print_job_send kwargs diff --git a/packages/python/python-pygtk2_2.10.0.bb b/packages/python/python-pygtk2_2.10.0.bb index 3f52051c17..1af24b410d 100644 --- a/packages/python/python-pygtk2_2.10.0.bb +++ b/packages/python/python-pygtk2_2.10.0.bb @@ -1,13 +1,14 @@ DESCRIPTION = "Python GTK+ Bindings" SECTION = "devel/python" # needs gtk+ 2.10.x -DEPENDS = "gtk+ libglade python-pygobject-native" +DEPENDS = "gtk+ libglade python-pycairo python-pygobject" RDEPENDS = "python-shell" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "r0" +PR = "ml0" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \ + file://fix-gtkunixprint.patch;patch=1 \ file://acinclude.m4" S = "${WORKDIR}/${SRCNAME}-${PV}" -- cgit v1.2.3 From 25d3409c8a89bb4241fe0837bb40da6d5c77fea7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 18 Oct 2006 20:55:29 +0000 Subject: python-pycairo: inherit pkgconfig --- packages/python/python-pycairo_1.2.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/python') diff --git a/packages/python/python-pycairo_1.2.2.bb b/packages/python/python-pycairo_1.2.2.bb index 548d972c50..46638d2794 100644 --- a/packages/python/python-pycairo_1.2.2.bb +++ b/packages/python/python-pycairo_1.2.2.bb @@ -3,12 +3,13 @@ SECTION = "python-devel" HOMEPAGE = "http://cairographics.org/pycairo" LICENSE = "LGPL MPL" DEPENDS = "cairo" +PR = "ml1" SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \ file://fix-pkgconfig-dir.patch;patch=1" S = "${WORKDIR}/pycairo-${PV}" -inherit distutils +inherit distutils pkgconfig do_stage() { install -d ${STAGING_INCDIR} -- cgit v1.2.3 From 63cdfadedd1bfaff1b63a8485c375e8d267ea2c0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 19 Oct 2006 22:35:36 +0000 Subject: python-native 2.4.0 compile with --prefix same as --exec-prefix to fix some rare cases of distutils builds let's see if this breaks anything... --- packages/python/python-native_2.4.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-native_2.4.0.bb b/packages/python/python-native_2.4.0.bb index 18b890203f..3333512563 100644 --- a/packages/python/python-native_2.4.0.bb +++ b/packages/python/python-native_2.4.0.bb @@ -4,7 +4,7 @@ LICENSE = "PSF" SECTION = "devel/python" PRIORITY = "optional" DEPENDS = "" -PR = "r1" +PR = "r2" EXCLUDE_FROM_WORLD = "1" @@ -17,7 +17,7 @@ S = "${WORKDIR}/Python-2.4" inherit autotools native EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --without-cxx --with-signal-module --with-wctype-functions \ - --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}" + --with-prefix=${STAGING_DIR}/${BUILD_SYS} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}" EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' do_configure() { -- cgit v1.2.3 From 86ba355716b28fd055a879f1c9a786b8aa2e2c19 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 20 Oct 2006 11:41:30 +0000 Subject: python-native 2.4.0 this time, the --prefix change is actually effective --- packages/python/python-native_2.4.0.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-native_2.4.0.bb b/packages/python/python-native_2.4.0.bb index 3333512563..ff4fb14b37 100644 --- a/packages/python/python-native_2.4.0.bb +++ b/packages/python/python-native_2.4.0.bb @@ -16,8 +16,11 @@ S = "${WORKDIR}/Python-2.4" inherit autotools native -EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --without-cxx --with-signal-module --with-wctype-functions \ - --with-prefix=${STAGING_DIR}/${BUILD_SYS} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}" +prefix = ${STAGING_DIR}/${BUILD_SYS} +exec_prefix = ${STAGING_DIR}/${BUILD_SYS} + +EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ + --without-cxx --with-signal-module --with-wctype-functions" EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' do_configure() { -- cgit v1.2.3