Double-Reverting doesn't make sense :P
authorMichael Mrozek <EvilDragon@openpandora.de>
Sat, 14 Aug 2010 14:13:19 +0000 (16:13 +0200)
committerMichael Mrozek <EvilDragon@openpandora.de>
Sat, 14 Aug 2010 14:13:19 +0000 (16:13 +0200)
This reverts commit 5ce539376fce57119d62699cf23d51f0bd503eed.

29 files changed:
recipes/gtk+/composite-pixbuf_0.0.bb
recipes/gtk+/gdk-pixbuf-csource-native_2.12.11.bb
recipes/gtk+/gdk-pixbuf_2.10.14.bb
recipes/gtk+/gtk+-1.2_1.2.10.bb
recipes/gtk+/gtk+-2.20.0/cross-nm.patch [deleted file]
recipes/gtk+/gtk+-2.20.1/cross-nm.patch [deleted file]
recipes/gtk+/gtk+-2.20.1/gtk-dnd-grab-deadlock-fix.patch [deleted file]
recipes/gtk+/gtk+-2.20.1/hardcoded_libtool.patch [deleted file]
recipes/gtk+/gtk+-2.20.1/no-demos.patch [deleted file]
recipes/gtk+/gtk+-2.20.1/run-iconcache.patch [deleted file]
recipes/gtk+/gtk+-2.20.1/toggle-font.diff [deleted file]
recipes/gtk+/gtk+-fastscaling_2.10.14.bb
recipes/gtk+/gtk+.inc
recipes/gtk+/gtk+_2.10.14.bb
recipes/gtk+/gtk+_2.12.0.bb
recipes/gtk+/gtk+_2.12.11.bb
recipes/gtk+/gtk+_2.12.3.bb
recipes/gtk+/gtk+_2.14.1.bb
recipes/gtk+/gtk+_2.14.2.bb
recipes/gtk+/gtk+_2.16.4.bb
recipes/gtk+/gtk+_2.16.6.bb
recipes/gtk+/gtk+_2.18.0.bb
recipes/gtk+/gtk+_2.18.3.bb
recipes/gtk+/gtk+_2.18.6.bb
recipes/gtk+/gtk+_2.20.0.bb
recipes/gtk+/gtk+_2.20.1.bb [deleted file]
recipes/gtk+/gtk+_2.6.10.bb
recipes/gtk+/gtk+_2.8.16.bb
recipes/gtk+/gtk+_2.8.9.bb

index 29e329a..729343f 100644 (file)
@@ -16,6 +16,3 @@ do_install() {
         install -d ${D}${bindir} 
         install -m 755 composite_pixbuf ${D}${bindir}
 }
-
-SRC_URI[md5sum] = "97edf3cce3353b6cb5f822442a83aa5e"
-SRC_URI[sha256sum] = "bd6f9e5dc0a89e9918f78a550f6e688480f044cec2e8674d34c7c6212831d6bd"
index 36c0e47..22d30bf 100644 (file)
@@ -2,11 +2,11 @@ require gtk+_${PV}.bb
 inherit native
 DEPENDS = "jpeg-native libpng-native gettext-native glib-2.0-native libx11-native"
 S = "${WORKDIR}/gtk+-${PV}"
-FILESPATHPKG =. "gdk-pixbuf-csource:gtk+-${PV}:"
-SRC_URI += "file://reduce-dependencies.patch"
+FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
+SRC_URI += "file://reduce-dependencies.patch;patch=1"
 
 #clear recommends for uclibc builds
-RRECOMMENDS_${PN} = " "
+RRECOMMENDS = " "
 RRECOMMENDS_${PN}_linux = "  "
 RRECOMMENDS_${PN}_linux-gnueabi = " "
 
index e41f9e0..0aa53b8 100644 (file)
@@ -8,11 +8,11 @@ DEPENDS = "libpng gettext glib-2.0"
 PR = "r2"
 
 S = "${WORKDIR}/gtk+-${PV}"
-FILESPATHPKG =. "gdk-pixbuf-csource:gtk+-${PV}:"
+FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
 
 SRC_URI = "\
   ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
-  file://automake-lossage.patch \
+  file://automake-lossage.patch;patch=1 \
 "
 
 inherit autotools pkgconfig
@@ -64,6 +64,3 @@ do_install() {
        cd gdk-pixbuf && oe_runmake install DESTDIR=${D}
 }
 
