Skip to contentSkip to conversation

Remove older GTK+ versions

PATCH Applied Ross Burton 4 participants 12 messages Aug 17, 2012

lore
Share & tools
lore

Ross Burton

author
#0 lore raw

cover Remove older GTK+ versions

Remove the very old versions of GTK+ 2.x that we don't build. They were kept for their patches, but the patches don't apply anymore because the relevant code has changed dramatically.

If someone still wants to use them, meta-oe is a better place for them to live.

Ross

The following changes since commit af847d36375aa53f0c1ee2a00c97ba9f38837d1b:

bitbake: bitbake: build.py: Add stampdir argument to cached_mtime_noerror (2012-08-16 12:27:41 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ross/gtk2

for you to fetch changes up to f6cf7bda28c1ae5f9033863f70657e1970b6bdc9:

gtk+ remove 2.16.6 (2012-08-17 12:29:59 +0100)

----------------------------------------------------------------
Ross Burton (2):

      gtk+: remove 2.12.7
      gtk+ remove 2.16.6
 .../gtk+/gtk+-2.12.7/cellrenderer-cairo.patch      |   34 -
 .../gtk+/gtk+-2.12.7/combo-arrow-size.patch        |   69 -
 .../gtk+/gtk+-2.12.7/disable-print.patch           |   28 -
 .../gtk+/gtk+-2.12.7/entry-cairo.patch             |  105 -
 .../gtk+/gtk+-2.12.7/filechooser-default.patch     | 9523 --------------------
 .../gtk+/gtk+-2.12.7/filechooser-props.patch       |   59 -
 .../gtk+/gtk+-2.12.7/filechooser-sizefix.patch     |   37 -
 .../gtk+/gtk+-2.12.7/filesystem-volumes.patch      |  200 -
 .../gtk+/gtk+-2.12.7/gtklabel-resize-patch         |   12 -
 .../gtk+/gtk+-2.12.7/hardcoded_libtool.patch       |   31 -
 .../gtk+/gtk+-2.12.7/menu-deactivate.patch         |   53 -
 meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch |   12 -
 .../gtk+/gtk+-2.12.7/pangoxft2.10.6.diff           | 2458 -----
 .../gtk+/gtk+-2.12.7/range-no-redraw.patch         |  130 -
 .../gtk+/gtk+-2.12.7/run-iconcache.patch           |   21 -
 .../gtk+/gtk+-2.12.7/scrolled-placement.patch      |   24 -
 .../gtk+/gtk+-2.12.7/toggle-font.diff              |  102 -
 .../recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch |   18 -
 ...Duplicate-the-exec-string-returned-by-gtk.patch |   33 -
 .../gtk+/gtk+-2.16.6/cellrenderer-cairo.patch      |   34 -
 .../gtk+-2.16.6/disable-gio-png-sniff-test.diff    |   99 -
 .../gtk+/gtk+-2.16.6/entry-cairo.patch             |  105 -
 .../gtk+/gtk+-2.16.6/hardcoded_libtool.patch       |   33 -
 meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch |   12 -
 .../gtk+/gtk+-2.16.6/run-iconcache.patch           |   21 -
 .../gtk+/gtk+-2.16.6/toggle-font.diff              |  102 -
 .../recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch |   18 -
 meta/recipes-gnome/gtk+/gtk+_2.12.7.bb             |   49 -
 meta/recipes-gnome/gtk+/gtk+_2.16.6.bb             |   49 -
 29 files changed, 13471 deletions(-)
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/combo-arrow-size.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/disable-print.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/entry-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-default.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/filesystem-volumes.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/gtklabel-resize-patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/hardcoded_libtool.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/pangoxft2.10.6.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/range-no-redraw.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/run-iconcache.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/scrolled-placement.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/toggle-font.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+_2.16.6.bb

Ross Burton (2):
gtk+: remove 2.12.7
gtk+ remove 2.16.6

 .../gtk+/gtk+-2.12.7/cellrenderer-cairo.patch      |   34 -
 .../gtk+/gtk+-2.12.7/combo-arrow-size.patch        |   69 -
 .../gtk+/gtk+-2.12.7/disable-print.patch           |   28 -
 .../gtk+/gtk+-2.12.7/entry-cairo.patch             |  105 -
 .../gtk+/gtk+-2.12.7/filechooser-default.patch     | 9523 --------------------
 .../gtk+/gtk+-2.12.7/filechooser-props.patch       |   59 -
 .../gtk+/gtk+-2.12.7/filechooser-sizefix.patch     |   37 -
 .../gtk+/gtk+-2.12.7/filesystem-volumes.patch      |  200 -
 .../gtk+/gtk+-2.12.7/gtklabel-resize-patch         |   12 -
 .../gtk+/gtk+-2.12.7/hardcoded_libtool.patch       |   31 -
 .../gtk+/gtk+-2.12.7/menu-deactivate.patch         |   53 -
 meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch |   12 -
 .../gtk+/gtk+-2.12.7/pangoxft2.10.6.diff           | 2458 -----
 .../gtk+/gtk+-2.12.7/range-no-redraw.patch         |  130 -
 .../gtk+/gtk+-2.12.7/run-iconcache.patch           |   21 -
 .../gtk+/gtk+-2.12.7/scrolled-placement.patch      |   24 -
 .../gtk+/gtk+-2.12.7/toggle-font.diff              |  102 -
 .../recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch |   18 -
 ...Duplicate-the-exec-string-returned-by-gtk.patch |   33 -
 .../gtk+/gtk+-2.16.6/cellrenderer-cairo.patch      |   34 -
 .../gtk+-2.16.6/disable-gio-png-sniff-test.diff    |   99 -
 .../gtk+/gtk+-2.16.6/entry-cairo.patch             |  105 -
 .../gtk+/gtk+-2.16.6/hardcoded_libtool.patch       |   33 -
 meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch |   12 -
 .../gtk+/gtk+-2.16.6/run-iconcache.patch           |   21 -
 .../gtk+/gtk+-2.16.6/toggle-font.diff              |  102 -
 .../recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch |   18 -
 meta/recipes-gnome/gtk+/gtk+_2.12.7.bb             |   49 -
 meta/recipes-gnome/gtk+/gtk+_2.16.6.bb             |   49 -
 29 files changed, 13471 deletions(-)
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/combo-arrow-size.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/disable-print.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/entry-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-default.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/filesystem-volumes.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/gtklabel-resize-patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/hardcoded_libtool.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/pangoxft2.10.6.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/range-no-redraw.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/run-iconcache.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/scrolled-placement.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/toggle-font.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
Signature · 1 line
1.7.10
author
#1 lore raw

PATCH 1/2 gtk+: remove 2.12.7

Signed-off-by Ross Burton <[email protected]>
---
 .../gtk+/gtk+-2.12.7/cellrenderer-cairo.patch      |   34 -
 .../gtk+/gtk+-2.12.7/combo-arrow-size.patch        |   69 -
 .../gtk+/gtk+-2.12.7/disable-print.patch           |   28 -
 .../gtk+/gtk+-2.12.7/entry-cairo.patch             |  105 -
 .../gtk+/gtk+-2.12.7/filechooser-default.patch     | 9523 --------------------
 .../gtk+/gtk+-2.12.7/filechooser-props.patch       |   59 -
 .../gtk+/gtk+-2.12.7/filechooser-sizefix.patch     |   37 -
 .../gtk+/gtk+-2.12.7/filesystem-volumes.patch      |  200 -
 .../gtk+/gtk+-2.12.7/gtklabel-resize-patch         |   12 -
 .../gtk+/gtk+-2.12.7/hardcoded_libtool.patch       |   31 -
 .../gtk+/gtk+-2.12.7/menu-deactivate.patch         |   53 -
 meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch |   12 -
 .../gtk+/gtk+-2.12.7/pangoxft2.10.6.diff           | 2458 -----
 .../gtk+/gtk+-2.12.7/range-no-redraw.patch         |  130 -
 .../gtk+/gtk+-2.12.7/run-iconcache.patch           |   21 -
 .../gtk+/gtk+-2.12.7/scrolled-placement.patch      |   24 -
 .../gtk+/gtk+-2.12.7/toggle-font.diff              |  102 -
 .../recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch |   18 -
 meta/recipes-gnome/gtk+/gtk+_2.12.7.bb             |   49 -
 19 files changed, 12965 deletions(-)
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/combo-arrow-size.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/disable-print.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/entry-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-default.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/filesystem-volumes.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/gtklabel-resize-patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/hardcoded_libtool.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/pangoxft2.10.6.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/range-no-redraw.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/run-iconcache.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/scrolled-placement.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/toggle-font.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
meta/recipes-gnome/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch deleted +0 -34
deleted file mode 100644
index 2524b99..0000000
@@ -1,34 +0,0 @@
-Upstream-Status: Pending
-
-Index: gtk/gtkcellrenderer.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkcellrenderer.c,v
-retrieving revision 1.55
-diff -u -r1.55 gtkcellrenderer.c
---- gtk/gtkcellrenderer.c	14 May 2006 04:25:28 -0000	1.55
-+++ gtk/gtkcellrenderer.c	30 Jun 2006 10:57:43 -0000
-@@ -551,6 +551,7 @@
- 
-   if (cell->cell_background_set && !selected)
-     {
-+#ifdef USE_CAIRO_INTERNALLY
-       cairo_t *cr = gdk_cairo_create (window);
- 
-       gdk_cairo_rectangle (cr, background_area);
-@@ -558,6 +559,16 @@
-       cairo_fill (cr);
-       
-       cairo_destroy (cr);
-+#else
-+      GdkGC *gc;
-+
-+      gc = gdk_gc_new (window);
-+      gdk_gc_set_rgb_fg_color (gc, &priv->cell_background);
-+      gdk_draw_rectangle (window, gc, TRUE,
-+                          background_area->x, background_area->y,
-+                          background_area->width, background_area->height);
-+      g_object_unref (gc);
-+#endif
-     }
- 
-   GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell,
meta/recipes-gnome/gtk+/gtk+-2.12.7/combo-arrow-size.patch deleted +0 -69

69 lines not on this page · raw message

meta/recipes-gnome/gtk+/gtk+-2.12.7/disable-print.patch deleted +0 -28
deleted file mode 100644
index 78903cf..0000000
@@ -1,28 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- gtk+-2.12.0/configure.in~	2006-07-05 18:11:44.000000000 +0200
-+++ gtk+-2.12.0/configure.in	2006-07-05 18:11:44.000000000 +0200
-@@ -1554,22 +1554 @@
--AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
--if test "x$CUPS_CONFIG" != "xno"; then
--  CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
--  CUPS_LIBS=`$CUPS_CONFIG --libs`
--
--  CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
--  CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
--  CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
--
--  if test $CUPS_API_MAJOR -gt 1 -o \
--          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
--    AC_DEFINE(HAVE_CUPS_API_1_2)
--  fi
--
--  AC_SUBST(CUPS_API_MAJOR)
--  AC_SUBST(CUPS_API_MINOR)
--  AC_SUBST(CUPS_CFLAGS)
--  AC_SUBST(CUPS_LIBS)
--
--  AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]]))
--fi
--AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-+AM_CONDITIONAL(HAVE_CUPS, false)
meta/recipes-gnome/gtk+/gtk+-2.12.7/entry-cairo.patch deleted +0 -105

