gtk+-directfb: r0 Added verion 2.10.14, deleted 2.10.9, fixed gtk-2.10.inc

diff --git a/packages/gtk+/files/directfb-pixbuf-deprecated-fix.patch b/packages/gtk+/files/directfb-pixbuf-deprecated-fix.patch
new file mode 100644 (file)
index 0000000..2def90f
--- /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.9.bb b/packages/gtk+/gtk+-directfb_2.10.14.bb
similarity index 67%
rename from packages/gtk+/gtk+-directfb_2.10.9.bb
rename to packages/gtk+/gtk+-directfb_2.10.14.bb
index f8062f3..d661e20 100644 (file)
--- a/packages/gtk+/gtk+-directfb_2.10.9.bb
+++ b/packages/gtk+/gtk+-directfb_2.10.14.bb
@@ -6,9 +6,22 @@ PR = "r0"
 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 \
@@ -25,7 +38,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            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://directfb-pixbuf-deprecated-fix.patch;patch=1 \
 #         file://gtk-doc.patch;patch=1 \
 "
 EXTRA_OECONF =" \

diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc
index 4632435..c3bbb02 100644 (file)
--- 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 \