From ab1d6128b69e25b7b4ce78d13a337a8842e96b3a Mon Sep 17 00:00:00 2001 From: Shane Volpe Date: Mon, 24 Sep 2007 20:53:25 +0000 Subject: gtk+-directfb: r0 Added verion 2.10.14, deleted 2.10.9, fixed gtk-2.10.inc --- .../files/directfb-pixbuf-deprecated-fix.patch | 34 +++++++++++++++ packages/gtk+/gtk+-directfb_2.10.14.bb | 51 ++++++++++++++++++++++ packages/gtk+/gtk+-directfb_2.10.9.bb | 38 ---------------- packages/gtk+/gtk-2.10.inc | 1 + 4 files changed, 86 insertions(+), 38 deletions(-) create mode 100644 packages/gtk+/files/directfb-pixbuf-deprecated-fix.patch create mode 100644 packages/gtk+/gtk+-directfb_2.10.14.bb delete mode 100644 packages/gtk+/gtk+-directfb_2.10.9.bb (limited to 'packages/gtk+') diff --git a/packages/gtk+/files/directfb-pixbuf-deprecated-fix.patch b/packages/gtk+/files/directfb-pixbuf-deprecated-fix.patch new file mode 100644 index 0000000000..2def90f7e4 --- /dev/null +++ b/packages/gtk+/files/directfb-pixbuf-deprecated-fix.patch @@ -0,0 +1,34 @@ +--- gtk+-2.10.14/gdk/directfb/Makefile.am.orig 2007-07-16 15:46:15.000000000 -0400 ++++ gtk+-2.10.14/gdk/directfb/Makefile.am 2007-09-24 15:12:14.000000000 -0400 +@@ -8,7 +8,6 @@ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ + -I$(top_builddir)/gdk \ +- -DG_DISABLE_DEPRECATED \ + @GTK_DEBUG_FLAGS@ \ + @GDK_DEP_CFLAGS@ + +--- gtk+-2.10.14/gdk/quartz/Makefile.am.orig 2007-07-16 15:46:18.000000000 -0400 ++++ gtk+-2.10.14/gdk/quartz/Makefile.am 2007-09-24 15:12:28.000000000 -0400 +@@ -7,7 +7,6 @@ + -I$(top_srcdir)/gdk \ + -I$(top_builddir)/gdk \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ + $(GTK_DEBUG_FLAGS) \ + $(GDK_DEP_CFLAGS) \ + "-xobjective-c" + +diff -ur gtk+-2.10.9~org/gdk-pixbuf/pixops/Makefile.am gtk+-2.10.9/gdk-pixbuf/pixops/Makefile.am +--- gtk+-2.10.9~org/gdk-pixbuf/pixops/Makefile.am 2007-03-18 00:02:40.000000000 -0400 ++++ gtk+-2.10.9/gdk-pixbuf/pixops/Makefile.am 2007-03-18 10:25:06.000000000 -0400 +@@@ -3,8 +3,7 @@ + INCLUDES = \ + -I$(top_srcdir) -I$(top_builddir) \ + $(GTK_DEBUG_FLAGS) \ +- $(GDK_PIXBUF_DEP_CFLAGS) \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED ++ $(GDK_PIXBUF_DEP_CFLAGS) + + noinst_PROGRAMS = timescale + diff --git a/packages/gtk+/gtk+-directfb_2.10.14.bb b/packages/gtk+/gtk+-directfb_2.10.14.bb new file mode 100644 index 0000000000..d661e20433 --- /dev/null +++ b/packages/gtk+/gtk+-directfb_2.10.14.bb @@ -0,0 +1,51 @@ +require gtk-2.10.inc + +PR = "r0" + +# disable per default - untested and not all patches included. +DEFAULT_PREFERENCE = "-1" +S = "${WORKDIR}/gtk+-${PV}" + + +DEPENDS = "glib-2.0 pango-directfb atk jpeg libpng gtk-doc libgcrypt cairo-directfb cups" +LDFLAGS_append += " -ldirectfb" +CFLAGS_append += " -I${STAGING_INCDIR}/directfb" + +#NEATSTUFF = " ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif " + +#PACKAGES_DYNAMIC_${PN} = " ${NEATSTUFF} " +#PACKAGES_DYNAMIC_${PN}_linux = " ${NEATSTUFF} glibc-gconv-iso8859-1 " +#PACKAGES_DYNAMIC_${PN}_linux-gnueabi = " ${NEATSTUFF} glibc-gconv-iso8859-1" +RRECOMMENDS_${PN} = " " +RRECOMMENDS_${PN}_linux = " " +RRECOMMENDS_${PN}_linux-gnueabi = " " + +FILESPATH = "${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files" + +SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ + file://no-xwc.patch;patch=1 \ + file://automake-lossage.patch;patch=1 \ + file://disable-tooltips.patch;patch=1 \ + file://gtklabel-resize-patch;patch=1 \ + file://menu-deactivate.patch;patch=1 \ + file://xsettings.patch;patch=1 \ + file://scroll-timings.patch;patch=1 \ + file://small-gtkfilesel.patch;patch=1 \ + file://migration.patch;patch=1;pnum=0 \ + file://run-iconcache.patch;patch=1 \ + file://hardcoded_libtool.patch;patch=1 \ + file://no-demos.patch;patch=1 \ + file://single-click.patch;patch=1 \ + file://spinbutton.patch;patch=1 \ + file://gtk+-handhelds.patch;patch=1 \ + file://directfb-pixbuf-deprecated-fix.patch;patch=1 \ +# file://gtk-doc.patch;patch=1 \ +" +EXTRA_OECONF =" \ + --prefix=${STAGING_DIR} \ + --with-gdktarget=directfb \ + --without-x \ + --without-libtiff \ + " +GDKTARGET="directfb" + diff --git a/packages/gtk+/gtk+-directfb_2.10.9.bb b/packages/gtk+/gtk+-directfb_2.10.9.bb deleted file mode 100644 index f8062f33f7..0000000000 --- a/packages/gtk+/gtk+-directfb_2.10.9.bb +++ /dev/null @@ -1,38 +0,0 @@ -require gtk-2.10.inc - -PR = "r0" - -# disable per default - untested and not all patches included. -DEFAULT_PREFERENCE = "-1" -S = "${WORKDIR}/gtk+-${PV}" - -LDFLAGS_append += " -ldirectfb" -CFLAGS_append += " -I${STAGING_INCDIR}/directfb" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ - file://no-xwc.patch;patch=1 \ - file://automake-lossage.patch;patch=1 \ - file://disable-tooltips.patch;patch=1 \ - file://gtklabel-resize-patch;patch=1 \ - file://menu-deactivate.patch;patch=1 \ - file://xsettings.patch;patch=1 \ - file://scroll-timings.patch;patch=1 \ - file://small-gtkfilesel.patch;patch=1 \ - file://migration.patch;patch=1;pnum=0 \ - file://run-iconcache.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://single-click.patch;patch=1 \ - file://spinbutton.patch;patch=1 \ - file://gtk+-handhelds.patch;patch=1 \ - file://directfb_pixbuf_deprecated_fix.patch;patch=1 \ -# file://gtk-doc.patch;patch=1 \ -" -EXTRA_OECONF =" \ - --prefix=${STAGING_DIR} \ - --with-gdktarget=directfb \ - --without-x \ - --without-libtiff \ - " -GDKTARGET="directfb" - diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc index 463243554c..c3bbb0232a 100644 --- a/packages/gtk+/gtk-2.10.inc +++ b/packages/gtk+/gtk-2.10.inc @@ -14,6 +14,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/lib*.so.* \ ${datadir}/themes ${sysconfdir} \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so \ +" FILES_${PN}-dev += " \ ${datadir}/gtk-2.0/include \ ${libdir}/gtk-2.0/include \ -- cgit 1.2.3-korg