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 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 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 4dd04de4d4ef4ef090338b045fff6d422bd83220 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sun, 15 Oct 2006 14:55:40 +0000 Subject: openzaurus-unstable: set glibc version to same as in release versions: 2.3.5+cvs20050627 - probably will close #1421 bug --- conf/distro/openzaurus-unstable.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 51922b8ad4..6be29e5c1b 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -55,6 +55,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_VERSION_binutils-cross = "2.16" PREFERRED_VERSION_binutils = "2.16" +PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" # # Opie # -- cgit v1.2.3 From 7b55d42bc99057d51ec5c8b4c3c8eb0f20407265 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 15 Oct 2006 17:34:36 +0000 Subject: generic-unstable.conf: remove generic.conf: use gcc 4.1.1 / glibc 2.4 --- conf/distro/generic-unstable.conf | 72 --------------------------------------- conf/distro/generic.conf | 20 +++++++---- 2 files changed, 14 insertions(+), 78 deletions(-) delete mode 100644 conf/distro/generic-unstable.conf diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf deleted file mode 100644 index 80fd25ae19..0000000000 --- a/conf/distro/generic-unstable.conf +++ /dev/null @@ -1,72 +0,0 @@ -#@-------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: Bleeding Edge -#@DESCRIPTION: An experimental distribution configuration -#@-------------------------------------------------------------------- - -# -# Header -# -DISTRO_NAME = "generic-unstable-glibc" -DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" -#DISTRO_TYPE = "release" -DISTRO_TYPE = "debug" - -# -# Naming schemes -# -PARALLEL_INSTALL_MODULES = "1" -INHERIT += "debian multimachine" - -# -# Packaging and output format -# -INHERIT += "package_ipk" -IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" - -# -# Binutils & Compiler -# -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" - -# -# Target OS & FPU system -# -TARGET_OS = "linux" -TARGET_FPU_arm = "soft" -TARGET_FPU_armeb = "soft" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_VERSION_glibc = "2.4" -PREFERRED_VERSION_glibc-intermediate = "2.4" - -# -# Bootstrap & Init -# -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - -# -# Framebuffer & X -# -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -PREFERRED_PROVIDER_tslib ?= tslib - -# -# GPE -# -require conf/distro/include/preferred-gpe-versions.inc - -# -# Opie -# -QTE_VERSION = "2.3.10" -PALMTOP_USE_MULTITHREADED_QTE = "yes" -require conf/distro/include/preferred-opie-versions.inc - -# -# Enlightenment -# -require conf/distro/include/preferred-e-versions.inc diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 08520f0dfe..11c9af4111 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -28,6 +28,12 @@ INHERIT += "debian multimachine" INHERIT += "package_ipk" IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" +# +# Kernel +# +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + # # Binutils & Compiler # @@ -35,11 +41,14 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_VERSION_gcc = "3.4.4" -PREFERRED_VERSION_gcc-cross = "3.4.4" -PREFERRED_VERSION_gcc-cross-initial = "3.4.4" -PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" -PREFERRED_VERSION_binutils = "2.15.94.0.1" +PREFERRED_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" +PREFERRED_VERSION_binutils ?= "2.17" +PREFERRED_VERSION_binutils-cross ?= "2.17" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" +PREFERRED_VERSION_glibc ?= "2.4" +PREFERRED_VERSION_glibc-intermediate ?= "2.4" # # Target OS & FPU system @@ -49,7 +58,6 @@ TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" # # Bootstrap & Init -- cgit v1.2.3 From 09534628785b86c589932a604487bcebaf873879 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 15 Oct 2006 20:54:13 +0000 Subject: cups: remove 1.1.19, remove 1.1.20, add fakeroot-native to 1.1.23 DEPENDS --- packages/cups/cups_1.1.19.bb | 19 ------------------- packages/cups/cups_1.1.20.bb | 19 ------------------- packages/cups/cups_1.1.23.bb | 6 ++---- 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 packages/cups/cups_1.1.19.bb delete mode 100644 packages/cups/cups_1.1.20.bb diff --git a/packages/cups/cups_1.1.19.bb b/packages/cups/cups_1.1.19.bb deleted file mode 100644 index a3bb55584e..0000000000 --- a/packages/cups/cups_1.1.19.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "console/utils" -DEPENDS = "openssl jpeg libpng zlib" -DESCRIPTION = "An Internet printing system for Unix." -LICENSE = "GPL LGPL" - -SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2" - -inherit autotools - -do_compile () { - oe_runmake "SSLLIBS=-lssl -lcrypto -L${STAGING_LIBDIR}" \ - "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \ - "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \ - "LIBZ=-lz -L${STAGING_LIBDIR}" -} - -do_install () { - oe_runmake "DSTROOT=${D}" install -} diff --git a/packages/cups/cups_1.1.20.bb b/packages/cups/cups_1.1.20.bb deleted file mode 100644 index 1d060ce677..0000000000 --- a/packages/cups/cups_1.1.20.bb +++ /dev/null @@ -1,19 +0,0 @@ -DEPENDS = "openssl jpeg libpng zlib" -DESCRIPTION = "An Internet printing system for Unix." -SECTION = "console/utils" -LICENSE = "GPL LGPL" - -SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2" - -inherit autotools - -do_compile () { - oe_runmake "SSLLIBS=-lssl -lcrypto -L${STAGING_LIBDIR}" \ - "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \ - "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \ - "LIBZ=-lz -L${STAGING_LIBDIR}" -} - -do_install () { - oe_runmake "DSTROOT=${D}" install -} diff --git a/packages/cups/cups_1.1.23.bb b/packages/cups/cups_1.1.23.bb index d5b0d649ba..8807900673 100644 --- a/packages/cups/cups_1.1.23.bb +++ b/packages/cups/cups_1.1.23.bb @@ -1,10 +1,8 @@ DESCRIPTION = "An Internet printing system for Unix." SECTION = "console/utils" LICENSE = "GPL LGPL" - -DEPENDS = "openssl jpeg libpng zlib install-native" - -PR = "r4" +DEPENDS = "openssl jpeg libpng zlib install-native fakeroot-native" +PR = "r5" SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \ file://strftime_fix.patch;patch=1" -- 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 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 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 008313e2eaf472c57ab66301df90bd64ddd84b2c Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 16 Oct 2006 12:01:24 +0000 Subject: ixp4xx-kernel-svnpatch: Allow the repo location to be overridden --- packages/linux/ixp4xx-kernel-svnpatch.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/ixp4xx-kernel-svnpatch.inc b/packages/linux/ixp4xx-kernel-svnpatch.inc index 30d7eee5dd..d986236d1b 100644 --- a/packages/linux/ixp4xx-kernel-svnpatch.inc +++ b/packages/linux/ixp4xx-kernel-svnpatch.inc @@ -1,6 +1,6 @@ addtask svnpatch before do_configure after do_patch -IXP4XX_KERNEL_SVN_REPO = http://svn.nslu2-linux.org/svnroot/kernel/trunk +IXP4XX_KERNEL_SVN_REPO ?= http://svn.nslu2-linux.org/svnroot/kernel/trunk do_svnpatch() { svn co ${IXP4XX_KERNEL_SVN_REPO}/patches/${IXP4XX_KERNEL_PATCH_DIR} --revision ${IXP4XX_KERNEL_SVN_REV} ${WORKDIR}/patches-${PV} -- cgit v1.2.3