-
-SRC_URI[md5sum] = "018d7dd0fa7de01cfdb77c7c55e7ba26"
-SRC_URI[sha256sum] = "d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2"
index 0ec1508..dfe0fbd 100644 (file)
@@ -7,9 +7,9 @@ DEPENDS = "glib-1.2 jpeg libpng libxext"
 PR = "r3"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \
-           file://timezone-fix.patch \
-           file://gtk+1.2-reconf-fix;apply=yes \
-           file://no-xwc;apply=yes"
+           file://timezone-fix.patch;patch=1 \
+           file://gtk+1.2-reconf-fix;patch=1 \
+           file://no-xwc;patch=1"
 S = "${WORKDIR}/gtk+-${PV}"
 
 inherit autotools pkgconfig flow-lossage
@@ -56,6 +56,3 @@ do_install_append () {
        install -d ${D}${sysconfdir}/gtk-1.2
 }
 
-
-SRC_URI[md5sum] = "4d5cb2fc7fb7830e4af9747a36bfce20"
-SRC_URI[sha256sum] = "3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34"
diff --git a/recipes/gtk+/gtk+-2.20.0/cross-nm.patch b/recipes/gtk+/gtk+-2.20.0/cross-nm.patch
deleted file mode 100644 (file)
index 36e9557..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gtk+-2.20.1/configure.in
-===================================================================
---- gtk+-2.20.1.orig/configure.in      2010-07-10 16:25:40.000000000 -0700
-+++ gtk+-2.20.1/configure.in   2010-07-12 22:08:49.878377002 -0700
-@@ -202,7 +202,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
- AC_SYS_LARGEFILE
- AM_PROG_AS
--AC_PATH_PROG(NM, nm, nm)
-+AC_CHECK_PROG(NM, nm, nm)
- dnl Initialize maintainer mode
- AM_MAINTAINER_MODE
diff --git a/recipes/gtk+/gtk+-2.20.1/cross-nm.patch b/recipes/gtk+/gtk+-2.20.1/cross-nm.patch
deleted file mode 100644 (file)
index 36e9557..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gtk+-2.20.1/configure.in
-===================================================================
---- gtk+-2.20.1.orig/configure.in      2010-07-10 16:25:40.000000000 -0700
-+++ gtk+-2.20.1/configure.in   2010-07-12 22:08:49.878377002 -0700
-@@ -202,7 +202,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
- AC_SYS_LARGEFILE
- AM_PROG_AS
--AC_PATH_PROG(NM, nm, nm)
-+AC_CHECK_PROG(NM, nm, nm)
- dnl Initialize maintainer mode
- AM_MAINTAINER_MODE
diff --git a/recipes/gtk+/gtk+-2.20.1/gtk-dnd-grab-deadlock-fix.patch b/recipes/gtk+/gtk+-2.20.1/gtk-dnd-grab-deadlock-fix.patch
deleted file mode 100644 (file)
index 10e84d3..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 96c731cc2dde8a3e4ba542eca4c87ed6154084d2
-Author: Stanislav Brabec <sbrabec@suse.cz>
-Date:   Fri Jul 9 15:11:15 2010 +0200
-
-    Fix pointer grab dead lock if gtk_drag_begin uses GDK_CURRENT_TIME and
-    release happens before getting grab.
-    
-    For more see https://bugzilla.gnome.org/show_bug.cgi?id=623865
-
-diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
-index a0d878d..48063a5 100644
---- a/gtk/gtkdnd.c
-+++ b/gtk/gtkdnd.c
-@@ -4065,6 +4065,10 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time)
-   pointer = gdk_drag_context_get_device (info->context);
-   keyboard = gdk_device_get_associated_device (pointer);
-+  /* Prevent grab after release (see bug 623865) */
-+  if (info->grab_time == GDK_CURRENT_TIME)
-+    time = GDK_CURRENT_TIME;
-+
-   if (info->update_idle)
-     {
-       g_source_remove (info->update_idle);
diff --git a/recipes/gtk+/gtk+-2.20.1/hardcoded_libtool.patch b/recipes/gtk+/gtk+-2.20.1/hardcoded_libtool.patch
deleted file mode 100644 (file)
index 82fbbac..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: gtk+-2.14.2/configure.in
-===================================================================
---- gtk+-2.14.2.orig/configure.in      2008-09-23 15:52:44.000000000 +0100
-+++ gtk+-2.14.2/configure.in   2008-09-23 15:53:51.000000000 +0100
-@@ -401,7 +401,7 @@
- case $enable_explicit_deps in
-   auto)
-     export SED
--    deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
-+    deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
-     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
-       enable_explicit_deps=yes  
-     else
-@@ -759,7 +759,7 @@
-     dnl Now we check to see if our libtool supports shared lib deps
-     dnl (in a rather ugly way even)
-     if $dynworks; then
--        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
-+        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
-         pixbuf_deplibs_check=`$pixbuf_libtool_config | \
-             grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
-             sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-@@ -1893,7 +1893,7 @@
- # We are using gmodule-no-export now, but I'm leaving the stripping
- # code in place for now, since pango and atk still require gmodule.
- export SED
--export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
- if test -n "$export_dynamic"; then
-   GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
-   GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/recipes/gtk+/gtk+-2.20.1/no-demos.patch b/recipes/gtk+/gtk+-2.20.1/no-demos.patch
deleted file mode 100644 (file)
index 0fc4c48..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.10.1/Makefile.am.orig       2006-08-08 12:37:30.000000000 +0100
-+++ gtk+-2.10.1/Makefile.am    2006-08-08 12:37:48.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Makefile.am for GTK+
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
- # require automake 1.4
diff --git a/recipes/gtk+/gtk+-2.20.1/run-iconcache.patch b/recipes/gtk+/gtk+-2.20.1/run-iconcache.patch
deleted file mode 100644 (file)
index aa1bffa..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
---- /tmp/Makefile.am   2009-10-28 18:21:54.000000000 +0100
-+++ gtk+-2.18.3/gtk/Makefile.am        2009-10-28 18:23:07.000000000 +0100
-@@ -1300,11 +1300,11 @@
-          ./gtk-update-icon-cache
- endif
--gtkbuiltincache.h: @REBUILD@ stamp-icons
--      $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
--      $(gtk_update_icon_cache_program) --force --ignore-theme-index           \
--         --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
--      mv gtkbuiltincache.h.tmp gtkbuiltincache.h
-+#gtkbuiltincache.h: @REBUILD@ stamp-icons
-+#     $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
-+#     $(gtk_update_icon_cache_program) --force --ignore-theme-index           \
-+#        --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
-+#     mv gtkbuiltincache.h.tmp gtkbuiltincache.h
- EXTRA_DIST +=                   \
-       $(STOCK_ICONS)          \
diff --git a/recipes/gtk+/gtk+-2.20.1/toggle-font.diff b/recipes/gtk+/gtk+-2.20.1/toggle-font.diff
deleted file mode 100644 (file)
index 59ad150..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-Index: gtk/gtkcellrenderertoggle.c
-===================================================================
---- gtk/gtkcellrenderertoggle.c        (revision 18523)
-+++ gtk/gtkcellrenderertoggle.c        (working copy)
-@@ -71,6 +71,8 @@
-   PROP_INDICATOR_SIZE
- };
-+/* This is a hard-coded default which promptly gets overridden by a size
-+   calculated from the font size. */
- #define TOGGLE_WIDTH 13
- static guint toggle_cell_signals[LAST_SIGNAL] = { 0 };
-@@ -80,8 +82,9 @@
- typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate;
- struct _GtkCellRendererTogglePrivate
- {
--  gint indicator_size;
--
-+  gint indicator_size; /* This is the real size */
-+  gint override_size; /* This is the size set from the indicator-size property */
-+  GtkWidget *cached_widget;
-   guint inconsistent : 1;
- };
-@@ -104,6 +107,7 @@
-   GTK_CELL_RENDERER (celltoggle)->ypad = 2;
-   priv->indicator_size = TOGGLE_WIDTH;
-+  priv->override_size = 0;
-   priv->inconsistent = FALSE;
- }
-@@ -210,7 +214,7 @@
-       g_value_set_boolean (value, celltoggle->radio);
-       break;
-     case PROP_INDICATOR_SIZE:
--      g_value_set_int (value, priv->indicator_size);
-+      g_value_set_int (value, priv->override_size ? priv->override_size : priv->indicator_size);
-       break;
-     default:
-       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-@@ -245,7 +249,7 @@
-       celltoggle->radio = g_value_get_boolean (value);
-       break;
-     case PROP_INDICATOR_SIZE:
--      priv->indicator_size = g_value_get_int (value);
-+      priv->override_size = g_value_get_int (value);
-       break;
-     default:
-       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-@@ -273,6 +277,27 @@
- }
- static void
-+on_widget_style_set (GtkWidget *widget, GtkStyle *previous, gpointer user_data)
-+{
-+  GtkCellRendererTogglePrivate *priv = user_data;
-+  PangoContext *context;
-+  PangoFontMetrics *metrics;
-+  int height;
-+  
-+  context = gtk_widget_get_pango_context (widget);
-+  metrics = pango_context_get_metrics (context,
-+                                       widget->style->font_desc,
-+                                       pango_context_get_language (context));
-+
-+  height = pango_font_metrics_get_ascent (metrics) +
-+    pango_font_metrics_get_descent (metrics);
-+  
-+  pango_font_metrics_unref (metrics);
-+  
-+  priv->indicator_size = PANGO_PIXELS (height * 0.85);
-+}
-+
-+static void
- gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
-                                  GtkWidget       *widget,
-                                  GdkRectangle    *cell_area,
-@@ -287,6 +312,20 @@
-   priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell);
-+  if (priv->override_size) {
-+    priv->indicator_size = priv->override_size;
-+  } else if (priv->cached_widget != widget) {
-+    if (priv->cached_widget) {
-+      g_object_remove_weak_pointer (widget, &priv->cached_widget);
-+      g_signal_handlers_disconnect_by_func (priv->cached_widget, on_widget_style_set, priv);
-+    }
-+    priv->cached_widget = widget;
-+    g_object_add_weak_pointer (widget, &priv->cached_widget);
-+    g_signal_connect (widget, "style-set", on_widget_style_set, priv);
-+    
-+    on_widget_style_set (widget, NULL, priv);
-+  }
-+
-   calc_width = (gint) cell->xpad * 2 + priv->indicator_size;
-   calc_height = (gint) cell->ypad * 2 + priv->indicator_size;
index 9dd78a4..cb79d66 100644 (file)
@@ -1,6 +1,6 @@
 require gtk+_${PV}.bb
 
-FILESPATHPKG =. "gtk+-${PV}:"
+FILESPATH_prepend = "${FILE_DIRNAME}/gtk+-${PV}:"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -8,10 +8,7 @@ PROVIDES = "gtk+"
 RPROVIDES_${PN} = "gtk+"
 PR = "r2"
 
-SRC_URI += "file://lower-quality-scaling-in-pixbuf-engine.patch"
+SRC_URI += "file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
 
 S = "${WORKDIR}/gtk+-${PV}"
 
-
-SRC_URI[md5sum] = "018d7dd0fa7de01cfdb77c7c55e7ba26"
-SRC_URI[sha256sum] = "d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2"
index bb74d78..b30a4f5 100644 (file)
@@ -10,10 +10,10 @@ PROVIDES = "gdk-pixbuf"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.bz2;name=gtk \
-       file://hardcoded_libtool.patch \
-       file://run-iconcache.patch \
-       file://toggle-font.diff;striplevel=0 \
-       file://xsettings.patch \
+       file://hardcoded_libtool.patch;patch=1 \
+       file://run-iconcache.patch;patch=1 \
+       file://toggle-font.diff;patch=1;pnum=0 \
+       file://xsettings.patch;patch=1 \
        "
 
 INC_PR = "r8"
index 473de5a..c9b98a1 100644 (file)
@@ -3,34 +3,31 @@ require gtk-2.10.inc
 PR = "r9"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
-           file://no-xwc.patch \
-           file://automake-lossage.patch \
-           file://disable-tooltips.patch \
-           file://gtklabel-resize-patch;apply=yes \
-           file://menu-deactivate.patch \
-           file://xsettings.patch \
-           file://scroll-timings.patch \
-           file://small-gtkfilesel.patch \
-           file://small-gtkfilechooser.patch \
-#           file://migration.patch;striplevel=0 \
-           file://run-iconcache.patch \
-           file://hardcoded_libtool.patch \
-           file://no-demos.patch \
-           file://single-click.patch \
-           file://spinbutton.patch \
-           file://gtk+-handhelds.patch \
-           file://filesel-fix-segfault.patch \
-           file://combo-arrow-size.patch;striplevel=0 \
-           file://range-no-redraw.patch;striplevel=0 \
-           file://scrolled-placement.patch;striplevel=0 \
-           file://treeview-checkbox-size.patch;striplevel=0 \
-           file://cell-renderer-edit-focus.patch;striplevel=0 \
+           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://small-gtkfilechooser.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://filesel-fix-segfault.patch;patch=1 \
+           file://combo-arrow-size.patch;patch=1;pnum=0 \
+           file://range-no-redraw.patch;patch=1;pnum=0 \
+           file://scrolled-placement.patch;patch=1;pnum=0 \
+           file://treeview-checkbox-size.patch;patch=1;pnum=0 \
+           file://cell-renderer-edit-focus.patch;patch=1;pnum=0 \
            "
 
 # check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
 require gtk-fpu.inc
 EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}"
 
-
-SRC_URI[md5sum] = "018d7dd0fa7de01cfdb77c7c55e7ba26"
-SRC_URI[sha256sum] = "d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2"
index 664ed7e..a9a9a49 100644 (file)
@@ -2,16 +2,16 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://disable-print.patch \
-           file://cellrenderer-cairo.patch;striplevel=0 \
-           file://entry-cairo.patch;striplevel=0 \
-           file://scrolled-placement.patch;striplevel=0"
+SRC_URI += "file://disable-print.patch;patch=1 \
+           file://cellrenderer-cairo.patch;patch=1;pnum=0 \
+           file://entry-cairo.patch;patch=1;pnum=0 \
+           file://scrolled-placement.patch;patch=1;pnum=0"
 # temporary
-#           file://gtklabel-resize-patch;apply=yes \
-#           file://menu-deactivate.patch \
-#           file://combo-arrow-size.patch;striplevel=0 \
+#           file://gtklabel-resize-patch;patch=1 \
+#           file://menu-deactivate.patch;patch=1 \
+#           file://combo-arrow-size.patch;patch=1;pnum=0 \
 # die die die
-#           file://pangoxft2.10.6.diff"
+#           file://pangoxft2.10.6.diff;patch=1"
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 
@@ -34,6 +34,3 @@ python populate_packages_prepend () {
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
 }
-
-SRC_URI[gtk.md5sum] = "e9c280afec29b11772af5a7c807abf41"
-SRC_URI[gtk.sha256sum] = "faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd"
index 40f493d..f345711 100644 (file)
@@ -1,16 +1,16 @@
 require gtk+.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
-SRC_URI += "file://cellrenderer-cairo.patch;striplevel=0 \
-           file://entry-cairo.patch;striplevel=0 \
-           file://scrolled-placement.patch;striplevel=0"
+SRC_URI += "file://cellrenderer-cairo.patch;patch=1;pnum=0 \
+           file://entry-cairo.patch;patch=1;pnum=0 \
+           file://scrolled-placement.patch;patch=1;pnum=0"
 # temporary
-#           file://gtklabel-resize-patch;apply=yes \
-#           file://menu-deactivate.patch \
-#           file://combo-arrow-size.patch;striplevel=0 \
+#           file://gtklabel-resize-patch;patch=1 \
+#           file://menu-deactivate.patch;patch=1 \
+#           file://combo-arrow-size.patch;patch=1;pnum=0 \
 # die die die
-#           file://pangoxft2.10.6.diff"
+#           file://pangoxft2.10.6.diff;patch=1"
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 
@@ -33,6 +33,3 @@ python populate_packages_prepend () {
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
 }
-
-SRC_URI[gtk.md5sum] = "f7aab88e856a813386f797aade5867ad"
-SRC_URI[gtk.sha256sum] = "c447b7f42c75ed5bea3e5488a0af82c0f5ed04536ddbf04c9f2f4f42815ba4a9"
index 53b0bb8..f345711 100644 (file)
@@ -2,15 +2,15 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://cellrenderer-cairo.patch;striplevel=0 \
-           file://entry-cairo.patch;striplevel=0 \
-           file://scrolled-placement.patch;striplevel=0"
+SRC_URI += "file://cellrenderer-cairo.patch;patch=1;pnum=0 \
+           file://entry-cairo.patch;patch=1;pnum=0 \
+           file://scrolled-placement.patch;patch=1;pnum=0"
 # temporary
-#           file://gtklabel-resize-patch;apply=yes \
-#           file://menu-deactivate.patch \
-#           file://combo-arrow-size.patch;striplevel=0 \
+#           file://gtklabel-resize-patch;patch=1 \
+#           file://menu-deactivate.patch;patch=1 \
+#           file://combo-arrow-size.patch;patch=1;pnum=0 \
 # die die die
-#           file://pangoxft2.10.6.diff"
+#           file://pangoxft2.10.6.diff;patch=1"
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 
@@ -33,6 +33,3 @@ python populate_packages_prepend () {
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
 }
-
-SRC_URI[gtk.md5sum] = "dc8455144f27945f2fcbe91e75acd118"
-SRC_URI[gtk.sha256sum] = "e77dcec1b2f7ab7606afdaf63a1ddf80af4c5f518e1fcc7260dadb679dd858fa"
index 149d2f7..29b99c3 100644 (file)
@@ -25,6 +25,3 @@ python populate_packages_prepend () {
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
 }
-
-SRC_URI[gtk.md5sum] = "c6e66ffe92724d83391187f0af016b23"
-SRC_URI[gtk.sha256sum] = "516d981d1d696bb00a8c451fe928efd64ce0bd674ccc3024a0aefb292343231b"
index cb0d3f7..bd23eea 100644 (file)
@@ -2,7 +2,7 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://smallscreen_filechooser.patch \
+SRC_URI += "file://smallscreen_filechooser.patch;patch=1 \
           "
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes"
@@ -44,6 +44,3 @@ RPROVIDES_${PN}-dbg = "libgailutil-dbg"
 RCONFLICTS_${PN}-dbg = "libgailutil-dbg"
 RREPLACES_${PN}-dbg = "libgailutil-dbg"
 # FIXME: replace locales as well
-
-SRC_URI[gtk.md5sum] = "b693a2c1c2dd95457b87d0d042aa5bba"
-SRC_URI[gtk.sha256sum] = "efc277e87e3b7e0315eb3c2837fad6a06aab92b38e08fec6f30beb53e7e56e09"
index 7a263ef..470bd06 100644 (file)
@@ -42,6 +42,3 @@ RCONFLICTS_${PN}-dbg = "libgailutil-dbg"
 RREPLACES_${PN}-dbg = "libgailutil-dbg"
 # FIXME: replace locales as well
 
-
-SRC_URI[gtk.md5sum] = "d666f9f5a544e9d4d45804d88b1b5c4d"
-SRC_URI[gtk.sha256sum] = "afcdc5b67974054b111a4c283641303647d1ffa5677ffb8c4ce8621f12e17f88"
index fb07115..470bd06 100644 (file)
@@ -42,6 +42,3 @@ RCONFLICTS_${PN}-dbg = "libgailutil-dbg"
 RREPLACES_${PN}-dbg = "libgailutil-dbg"
 # FIXME: replace locales as well
 
-
-SRC_URI[gtk.md5sum] = "416412b336d9f3b6b78ca887395d1726"
-SRC_URI[gtk.sha256sum] = "18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af"
index 90f2469..470bd06 100644 (file)
@@ -42,6 +42,3 @@ RCONFLICTS_${PN}-dbg = "libgailutil-dbg"
 RREPLACES_${PN}-dbg = "libgailutil-dbg"
 # FIXME: replace locales as well
 
-
-SRC_URI[gtk.md5sum] = "bb7ef5463a74a80454ced2c1d47a0192"
-SRC_URI[gtk.sha256sum] = "05fce9327dbe78a74ad4cd45383d541f96f19d40d3c03076cdf6908ad28ad241"
index 1339a3d..ec3690d 100644 (file)
@@ -46,6 +46,3 @@ RCONFLICTS_${PN}-dbg = "libgailutil-dbg"
 RREPLACES_${PN}-dbg = "libgailutil-dbg"
 # FIXME: replace locales as well
 
-
-SRC_URI[gtk.md5sum] = "369e173600efc272131b53b1902679e8"
-SRC_URI[gtk.sha256sum] = "1c0665fe560a560851e8b3c9a6501d416c4b54abfb6fa07549d703a04ea768bf"
index 237689d..69f8ff5 100644 (file)
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-SRC_URI_append_virtclass-native = " file://no-demos.patch \
+SRC_URI_append_virtclass-native = " file://no-demos.patch;patch=1 \
 "
 
 PR = "${INC_PR}.4"
@@ -56,6 +56,3 @@ RCONFLICTS_${PN}-dbg = "libgailutil-dbg"
 RREPLACES_${PN}-dbg = "libgailutil-dbg"
 # FIXME: replace locales as well
 
-
-SRC_URI[gtk.md5sum] = "3b32073cf1fad755f7c2b2db71aebe90"
-SRC_URI[gtk.sha256sum] = "5629944917b739152d89b69279aefcc3de9fe12a12fd7adb3ca39c840df9354d"
index 7079979..abddc27 100644 (file)
@@ -1,13 +1,12 @@
 require gtk+.inc
 
-SRC_URI_append_virtclass-native = " file://no-demos.patch \
+SRC_URI_append_virtclass-native = " file://no-demos.patch;patch=1 \
 "
-SRC_URI_append = " file://cross-nm.patch"
 
 SRC_URI[gtk.md5sum] = "5517f78b1eb9b1eb60bd48a0152d09e6"
 SRC_URI[gtk.sha256sum] = "8ea7e11ff88e9a8867b7d9221d40a3bfce5c648ce27cd6bac422ff8f6cca414d"
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 BBCLASSEXTEND = "native"
 
diff --git a/recipes/gtk+/gtk+_2.20.1.bb b/recipes/gtk+/gtk+_2.20.1.bb
deleted file mode 100644 (file)
index c8d10b3..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-require gtk+.inc
-
-SRC_URI_append_virtclass-native = " file://no-demos.patch \
-"
-SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch \
-                 file://cross-nm.patch \
-                "
-
-SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa"
-SRC_URI[gtk.sha256sum] = "0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65"
-
-PR = "${INC_PR}.2"
-
-BBCLASSEXTEND = "native"
-
-ARM_INSTRUCTION_SET = "arm"
-
-DEPENDS_virtclass-native = "libpng-native atk-native pango-native cairo-native libxrender-native libxext-native"
-RRECOMMENDS_${PN}_virtclass-native = ""
-PROVIDES_virtclass-native = "gdk-pixbuf-csource-native"
-
-# Enable xkb selectively
-XKBTOGGLE = " --disable-xkb"
-XKBTOGGLE_angstrom = ""
-
-EXTRA_OECONF = "--with-libtiff ${XKBTOGGLE} --disable-glibtest gio_can_sniff=yes"
-EXTRA_OECONF_append_virtclass-native = " --without-libtiff --without-libjpeg"
-
-PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
-
-python populate_packages_prepend () {
-       import os.path
-
-       prologue = bb.data.getVar("postinst_prologue", d, 1)
-
-       gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
-       loaders_root = os.path.join(gtk_libdir, 'loaders')
-       immodules_root = os.path.join(gtk_libdir, 'immodules')
-       printmodules_root = os.path.join(gtk_libdir, 'printbackends');
-       modules_root = bb.data.expand('${libdir}/gtk-2.0/modules/',d)
-
-       do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders', extra_depends='')
-       do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules', extra_depends='')
-       do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s', extra_depends='')
-       do_split_packages(d, modules_root, '^lib(.*)\.so$', 'gtk-module-%s', 'GTK module for %s', extra_depends='')
-
-        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
-                bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
-}
-
-# gail is part of gtk+ since gtk+-2.13.0 (targetting >=GNOME 2.23):
-PROVIDES = "virtual/gail"
-RPROVIDES_${PN} = "libgailutil18"
-RCONFLICTS_${PN} = "libgailutil18"
-RREPLACES_${PN} = "libgailutil18"
-RPROVIDES_${PN}-dev = "libgailutil-dev"
-RCONFLICTS_${PN}-dev = "libgailutil-dev"
-RREPLACES_${PN}-dev = "libgailutil-dev"
-RPROVIDES_${PN}-doc = "libgailutil-doc"
-RCONFLICTS_${PN}-doc = "libgailutil-doc"
-RREPLACES_${PN}-doc = "libgailutil-doc"
-RPROVIDES_${PN}-dbg = "libgailutil-dbg"
-RCONFLICTS_${PN}-dbg = "libgailutil-dbg"
-RREPLACES_${PN}-dbg = "libgailutil-dbg"
-# FIXME: replace locales as well
-
index 45eaf30..cab18db 100644 (file)
@@ -8,33 +8,33 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
 PR = "r11"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
-           file://help.patch \
-           file://no-demos.patch \
-           file://no-xwc.patch \
-           file://automake-lossage.patch \
-           file://gtk+-handhelds.patch \
-           file://spinbutton.patch \
-           file://hardcoded_libtool.patch \
-           file://disable-tooltips.patch \
-           file://gtklabel-resize-patch;apply=yes \
-           file://menu-deactivate.patch \
-           file://xsettings.patch \
-           file://scroll-timings.patch \
-           file://small-gtkfilesel.patch \
-           file://migration.patch;striplevel=0 \
-           file://single-click.patch \
-           file://menu-styling.patch \
-           file://compile-against-newer-glib.patch \
-           file://gtk.keynav.gtkcombobox.patch;striplevel=0 \
-           file://gtk.keynav.gtkentry.patch;striplevel=0 \
-           file://gtk.keynav.gtkiconview.patch;striplevel=0 \
-           file://gtk.keynav.gtkradiobutton.patch;striplevel=0 \
-           file://gtk.keynav.gtksettings.patch;striplevel=0 \
-           file://gtk.keynav.gtktextview.patch;striplevel=0 \
-           file://gtk.keynav.gtktreeview.patch;striplevel=0 \
-           file://gtk.keynav.gtkwidget.patch;striplevel=0 \
-           file://gtk+-2.6.10-bg.patch \
-           file://filesel-fix-segfault.patch \
+           file://help.patch;patch=1 \
+           file://no-demos.patch;patch=1 \
+           file://no-xwc.patch;patch=1 \
+           file://automake-lossage.patch;patch=1 \
+           file://gtk+-handhelds.patch;patch=1 \
+           file://spinbutton.patch;patch=1 \
+           file://hardcoded_libtool.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://single-click.patch;patch=1 \
+           file://menu-styling.patch;patch=1 \
+           file://compile-against-newer-glib.patch;patch=1 \
+           file://gtk.keynav.gtkcombobox.patch;patch=1;pnum=0 \
+           file://gtk.keynav.gtkentry.patch;patch=1;pnum=0 \
+           file://gtk.keynav.gtkiconview.patch;patch=1;pnum=0 \
+           file://gtk.keynav.gtkradiobutton.patch;patch=1;pnum=0 \
+           file://gtk.keynav.gtksettings.patch;patch=1;pnum=0 \
+           file://gtk.keynav.gtktextview.patch;patch=1;pnum=0 \
+           file://gtk.keynav.gtktreeview.patch;patch=1;pnum=0 \
+           file://gtk.keynav.gtkwidget.patch;patch=1;pnum=0 \
+           file://gtk+-2.6.10-bg.patch;patch=1 \
+           file://filesel-fix-segfault.patch;patch=1 \
            "
 
 inherit autotools pkgconfig
@@ -113,6 +113,3 @@ python populate_packages_prepend () {
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
 }
-
-SRC_URI[md5sum] = "520090ef291e35ba93397060e20f5025"
-SRC_URI[sha256sum] = "d408b606c8dd414dfbf220ccc168a0bc85a419945439796792a5357a96ff02af"
index f1141be..8eac914 100644 (file)
@@ -10,21 +10,21 @@ PR = "r5"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
-           file://no-xwc.patch \
-           file://automake-lossage.patch \
-          file://spinbutton.patch \
-          file://hardcoded_libtool.patch \
-          file://disable-tooltips.patch \
-          file://gtklabel-resize-patch;apply=yes \
-          file://gtktreeview-316689.patch \
-          file://menu-deactivate.patch \
-          file://xsettings.patch \
-          file://scroll-timings.patch \
-          file://small-gtkfilesel.patch \
-          file://migration.patch;striplevel=0 \
-          file://no-demos.patch \
-          file://gtk+-handhelds.patch \
-          file://single-click.patch"
+           file://no-xwc.patch;patch=1 \
+           file://automake-lossage.patch;patch=1 \
+          file://spinbutton.patch;patch=1 \
+          file://hardcoded_libtool.patch;patch=1 \
+          file://disable-tooltips.patch;patch=1 \
+          file://gtklabel-resize-patch;patch=1 \
+          file://gtktreeview-316689.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://no-demos.patch;patch=1 \
+          file://gtk+-handhelds.patch;patch=1 \
+          file://single-click.patch;patch=1"
 
 inherit autotools pkgconfig
 
@@ -97,6 +97,3 @@ python populate_packages_prepend () {
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
 }
-
-SRC_URI[md5sum] = "6dea9b6f546bd858401729d12bbd5919"
-SRC_URI[sha256sum] = "5073cb676347d7bfb4438795f586867fbcce68b197eb9c0683b0b82af77d5b8f"
index 224702e..91b6b3d 100644 (file)
@@ -8,20 +8,20 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt c
 PR = "r7"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
-           file://no-xwc.patch \
-           file://automake-lossage.patch \
-          file://spinbutton.patch \
-          file://hardcoded_libtool.patch \
-          file://disable-tooltips.patch \
-          file://gtklabel-resize-patch;apply=yes \
-          file://menu-deactivate.patch \
-          file://xsettings.patch \
-          file://scroll-timings.patch \
-          file://small-gtkfilesel.patch \
-          file://migration.patch;striplevel=0 \
-          file://no-demos.patch \
-          file://gtk+-handhelds.patch \
-          file://single-click.patch"
+           file://no-xwc.patch;patch=1 \
+           file://automake-lossage.patch;patch=1 \
+          file://spinbutton.patch;patch=1 \
+          file://hardcoded_libtool.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://no-demos.patch;patch=1 \
+          file://gtk+-handhelds.patch;patch=1 \
+          file://single-click.patch;patch=1"
 
 inherit autotools pkgconfig
 
@@ -94,6 +94,3 @@ python populate_packages_prepend () {
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
 }
-
-SRC_URI[md5sum] = "e7a94132ae6353106c80cd4a1106a368"
-SRC_URI[sha256sum] = "e8fb1f414288e1c2b1ee6408280477ee361e0a19564e9113bd98f433aaa81195"