105 lines not on this page · raw message

meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-default.patch deleted +0 -9523

2,764 lines not on this page · raw message

meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch deleted +0 -59

59 lines not on this page · raw message

meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-sizefix.patch deleted +0 -37
deleted file mode 100644
index 0973eca..0000000

Lines of this file are not shown. View the raw message.

meta/recipes-gnome/gtk+/gtk+-2.12.7/filesystem-volumes.patch deleted +0 -200

200 lines not on this page · raw message

meta/recipes-gnome/gtk+/gtk+-2.12.7/gtklabel-resize-patch deleted +0 -12
deleted file mode 100644
index 40af10c..0000000

Lines of this file are not shown. View the raw message.

meta/recipes-gnome/gtk+/gtk+-2.12.7/hardcoded_libtool.patch deleted +0 -31
deleted file mode 100644
index 09ced4b..0000000

Lines of this file are not shown. View the raw message.

meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch deleted +0 -53

53 lines not on this page · raw message

meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch deleted +0 -12
deleted file mode 100644
index 67d4f74..0000000

Lines of this file are not shown. View the raw message.

meta/recipes-gnome/gtk+/gtk+-2.12.7/pangoxft2.10.6.diff deleted +0 -2458

2,458 lines not on this page · raw message

meta/recipes-gnome/gtk+/gtk+-2.12.7/range-no-redraw.patch deleted +0 -130

130 lines not on this page · raw message

meta/recipes-gnome/gtk+/gtk+-2.12.7/run-iconcache.patch deleted +0 -21
deleted file mode 100644
index f35884c..0000000

Lines of this file are not shown. View the raw message.

meta/recipes-gnome/gtk+/gtk+-2.12.7/scrolled-placement.patch deleted +0 -24
deleted file mode 100644
index 1e3ab52..0000000

Lines of this file are not shown. View the raw message.

meta/recipes-gnome/gtk+/gtk+-2.12.7/toggle-font.diff deleted +0 -102

102 lines not on this page · raw message

meta/recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch deleted +0 -18
deleted file mode 100644
index 98d3353..0000000

Lines of this file are not shown. View the raw message.

meta/recipes-gnome/gtk+/gtk+_2.12.7.bb deleted +0 -49

49 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.10

Part of the diff is not shown here. View the raw message.

author
#2 lore raw

PATCH 2/2 gtk+ remove 2.16.6

Signed-off-by Ross Burton <[email protected]>
---
 ...Duplicate-the-exec-string-returned-by-gtk.patch |   33 ------
 .../gtk+/gtk+-2.16.6/cellrenderer-cairo.patch      |   34 -------
 .../gtk+-2.16.6/disable-gio-png-sniff-test.diff    |   99 ------------------
 .../gtk+/gtk+-2.16.6/entry-cairo.patch             |  105 --------------------
 .../gtk+/gtk+-2.16.6/hardcoded_libtool.patch       |   33 ------
 meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch |   12 ---
 .../gtk+/gtk+-2.16.6/run-iconcache.patch           |   21 ----
 .../gtk+/gtk+-2.16.6/toggle-font.diff              |  102 -------------------
 .../recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch |   18 ----
 meta/recipes-gnome/gtk+/gtk+_2.16.6.bb             |   49 ---------
 10 files changed, 506 deletions(-)
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch deleted +0 -33
deleted file mode 100644
index 7d39a77..0000000
@@ -1,33 +0,0 @@
-From 69b9441eab2a7215509687dc22b48b6f212d22aa Mon Sep 17 00:00:00 2001
-From: Rob Bradford <[email protected]>
-Date: Thu, 4 Jun 2009 15:43:20 +0100
-Subject: [PATCH] =?utf-8?q?bgo#584832=20=E2=80=93=20Duplicate=20the=20exec=20string=20returned=20by=20gtk=5Frecent=5Finfo=5Fget=5Fapplication=5Finfo?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-This function states that the caller is responsible for freeing the string
-passed returned by reference. Unfortunately if you do this you get a crash
-since the internal value is returned without being duplicated.
----
- gtk/gtkrecentmanager.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Upstream-Status: Pending
-
-diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
-index 317b3d5..d062572 100644
---- a/gtk/gtkrecentmanager.c
-+++ b/gtk/gtkrecentmanager.c
-@@ -1764,7 +1764,7 @@ gtk_recent_info_get_application_info (GtkRecentInfo  *info,
-     }
-   
-   if (app_exec)
--    *app_exec = ai->exec;
-+    *app_exec = g_strdup (ai->exec);
-   
-   if (count)
-     *count = ai->count;
--- 
-1.6.3.1
-
meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch deleted +0 -34
deleted file mode 100644
index 2524b99..0000000
@@ -1,34 +0,0 @@
-Upstream-Status: Pending
-
-Index: gtk/gtkcellrenderer.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkcellrenderer.c,v
-retrieving revision 1.55
-diff -u -r1.55 gtkcellrenderer.c
---- gtk/gtkcellrenderer.c	14 May 2006 04:25:28 -0000	1.55
-+++ gtk/gtkcellrenderer.c	30 Jun 2006 10:57:43 -0000
-@@ -551,6 +551,7 @@
- 
-   if (cell->cell_background_set && !selected)
-     {
-+#ifdef USE_CAIRO_INTERNALLY
-       cairo_t *cr = gdk_cairo_create (window);
- 
-       gdk_cairo_rectangle (cr, background_area);
-@@ -558,6 +559,16 @@
-       cairo_fill (cr);
-       
-       cairo_destroy (cr);
-+#else
-+      GdkGC *gc;
-+
-+      gc = gdk_gc_new (window);
-+      gdk_gc_set_rgb_fg_color (gc, &priv->cell_background);
-+      gdk_draw_rectangle (window, gc, TRUE,
-+                          background_area->x, background_area->y,
-+                          background_area->width, background_area->height);
-+      g_object_unref (gc);
-+#endif
-     }
- 
-   GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell,
meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff deleted +0 -99

99 lines not on this page · raw message

meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch deleted +0 -105

105 lines not on this page · raw message

meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch deleted +0 -33
deleted file mode 100644
index e5bbe73..0000000
@@ -1,33 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-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//"`
meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch deleted +0 -12
deleted file mode 100644
index 67d4f74..0000000
@@ -1,12 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- 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
meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch deleted +0 -21
deleted file mode 100644
index f35884c..0000000
@@ -1,21 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- /tmp/Makefile.am	2007-01-08 17:44:47.000000000 +0100
-+++ gtk+-2.10.7/gtk/Makefile.am	2007-01-08 17:45:17.025251000 +0100
-@@ -1128,11 +1128,11 @@
- 	   ./gtk-update-icon-cache
- endif
- 
--gtkbuiltincache.h: @REBUILD@ stamp-icons
--	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
--	$(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_program) --force --ignore-theme-index		\
-+#	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
-+#	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
- 
- EXTRA_DIST +=                   \
- 	$(STOCK_ICONS)		\
meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff deleted +0 -102

102 lines not on this page · raw message

meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch deleted +0 -18
deleted file mode 100644
index 98d3353..0000000
@@ -1,18 +0,0 @@
-Upstream-Status: Pending
-
---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old	Sun Aug 22 17:14:00 2004
-+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c	Sun Aug 22 17:14:00 2004
-@@ -2827,10 +2827,9 @@
- {
-   GdkScreenX11 *screen = data;
-   
--  if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
--    return GDK_FILTER_REMOVE;
--  else
--    return GDK_FILTER_CONTINUE;
-+  xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
-+
-+  return GDK_FILTER_CONTINUE;
- }
- 
- static void
meta/recipes-gnome/gtk+/gtk+_2.16.6.bb deleted +0 -49

49 lines not on this page · raw message

Signature · 1 line
1.7.10
Applied
#3 lore raw
In reply to Ross Burton
Quoted 17 lines · Ross Burton

Remove the very old versions of GTK+ 2.x that we don't build. They were kept for their patches, but the patches don't apply anymore because the relevant code has changed dramatically.

If someone still wants to use them, meta-oe is a better place for them to live.

Ross

The following changes since commit af847d36375aa53f0c1ee2a00c97ba9f38837d1b:

bitbake: bitbake: build.py: Add stampdir argument to cached_mtime_noerror (2012-08-16 12:27:41 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ross/gtk2

Quoted 8 lines

for you to fetch changes up to f6cf7bda28c1ae5f9033863f70657e1970b6bdc9:

gtk+ remove 2.16.6 (2012-08-17 12:29:59 +0100)

----------------------------------------------------------------
Ross Burton (2):

      gtk+: remove 2.12.7
      gtk+ remove 2.16.6

Merged to master, thanks.

Richard

#4 lore raw
In reply to Ross Burton
Quoted 2 lines · On Friday 17 August 2012 12:35:07 Ross Burton wrote:

If someone still wants to use them, meta-oe is a better place for them to live.

As a general note, personally I'd rather that no more alternative versions of anything be added to meta-oe.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#5 lore raw
Quoted 6 lines · Paul Eggleton
Quoted 2 lines · On Friday 17 August 2012 12:35:07 Ross Burton wrote:

If someone still wants to use them, meta-oe is a better place for them to live.

As a general note, personally I'd rather that no more alternative versions of anything be added to meta-oe.

Yes especially with DEFAULT_PREFERRENCE not working between layers.. so everyone with meta-oe and without P_V set, would get this old version..

Cheers,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#6 lore raw
Quoted 11 lines · On Friday 17 August 2012 14:30:17 Martin Jansa wrote:
Quoted 7 lines · Paul Eggleton
Quoted 3 lines · On Friday 17 August 2012 12:35:07 Ross Burton wrote:

If someone still wants to use them, meta-oe is a better place for them to
live.

As a general note, personally I'd rather that no more alternative versions of anything be added to meta-oe.

Yes especially with DEFAULT_PREFERRENCE not working between layers.. so everyone with meta-oe and without P_V set, would get this old version..

The best plan it would seem to me would be to have a separate meta-archive or meta-attic or similar named layer for these older recipes, and set its layer priority to the same as OE-Core.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#7 lore raw
Quoted 10 lines · Paul Eggleton
Quoted 9 lines · On Friday 17 August 2012 14:30:17 Martin Jansa wrote:
Quoted 7 lines · Paul Eggleton
Quoted 3 lines · On Friday 17 August 2012 12:35:07 Ross Burton wrote:

If someone still wants to use them, meta-oe is a better place for them to
live.

As a general note, personally I'd rather that no more alternative versions of anything be added to meta-oe.

Quoted 6 lines
Quoted 2 lines

Yes especially with DEFAULT_PREFERRENCE not working between layers.. so everyone with meta-oe and without P_V set, would get this old version..

The best plan it would seem to me would be to have a separate meta-archive or meta-attic or similar named layer for these older recipes, and set its layer priority to the same as OE-Core.

Should I file a but to fix DEFAULT_PREFERENCE between layers?

Because there is also use case when newer development version is added to e.g. meta-oe with negative D_P and only users who decide to test/use that version should get it, if they define P_V for this new version.

Currently it would became default version for all meta-oe users without P_V specified, which isn't very intuitive.

Cheers,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#8 lore raw
Quoted 1 line · On Friday 17 August 2012 14:39:16 Martin Jansa wrote:

Should I file a but to fix DEFAULT_PREFERENCE between layers?

We've discussed this problem before - the trouble is we would have to change the way the version preference calculation works, and I'm not sure we will be able to do that without breaking assumptions that people currently rely upon in the process. By all means file a bug, but I think coming up with a practical solution is going to be tricky.

Quoted 3 lines

Because there is also use case when newer development version is added to e.g. meta-oe with negative D_P and only users who decide to test/use that version should get it, if they define P_V for this new version.

This is also undesirable for meta-oe IMHO - as a general principle, meta-oe shouldn't be trying to both add additional recipes *and* provide newer/older versions of recipes that are in OE-Core. Please, let's get the new versions into OE-Core or if they're too risky/broken for some use cases for that, then they belong in people's distro layers. (Practically I don't think there are that many instances of new versions of OE-Core recipes that people want to use that would be actually rejected by OE-Core).

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#9 lore raw
Quoted 13 lines · Paul Eggleton
Quoted 1 line · On Friday 17 August 2012 14:39:16 Martin Jansa wrote:

Should I file a but to fix DEFAULT_PREFERENCE between layers?

We've discussed this problem before - the trouble is we would have to change the way the version preference calculation works, and I'm not sure we will be able to do that without breaking assumptions that people currently rely upon in the process. By all means file a bug, but I think coming up with a practical solution is going to be tricky.

Quoted 3 lines

Because there is also use case when newer development version is added to e.g. meta-oe with negative D_P and only users who decide to test/use that version should get it, if they define P_V for this new version.

Quoted 7 lines

This is also undesirable for meta-oe IMHO - as a general principle, meta-oe shouldn't be trying to both add additional recipes *and* provide newer/older versions of recipes that are in OE-Core. Please, let's get the new versions into OE-Core or if they're too risky/broken for some use cases for that, then they belong in people's distro layers. (Practically I don't think there are that many instances of new versions of OE-Core recipes that people want to use that would be actually rejected by OE-Core).

What if newer version is needed for recipe which exists only in meta-oe?

I had this in meta-efl where webkit-efl was sometimes segfaulting when older stable version of libsoup2.4 was used, upstream solved that by recommending development version of libsoup2.4, but as soon as I've added it to meta-efl everybody (including users which don't use webkit-efl from meta-efl - don't need this libsoup2.4) got it as default.

Yes I could have added this libsoup2.4 only to meta-shr (where I had P_V for that) and keep webkit-efl broken for everyone else, or try to add developement version of libsoup2.4 to oe-core..

Cheers,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#10 lore raw
Quoted 31 lines · Martin Jansa
Quoted 13 lines · Paul Eggleton
Quoted 1 line · On Friday 17 August 2012 14:39:16 Martin Jansa wrote:

Should I file a but to fix DEFAULT_PREFERENCE between layers?

We've discussed this problem before - the trouble is we would have to change the way the version preference calculation works, and I'm not sure we will be able to do that without breaking assumptions that people currently rely upon in the process. By all means file a bug, but I think coming up with a practical solution is going to be tricky.

Quoted 3 lines

Because there is also use case when newer development version is added to e.g. meta-oe with negative D_P and only users who decide to test/use that version should get it, if they define P_V for this new version.

Quoted 7 lines

This is also undesirable for meta-oe IMHO - as a general principle, meta-oe shouldn't be trying to both add additional recipes *and* provide newer/older versions of recipes that are in OE-Core. Please, let's get the new versions into OE-Core or if they're too risky/broken for some use cases for that, then they belong in people's distro layers. (Practically I don't think there are that many instances of new versions of OE-Core recipes that people want to use that would be actually rejected by OE-Core).

What if newer version is needed for recipe which exists only in meta-oe?

I had this in meta-efl where webkit-efl was sometimes segfaulting when older stable version of libsoup2.4 was used, upstream solved that by recommending development version of libsoup2.4, but as soon as I've added it to meta-efl everybody (including users which don't use webkit-efl from meta-efl - don't need this libsoup2.4) got it as default.

Quoted 3 lines

Yes I could have added this libsoup2.4 only to meta-shr (where I had P_V for that) and keep webkit-efl broken for everyone else, or try to add developement version of libsoup2.4 to oe-core..

https://bugzilla.yoctoproject.org/show_bug.cgi?id=2964

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#11 lore raw
In reply to Martin Jansa
Quoted 20 lines · On Friday 17 August 2012 14:54:27 Martin Jansa wrote:
Quoted 9 lines · Paul Eggleton

This is also undesirable for meta-oe IMHO - as a general principle, meta-oe
shouldn't be trying to both add additional recipes *and* provide newer/older versions of recipes that are in OE-Core. Please, let's get the new versions into OE-Core or if they're too risky/broken for some use cases for that, then they belong in people's distro layers. (Practically I don't think there are that many instances of new versions of OE-Core recipes that people want to use that would be actually rejected by OE-Core).

What if newer version is needed for recipe which exists only in meta-oe?

I had this in meta-efl where webkit-efl was sometimes segfaulting when older stable version of libsoup2.4 was used, upstream solved that by recommending development version of libsoup2.4, but as soon as I've added it to meta-efl everybody (including users which don't use webkit-efl from meta-efl - don't need this libsoup2.4) got it as default.

Quoted 3 lines

Yes I could have added this libsoup2.4 only to meta-shr (where I had P_V for that) and keep webkit-efl broken for everyone else, or try to add developement version of libsoup2.4 to oe-core..

That is an unfortunate situation - surely one possible solution though would be to backport the actual patch that fixes the problem to the version of the library in OE-Core until the development version of the library gets released? Alternatively, in certain cases of poorly maintained upstreams where releases are infrequent, we have just switched to the development version at a chosen revision in OE-Core (after sufficient testing, naturally).

I appreciate there are going to be outliers, but I think the majority of situations could be handled without making meta-oe introduce unexpected changes when it is enabled on top of OE-Core.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre