summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-04-26 19:46:48 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-04-26 19:46:48 (GMT)
commit3eb9262c842b5a9a11d73af31d4a4519f5ccf1c4 (patch)
tree6a8f07abcdeb46605d1d277f1d906dc14e340de4
parentba9ed1370808f94f8d24d4a16467db620d159af1 (diff)
downloadbuildroot-3eb9262c842b5a9a11d73af31d4a4519f5ccf1c4.tar.gz
buildroot-3eb9262c842b5a9a11d73af31d4a4519f5ccf1c4.tar.bz2
libgtk2: get rid of old patches
Haven't been touches for more than 2 years, so lets get rid of them. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/libgtk2/old_patches/000_gtk+-2.0.6-exportsymbols.patch26
-rw-r--r--package/libgtk2/old_patches/000_gtk+-2.2.0-buildfix-immodule.patch33
-rw-r--r--package/libgtk2/old_patches/002_xpmico.patch18
-rw-r--r--package/libgtk2/old_patches/007_password_char.patch33
-rw-r--r--package/libgtk2/old_patches/0815_ia32-hack.patch123
-rw-r--r--package/libgtk2/old_patches/automake-lossage.patch24
-rw-r--r--package/libgtk2/old_patches/disable-print.patch50
-rw-r--r--package/libgtk2/old_patches/disable-tooltips.patch11
-rw-r--r--package/libgtk2/old_patches/gtk+-handhelds.patch149
-rw-r--r--package/libgtk2/old_patches/gtklabel-resize.patch10
-rw-r--r--package/libgtk2/old_patches/libdir-la.patch77
-rw-r--r--package/libgtk2/old_patches/menu-deactivate.patch51
-rw-r--r--package/libgtk2/old_patches/no-demos.patch10
-rw-r--r--package/libgtk2/old_patches/no-xwc.patch151
-rw-r--r--package/libgtk2/old_patches/odd-include-problem.patch84
-rw-r--r--package/libgtk2/old_patches/run-iconcache.patch38
-rw-r--r--package/libgtk2/old_patches/scroll-timings.patch11
-rw-r--r--package/libgtk2/old_patches/single-click.patch56
-rw-r--r--package/libgtk2/old_patches/small-gtkfilesel.patch267
-rw-r--r--package/libgtk2/old_patches/spinbutton.patch130
-rw-r--r--package/libgtk2/old_patches/xsettings.patch16
21 files changed, 0 insertions, 1368 deletions
diff --git a/package/libgtk2/old_patches/000_gtk+-2.0.6-exportsymbols.patch b/package/libgtk2/old_patches/000_gtk+-2.0.6-exportsymbols.patch
deleted file mode 100644
index 7364736..0000000
--- a/package/libgtk2/old_patches/000_gtk+-2.0.6-exportsymbols.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ruN gtk+-2.0.6.orig/configure gtk+-2.0.6/configure
---- gtk+-2.0.6.orig/configure 2002-08-31 03:49:07.000000000 +0900
-+++ gtk+-2.0.6/configure 2002-08-31 03:52:45.000000000 +0900
-@@ -7904,7 +7904,8 @@
- if test "$os_win32" != yes; then
- # libtool option to control which symbols are exported
- # right now, symbols starting with _ are not exported
-- LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[^_].*"'
-+ # Disabled until -export-symbols-regex works (RH patch)
-+ LIBTOOL_EXPORT_OPTIONS=
- else
- # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)
- LIBTOOL_EXPORT_OPTIONS=
-diff -ruN gtk+-2.0.6.orig/configure.in gtk+-2.0.6/configure.in
---- gtk+-2.0.6.orig/configure.in 2002-08-31 03:49:07.000000000 +0900
-+++ gtk+-2.0.6/configure.in 2002-08-31 03:51:22.000000000 +0900
-@@ -273,7 +273,8 @@
- if test "$os_win32" != yes; then
- # libtool option to control which symbols are exported
- # right now, symbols starting with _ are not exported
-- LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
-+ # Disabled until -export-symbols-regex works (RH patch)
-+ LIBTOOL_EXPORT_OPTIONS=
- else
- # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)
- LIBTOOL_EXPORT_OPTIONS=
diff --git a/package/libgtk2/old_patches/000_gtk+-2.2.0-buildfix-immodule.patch b/package/libgtk2/old_patches/000_gtk+-2.2.0-buildfix-immodule.patch
deleted file mode 100644
index 5d80daf..0000000
--- a/package/libgtk2/old_patches/000_gtk+-2.2.0-buildfix-immodule.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ruN gtk+-2.2.0.orig/modules/input/Makefile.am gtk+-2.2.0/modules/input/Makefile.am
---- gtk+-2.2.0.orig/modules/input/Makefile.am 2003-01-06 23:40:37.000000000 +0900
-+++ gtk+-2.2.0/modules/input/Makefile.am 2003-01-06 23:46:35.000000000 +0900
-@@ -118,7 +118,12 @@
- im-viqr.la
-
- gtk.immodules: Makefile.am $(module_LTLIBRARIES)
-- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
-+ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
-+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules ; \
-+ else \
-+ touch $@ ; \
-+ fi
-+
-
- CLEANFILES = gtk.immodules
-
-diff -ruN gtk+-2.2.0.orig/modules/input/Makefile.in gtk+-2.2.0/modules/input/Makefile.in
---- gtk+-2.2.0.orig/modules/input/Makefile.in 2003-01-06 23:39:08.000000000 +0900
-+++ gtk+-2.2.0/modules/input/Makefile.in 2003-01-06 23:46:44.000000000 +0900
-@@ -785,7 +785,11 @@
- rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
-
- gtk.immodules: Makefile.am $(module_LTLIBRARIES)
-- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
-+ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
-+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules ; \
-+ else \
-+ touch $@ ; \
-+ fi
-
- @CROSS_COMPILING_FALSE@all-local: gtk.immodules
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/package/libgtk2/old_patches/002_xpmico.patch b/package/libgtk2/old_patches/002_xpmico.patch
deleted file mode 100644
index 21500db..0000000
--- a/package/libgtk2/old_patches/002_xpmico.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur gtk+-2.4.9.orig/gdk-pixbuf/io-ico.c gtk+-2.4.9/gdk-pixbuf/io-ico.c
---- gtk+-2.4.9.orig/gdk-pixbuf/io-ico.c 2004-08-25 18:52:18.000000000 +0200
-+++ gtk+-2.4.9/gdk-pixbuf/io-ico.c 2004-09-15 00:40:17.000000000 +0200
-@@ -210,6 +210,14 @@
-
- State->HeaderSize = 6 + IconCount*16;
-
-+ if (State->HeaderSize < 0) {
-+ g_set_error (error,
-+ GDK_PIXBUF_ERROR,
-+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-+ _("Invalid header in icon"));
-+ return;
-+ }
-+
- if (State->HeaderSize>State->BytesInHeaderBuf) {
- guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize);
- if (!tmp) {
diff --git a/package/libgtk2/old_patches/007_password_char.patch b/package/libgtk2/old_patches/007_password_char.patch
deleted file mode 100644
index ed13570..0000000
--- a/package/libgtk2/old_patches/007_password_char.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- gtk+-2.8.10/gtk/gtkentry.c.set-invisible-char-to-bullet 2006-01-19 15:12:18.000000000 -0500
-+++ gtk+-2.8.10/gtk/gtkentry.c 2006-01-19 15:36:51.000000000 -0500
-@@ -542,7 +542,7 @@
- g_param_spec_unichar ("invisible-char",
- P_("Invisible character"),
- P_("The character to use when masking entry contents (in \"password mode\")"),
-- '*',
-+ (gunichar) 0x25cf,
- GTK_PARAM_READWRITE));
-
- g_object_class_install_property (gobject_class,
-@@ -1000,7 +1000,7 @@
-
- entry->editable = TRUE;
- entry->visible = TRUE;
-- entry->invisible_char = '*';
-+ entry->invisible_char = (gunichar) 0x25cf;
- entry->dnd_position = -1;
- entry->width_chars = -1;
- entry->is_cell_renderer = FALSE;
-@@ -4019,9 +4019,9 @@
- * gtk_entry_set_visibility() has been called to set text visibility
- * to %FALSE. i.e. this is the character used in "password mode" to
- * show the user how many characters have been typed. The default
-- * invisible char is an asterisk ('*'). If you set the invisible char
-- * to 0, then the user will get no feedback at all; there will be
-- * no text on the screen as they type.
-+ * invisible char is a small bullet (Unicode character 2022). If you
-+ * set the invisible char to 0, then the user will get no feedback at
-+ * all; there will be no text on the screen as they type.
- *
- **/
- void
diff --git a/package/libgtk2/old_patches/0815_ia32-hack.patch b/package/libgtk2/old_patches/0815_ia32-hack.patch
deleted file mode 100644
index fb10d85..0000000
--- a/package/libgtk2/old_patches/0815_ia32-hack.patch
+++ /dev/null
@@ -1,123 +0,0 @@
---- gtk+-2.8.13/gdk-pixbuf/gdk-pixbuf-io.c~ 2005-10-03 17:11:49.000000000 +0200
-+++ gtk+-2.8.13/gdk-pixbuf/gdk-pixbuf-io.c 2006-03-01 20:33:36.524552192 +0100
-@@ -32,6 +32,7 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#include <sys/utsname.h>
-
- #include "gdk-pixbuf-private.h"
- #include "gdk-pixbuf-io.h"
-@@ -276,8 +277,21 @@
- gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
-
- if (!result)
-- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
-+#if defined(__linux__) && defined (__i386__)
-+ {
-+ struct utsname uts;
-
-+ uname(&uts);
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders.32", NULL);
-+ if (strcmp("x86_64", uts.machine) || access(result, R_OK))
-+ {
-+ g_free(result);
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
-+ }
-+ }
-+#else
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
-+#endif
- return result;
- }
-
---- gtk+-2.8.13/gtk/gtkprivate.h~ 2005-03-22 03:14:55.000000000 +0100
-+++ gtk+-2.8.13/gtk/gtkprivate.h 2006-03-01 19:51:42.510740384 +0100
-@@ -96,6 +96,13 @@
-
- #endif /* G_OS_WIN32 */
-
-+#if defined(__linux__) && defined (__i386__)
-+const gchar *_gtk_get_libdir ();
-+
-+#undef GTK_LIBDIR
-+#define GTK_LIBDIR _gtk_get_libdir ()
-+#endif
-+
- gboolean _gtk_fnmatch (const char *pattern,
- const char *string,
- gboolean no_leading_period);
---- gtk+-2.8.13/gtk/gtkmain.c~ 2005-12-06 17:14:30.000000000 +0100
-+++ gtk+-2.8.13/gtk/gtkmain.c 2006-03-01 20:36:05.175953744 +0100
-@@ -42,6 +42,7 @@
- #include <unistd.h>
- #endif
- #include <sys/types.h> /* For uid_t, gid_t */
-+#include <sys/utsname.h>
-
- #ifdef G_OS_WIN32
- #define STRICT
-@@ -336,6 +337,28 @@
-
- #endif /* G_OS_WIN32 */
-
-+#if defined(__linux__) && defined (__i386__)
-+const gchar *
-+_gtk_get_libdir (void)
-+{
-+ static char *gtk_libdir = NULL;
-+ if (gtk_libdir == NULL)
-+ {
-+#if defined(__linux__) && defined (__i386__)
-+ struct utsname uts;
-+
-+ uname(&uts);
-+ if (!strcmp("x86_64", uts.machine)
-+ && !access("/usr/lib32/gtk-2.0", R_OK|X_OK))
-+ gtk_libdir = "/usr/lib32";
-+ else
-+#endif
-+ gtk_libdir = "/usr/lib";
-+ }
-+ return gtk_libdir;
-+}
-+#endif
-+
- static gboolean do_setlocale = TRUE;
-
- /**
---- gtk+-2.8.13/gtk/gtkrc.c~ 2005-11-23 15:24:51.000000000 +0100
-+++ gtk+-2.8.13/gtk/gtkrc.c 2006-03-01 20:33:25.952159440 +0100
-@@ -38,6 +38,10 @@
- #include <string.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <sys/utsname.h>
-
-
- #include <glib.h>
-@@ -364,7 +368,21 @@
- if (im_module_file)
- result = g_strdup (im_module_file);
- else
-+#if defined(__linux__) && defined (__i386__)
-+ {
-+ struct utsname uts;
-+
-+ uname(&uts);
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules.32", NULL);
-+ if (strcmp("x86_64", uts.machine) || access(result, R_OK))
-+ {
-+ g_free(result);
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+ }
-+ }
-+#else
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+#endif
- }
-
- return result;
diff --git a/package/libgtk2/old_patches/automake-lossage.patch b/package/libgtk2/old_patches/automake-lossage.patch
deleted file mode 100644
index 0d423dd..0000000
--- a/package/libgtk2/old_patches/automake-lossage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100
-+++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100
-@@ -52,21 +52,5 @@
-
- dist-hook: html
- cp -Rp $(srcdir)/html $(distdir)
--else
--html:
-- echo "***"
-- echo "*** Warning: Tutorial not built"
-- echo "***"
--
--pdf:
-- echo "***"
-- echo "*** Warning: Tutorial not built"
-- echo "***"
--
--dist-hook:
-- echo "***"
-- echo "*** Warning: Tutorial not built"
-- echo "*** DISTRIBUTION IS INCOMPLETE"
-- echo "***"
- endif
-
diff --git a/package/libgtk2/old_patches/disable-print.patch b/package/libgtk2/old_patches/disable-print.patch
deleted file mode 100644
index 1067773..0000000
--- a/package/libgtk2/old_patches/disable-print.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- gtk+-2.10.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200
-+++ gtk+-2.10.0/configure.in 2006-07-05 18:11:44.000000000 +0200
-@@ -1539,26 +1539,27 @@
- # Printing system checks
- ################################################################
-
--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 -n $CUPS_API_VERSION | awk -F. '{print $1}'`
-- CUPS_API_MINOR=`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)
--fi
--AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-+#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 -n $CUPS_API_VERSION | awk -F. '{print $1}'`
-+# CUPS_API_MINOR=`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)
-+#fi
-+#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-+AM_CONDITIONAL(HAVE_CUPS,false)
-
- gtk_save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
diff --git a/package/libgtk2/old_patches/disable-tooltips.patch b/package/libgtk2/old_patches/disable-tooltips.patch
deleted file mode 100644
index d71d839..0000000
--- a/package/libgtk2/old_patches/disable-tooltips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100
-@@ -118,7 +118,7 @@
- tooltips->tips_data_list = NULL;
-
- tooltips->delay = DEFAULT_DELAY;
-- tooltips->enabled = TRUE;
-+ tooltips->enabled = FALSE;
- tooltips->timer_tag = 0;
- tooltips->use_sticky_delay = FALSE;
- tooltips->last_popdown.tv_sec = -1;
diff --git a/package/libgtk2/old_patches/gtk+-handhelds.patch b/package/libgtk2/old_patches/gtk+-handhelds.patch
deleted file mode 100644
index 1ea86ce..0000000
--- a/package/libgtk2/old_patches/gtk+-handhelds.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-Index: gtk+-2.10.6/gtk/gtkarrow.c
-===================================================================
---- gtk+-2.10.6.orig/gtk/gtkarrow.c 2006-05-14 05:25:28.000000000 +0100
-+++ gtk+-2.10.6/gtk/gtkarrow.c 2006-11-14 12:03:45.000000000 +0000
-@@ -31,7 +31,7 @@
- #include "gtkintl.h"
- #include "gtkalias.h"
-
--#define MIN_ARROW_SIZE 15
-+#define MIN_ARROW_SIZE 7
-
- enum {
- PROP_0,
-@@ -53,6 +53,8 @@
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-+static void gtk_arrow_size_request (GtkWidget *arrow,
-+ GtkRequisition *requisition);
-
-
- G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC)
-@@ -88,6 +90,7 @@
- GTK_PARAM_READWRITE));
-
- widget_class->expose_event = gtk_arrow_expose;
-+ widget_class->size_request = gtk_arrow_size_request;
- }
-
- static void
-@@ -143,13 +146,18 @@
- }
-
- static void
-+gtk_arrow_size_request (GtkWidget *arrow,
-+ GtkRequisition *requisition)
-+{
-+ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
-+ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
-+}
-+
-+static void
- gtk_arrow_init (GtkArrow *arrow)
- {
- GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW);
-
-- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
-- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
--
- arrow->arrow_type = GTK_ARROW_RIGHT;
- arrow->shadow_type = GTK_SHADOW_OUT;
- }
-Index: gtk+-2.10.6/gtk/gtkentry.c
-===================================================================
---- gtk+-2.10.6.orig/gtk/gtkentry.c 2006-11-14 12:03:45.000000000 +0000
-+++ gtk+-2.10.6/gtk/gtkentry.c 2006-11-14 12:07:02.000000000 +0000
-@@ -577,6 +577,18 @@
- 0.0,
- GTK_PARAM_READWRITE));
-
-+ // Added by gtk+-handhelds.patch
-+ gtk_widget_class_install_style_property (widget_class,
-+ g_param_spec_int ("min_width",
-+ P_("Minimum width"),
-+ P_("Minimum width of the entry field"),
-+ 0,
-+ G_MAXINT,
-+ MIN_ENTRY_WIDTH,
-+ G_PARAM_READABLE));
-+
-+
-+
- /**
- * GtkEntry:truncate-multiline:
- *
-@@ -1286,7 +1298,7 @@
- {
- GtkEntry *entry = GTK_ENTRY (widget);
- PangoFontMetrics *metrics;
-- gint xborder, yborder;
-+ gint xborder, yborder, min_width;
- GtkBorder inner_border;
- PangoContext *context;
-
-@@ -1302,8 +1314,10 @@
- _gtk_entry_get_borders (entry, &xborder, &yborder);
- _gtk_entry_effective_inner_border (entry, &inner_border);
-
-+ gtk_widget_style_get (widget, "min_width", &min_width, NULL);
-+
- if (entry->width_chars < 0)
-- requisition->width = MIN_ENTRY_WIDTH + xborder * 2 + inner_border.left + inner_border.right;
-+ requisition->width = min_width + xborder * 2 + inner_border.left + inner_border.right;
- else
- {
- gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
-Index: gtk+-2.10.6/gtk/gtkrange.c
-===================================================================
---- gtk+-2.10.6.orig/gtk/gtkrange.c 2006-11-14 12:03:44.000000000 +0000
-+++ gtk+-2.10.6/gtk/gtkrange.c 2006-11-14 12:07:40.000000000 +0000
-@@ -197,6 +197,7 @@
- static gboolean gtk_range_key_press (GtkWidget *range,
- GdkEventKey *event);
-
-+static GdkAtom recognize_protocols_atom, atom_atom;
-
- static guint signals[LAST_SIGNAL];
-
-@@ -213,6 +214,9 @@
- object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
-
-+ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE);
-+ atom_atom = gdk_atom_intern ("ATOM", FALSE);
-+
- gobject_class->set_property = gtk_range_set_property;
- gobject_class->get_property = gtk_range_get_property;
- gobject_class->finalize = gtk_range_finalize;
-@@ -1020,6 +1024,12 @@
- &attributes, attributes_mask);
- gdk_window_set_user_data (range->event_window, range);
-
-+ gdk_property_change (range->event_window,
-+ recognize_protocols_atom,
-+ atom_atom,
-+ 32, GDK_PROP_MODE_REPLACE,
-+ NULL, 0);
-+
- widget->style = gtk_style_attach (widget->style, widget->window);
- }
-
-@@ -1569,7 +1579,7 @@
-
- /* ignore presses when we're already doing something else. */
- if (range->layout->grab_location != MOUSE_OUTSIDE)
-- return FALSE;
-+ return TRUE;
-
- range->layout->mouse_x = event->x;
- range->layout->mouse_y = event->y;
-@@ -1778,7 +1788,7 @@
- return TRUE;
- }
-
-- return FALSE;
-+ return TRUE;
- }
-
- /**
diff --git a/package/libgtk2/old_patches/gtklabel-resize.patch b/package/libgtk2/old_patches/gtklabel-resize.patch
deleted file mode 100644
index df29656..0000000
--- a/package/libgtk2/old_patches/gtklabel-resize.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100
-@@ -1623,6 +1623,7 @@
-
- /* We have to clear the layout, fonts etc. may have changed */
- gtk_label_clear_layout (label);
-+ gtk_widget_queue_resize (GTK_WIDGET (label));
- }
-
- static void
diff --git a/package/libgtk2/old_patches/libdir-la.patch b/package/libgtk2/old_patches/libdir-la.patch
deleted file mode 100644
index 9df1c88..0000000
--- a/package/libgtk2/old_patches/libdir-la.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- gtk/ltmain.sh.orig 2004-11-23 09:19:19.000000000 -0700
-+++ gtk/ltmain.sh 2007-01-13 14:36:53.000000000 -0700
-@@ -231,8 +231,9 @@
- # line option must be used.
- if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
-- $echo "$modename: specify a tag with \`--tag'" 1>&2
-- exit $EXIT_FAILURE
-+ $echo "$modename: defaulting to \`CC'"
-+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+# exit $EXIT_FAILURE
- # else
- # $echo "$modename: using $tagname tagged configuration"
- fi
-@@ -2279,8 +2280,14 @@
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search paths
-+ # breaks crosscompilation horribly. We cheat here and don't add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- else
- if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-@@ -2754,6 +2761,16 @@
- esac
- if grep "^installed=no" $deplib > /dev/null; then
- path="$absdir/$objdir"
-+# This interferes with crosscompilation. -CL
-+# else
-+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+# if test -z "$libdir"; then
-+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+# exit 1
-+# fi
-+# if test "$absdir" != "$libdir"; then
-+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+# fi
- else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
-@@ -5141,6 +5158,10 @@
- # Replace all uninstalled libtool libraries with the installed ones
- newdependency_libs=
- for deplib in $dependency_libs; do
-+ # Replacing uninstalled with installed can easily break crosscompilation,
-+ # since the installed path is generally the wrong architecture. -CL
-+ newdependency_libs="$newdependency_libs $deplib"
-+ continue
- case $deplib in
- *.la)
- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -5459,10 +5480,13 @@
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
-- if test "$inst_prefix_dir" = "$destdir"; then
-- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-- exit $EXIT_FAILURE
-- fi
-+ #
-+ # This breaks install into our staging area. -PB
-+ #
-+ # if test "$inst_prefix_dir" = "$destdir"; then
-+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+ # exit $EXIT_FAILURE
-+ # fi
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
diff --git a/package/libgtk2/old_patches/menu-deactivate.patch b/package/libgtk2/old_patches/menu-deactivate.patch
deleted file mode 100644
index cfb8849..0000000
--- a/package/libgtk2/old_patches/menu-deactivate.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200
-+++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200
-@@ -42,7 +42,7 @@
- #include "gtkintl.h"
- #include "gtkalias.h"
-
--#define MENU_SHELL_TIMEOUT 500
-+#define MENU_SHELL_TIMEOUT 2000
-
- #define PACK_DIRECTION(m) \
- (GTK_IS_MENU_BAR (m) \
-@@ -203,6 +203,8 @@
-
- G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER)
-
-+static int last_crossing_time;
-+
- static void
- gtk_menu_shell_class_init (GtkMenuShellClass *klass)
- {
-@@ -517,6 +519,7 @@
- gtk_grab_add (GTK_WIDGET (menu_shell));
- menu_shell->have_grab = TRUE;
- menu_shell->active = TRUE;
-+ last_crossing_time = 0;
- }
- }
-
-@@ -669,6 +672,13 @@
- menu_shell->activate_time = 0;
- deactivate = FALSE;
- }
-+
-+ if (last_crossing_time != 0
-+ && ((event->time - last_crossing_time) < 500))
-+ {
-+ last_crossing_time = 0;
-+ deactivate = FALSE;
-+ }
-
- if (deactivate)
- {
-@@ -716,6 +726,8 @@
- {
- menu_item = gtk_get_event_widget ((GdkEvent*) event);
-
-+ last_crossing_time = event->time;
-+
- if (!menu_item ||
- (GTK_IS_MENU_ITEM (menu_item) &&
- !_gtk_menu_item_is_selectable (menu_item)))
diff --git a/package/libgtk2/old_patches/no-demos.patch b/package/libgtk2/old_patches/no-demos.patch
deleted file mode 100644
index 0fc4c48..0000000
--- a/package/libgtk2/old_patches/no-demos.patch
+++ /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/package/libgtk2/old_patches/no-xwc.patch b/package/libgtk2/old_patches/no-xwc.patch
deleted file mode 100644
index affb4a3..0000000
--- a/package/libgtk2/old_patches/no-xwc.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00
-+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00
-@@ -576,12 +576,14 @@
- GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
- }
- }
-+#ifdef HAVE_XWC
- else if (font->type == GDK_FONT_FONTSET)
- {
- XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
- XmbDrawString (xdisplay, impl->xid,
- fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
- }
-+#endif
- else
- g_error("undefined font type\n");
- }
-@@ -613,6 +615,7 @@
- GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
- g_free (text_8bit);
- }
-+#ifdef HAVE_XWC
- else if (font->type == GDK_FONT_FONTSET)
- {
- if (sizeof(GdkWChar) == sizeof(wchar_t))
-@@ -633,6 +636,7 @@
- g_free (text_wchar);
- }
- }
-+#endif
- else
- g_error("undefined font type\n");
- }
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00
-+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00
-@@ -525,10 +525,12 @@
- width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
- }
- break;
-+#ifdef HAVE_XWC
- case GDK_FONT_FONTSET:
- fontset = (XFontSet) private->xfont;
- width = XmbTextEscapement (fontset, text, text_length);
- break;
-+#endif
- default:
- width = 0;
- }
-@@ -578,6 +580,7 @@
- width = 0;
- }
- break;
-+#ifdef HAVE_XWC
- case GDK_FONT_FONTSET:
- if (sizeof(GdkWChar) == sizeof(wchar_t))
- {
-@@ -595,6 +598,7 @@
- g_free (text_wchar);
- }
- break;
-+#endif
- default:
- width = 0;
- }
-@@ -667,6 +671,7 @@
- if (descent)
- *descent = overall.descent;
- break;
-+#ifdef HAVE_XWC
- case GDK_FONT_FONTSET:
- fontset = (XFontSet) private->xfont;
- XmbTextExtents (fontset, text, text_length, &ink, &logical);
-@@ -681,6 +686,7 @@
- if (descent)
- *descent = ink.y + ink.height;
- break;
-+#endif
- }
-
- }
-@@ -753,6 +759,7 @@
- *descent = overall.descent;
- break;
- }
-+#ifdef HAVE_XWC
- case GDK_FONT_FONTSET:
- fontset = (XFontSet) private->xfont;
-
-@@ -780,6 +787,7 @@
- if (descent)
- *descent = ink.y + ink.height;
- break;
-+#endif
- }
-
- }
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00
-+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00
-@@ -48,6 +48,7 @@
- void
- _gdk_x11_initialize_locale (void)
- {
-+#ifdef HAVE_XWC
- wchar_t result;
- gchar *current_locale;
- static char *last_locale = NULL;
-@@ -93,7 +94,8 @@
- GDK_NOTE (XIM,
- g_message ("%s multi-byte string functions.",
- gdk_use_mb ? "Using" : "Not using"));
--
-+#endif
-+
- return;
- }
-
-@@ -136,6 +138,7 @@
- {
- gchar *mbstr;
-
-+#ifdef HAVE_XWC
- if (gdk_use_mb)
- {
- GdkDisplay *display = find_a_display ();
-@@ -178,6 +181,7 @@
- XFree (tpr.value);
- }
- else
-+#endif
- {
- gint length = 0;
- gint i;
-@@ -210,6 +214,7 @@
- gint
- gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
- {
-+#ifdef HAVE_XWC
- if (gdk_use_mb)
- {
- GdkDisplay *display = find_a_display ();
-@@ -242,6 +247,7 @@
- return len_cpy;
- }
- else
-+#endif
- {
- gint i;
-
diff --git a/package/libgtk2/old_patches/odd-include-problem.patch b/package/libgtk2/old_patches/odd-include-problem.patch
deleted file mode 100644
index 264149f..0000000
--- a/package/libgtk2/old_patches/odd-include-problem.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- gtk+-2.10.7/gdk/Makefile.am.orig 2007-01-05 11:42:47.000000000 -0700
-+++ gtk+-2.10.7/gdk/Makefile.am 2007-01-14 02:47:46.000000000 -0700
-@@ -26,7 +26,8 @@
- -I$(top_builddir)/gdk \
- -I$(top_srcdir)/gdk-pixbuf \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
-- $(GTK_DEBUG_FLAGS) \
-+ $(GTK_DEBUG_FLAGS) \
-+ $(GTK_DEP_CFLAGS) \
- $(GDK_DEP_CFLAGS)
-
- gtarget=$(gdktarget)
---- gtk+-2.10.7/gdk/Makefile.in.orig 2007-01-05 11:44:15.000000000 -0700
-+++ gtk+-2.10.7/gdk/Makefile.in 2007-01-14 02:48:02.000000000 -0700
-@@ -323,7 +323,8 @@
- -I$(top_builddir)/gdk \
- -I$(top_srcdir)/gdk-pixbuf \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
-- $(GTK_DEBUG_FLAGS) \
-+ $(GTK_DEBUG_FLAGS) \
-+ $(GTK_DEP_CFLAGS) \
- $(GDK_DEP_CFLAGS)
-
-
---- gtk+-2.10.6/gdk/x11/Makefile.am.orig 2007-01-14 01:56:44.000000000 -0700
-+++ gtk+-2.10.6/gdk/x11/Makefile.am 2007-01-14 01:57:09.000000000 -0700
-@@ -9,7 +9,8 @@
- -I$(top_srcdir)/gdk \
- -I$(top_builddir)/gdk \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
-- $(GTK_DEBUG_FLAGS) \
-+ $(GTK_DEBUG_FLAGS) \
-+ $(GTK_DEP_CFLAGS) \
- $(GDK_DEP_CFLAGS)
-
- LDADDS = $(GDK_DEP_LIBS)
---- gtk+-2.10.7/gdk/x11/Makefile.in.orig 2007-01-14 02:40:58.000000000 -0700
-+++ gtk+-2.10.7/gdk/x11/Makefile.in 2007-01-14 02:41:30.000000000 -0700
-@@ -305,7 +305,8 @@
- -I$(top_srcdir)/gdk \
- -I$(top_builddir)/gdk \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
-- $(GTK_DEBUG_FLAGS) \
-+ $(GTK_DEBUG_FLAGS) \
-+ $(GTK_DEP_CFLAGS) \
- $(GDK_DEP_CFLAGS)
-
-
---- gtk+-2.10.7/gtk/Makefile.am.orig 2007-01-14 15:19:59.000000000 -0700
-+++ gtk+-2.10.7/gtk/Makefile.am 2007-01-14 15:21:58.000000000 -0700
-@@ -36,6 +36,7 @@
- -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
- -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
- $(GTK_DEBUG_FLAGS) \
-+ $(GDK_DEP_CFLAGS) \
- $(GTK_DEP_CFLAGS) \
- $(gtk_clipboard_dnd_c_sources_CFLAGS)
-
-@@ -106,6 +107,7 @@
- libadd = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(top_builddir)/gdk/$(gdktargetlib) \
-+ $(GDK_DEP_LIBS) \
- $(GTK_DEP_LIBS)
-
- if OS_UNIX
---- gtk+-2.10.7/gtk/Makefile.in.orig 2007-01-14 15:20:06.000000000 -0700
-+++ gtk+-2.10.7/gtk/Makefile.in 2007-01-14 15:21:46.000000000 -0700
-@@ -344,6 +344,7 @@
- -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
- -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
- $(GTK_DEBUG_FLAGS) \
-+ $(GDK_DEP_CFLAGS) \
- $(GTK_DEP_CFLAGS) \
- $(gtk_clipboard_dnd_c_sources_CFLAGS)
-
-@@ -370,6 +371,7 @@
- libadd = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(top_builddir)/gdk/$(gdktargetlib) \
-+ $(GDK_DEP_LIBS) \
- $(GTK_DEP_LIBS)\
- $(am__append_3)
-
diff --git a/package/libgtk2/old_patches/run-iconcache.patch b/package/libgtk2/old_patches/run-iconcache.patch
deleted file mode 100644
index 6768a9b..0000000
--- a/package/libgtk2/old_patches/run-iconcache.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- gtk/gtk/Makefile.in.orig 2007-01-14 02:29:46.000000000 -0700
-+++ gtk/gtk/Makefile.in 2007-01-14 02:30:19.000000000 -0700
-@@ -2954,11 +2954,11 @@
- done \
- && touch stamp-icons
-
--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
-
- install-data-local:
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
---- gtk/gtk/Makefile.am.orig 2007-01-14 02:29:39.000000000 -0700
-+++ gtk/gtk/Makefile.am 2007-01-14 02:30:06.000000000 -0700
-@@ -1123,11 +1123,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) \
diff --git a/package/libgtk2/old_patches/scroll-timings.patch b/package/libgtk2/old_patches/scroll-timings.patch
deleted file mode 100644
index 3f823a7..0000000
--- a/package/libgtk2/old_patches/scroll-timings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-2.10.0/gtk/gtkrange.c.orig 2006-07-05 12:41:39.000000000 +0200
-+++ gtk+-2.10.0/gtk/gtkrange.c 2006-07-05 12:41:58.000000000 +0200
-@@ -39,7 +39,7 @@
- #include "gtkalias.h"
-
- #define SCROLL_DELAY_FACTOR 5 /* Scroll repeat multiplier */
--#define UPDATE_DELAY 300 /* Delay for queued update */
-+#define UPDATE_DELAY 1000 /* Delay for queued update */
-
- enum {
- PROP_0,
diff --git a/package/libgtk2/old_patches/single-click.patch b/package/libgtk2/old_patches/single-click.patch
deleted file mode 100644
index 250f162..0000000
--- a/package/libgtk2/old_patches/single-click.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: gtk+-2.10.6/gtk/gtkcalendar.c
-===================================================================
---- gtk+-2.10.6.orig/gtk/gtkcalendar.c
-+++ gtk+-2.10.6/gtk/gtkcalendar.c
-@@ -2482,9 +2482,11 @@ calendar_main_button_press (GtkCalendar
- }
-
- calendar_select_and_focus_day (calendar, day);
-- }
-+
-+ // This change causes the calendar to disappear after choosing a day
-+/* }
- else if (event->type == GDK_2BUTTON_PRESS)
-- {
-+ {*/
- priv->in_drag = 0;
- if (day_month == MONTH_CURRENT)
- g_signal_emit (calendar,
-Index: gtk+-2.10.6/gtk/gtkfilesel.c
-===================================================================
---- gtk+-2.10.6.orig/gtk/gtkfilesel.c
-+++ gtk+-2.10.6/gtk/gtkfilesel.c
-@@ -2426,6 +2426,33 @@ gtk_file_selection_file_changed (GtkTree
- if (fs->last_selected != NULL)
- g_free (fs->last_selected);
-
-+ // Single-click directory entry
-+ if (new_names->len == 1)
-+ {
-+ GtkTreeView *tree_view;
-+ GtkTreeModel *model;
-+ GtkTreePath *path;
-+ GtkTreeIter iter;
-+ gboolean is_file;
-+
-+ tree_view = gtk_tree_selection_get_tree_view (selection);
-+
-+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
-+ {
-+ path = gtk_tree_model_get_path (model, &iter);
-+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
-+
-+ if (!is_file)
-+ {
-+ gtk_file_selection_dir_activate (tree_view, path,
-+ gtk_tree_view_get_column (tree_view, DIR_COLUMN),
-+ user_data);
-+ }
-+
-+ gtk_tree_path_free (path);
-+ }
-+ }
-+
- fs->last_selected = g_strdup (g_ptr_array_index (new_names, index));
- filename = get_real_filename (fs->last_selected, FALSE);
-
diff --git a/package/libgtk2/old_patches/small-gtkfilesel.patch b/package/libgtk2/old_patches/small-gtkfilesel.patch
deleted file mode 100644
index 20bf4cf..0000000
--- a/package/libgtk2/old_patches/small-gtkfilesel.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c
---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100
-+++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100
-@@ -68,6 +68,7 @@
- #include "gtkprivate.h"
- #include "gtkscrolledwindow.h"
- #include "gtkstock.h"
-+#include "gtksignal.h"
- #include "gtktreeselection.h"
- #include "gtktreeview.h"
- #include "gtkvbox.h"
-@@ -77,6 +78,7 @@
- #include "gtkmessagedialog.h"
- #include "gtkdnd.h"
- #include "gtkeventbox.h"
-+#include "gtkimage.h"
-
- #undef GTK_DISABLE_DEPRECATED
- #include "gtkoptionmenu.h"
-@@ -245,7 +247,8 @@
- };
-
- enum {
-- DIR_COLUMN
-+ DIR_COLUMN,
-+ ISFILE_COLUMN
- };
-
- enum {
-@@ -400,6 +403,12 @@
- GtkTreePath *path,
- GtkTreeViewColumn *column,
- gpointer user_data);
-+
-+static void gtk_file_selection_activate (GtkTreeView *tree_view,
-+ GtkTreePath *path,
-+ GtkTreeViewColumn *column,
-+ gpointer user_data);
-+
- static void gtk_file_selection_file_changed (GtkTreeSelection *selection,
- gpointer user_data);
- static void gtk_file_selection_dir_activate (GtkTreeView *tree_view,
-@@ -419,6 +428,7 @@
- static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data);
- static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data);
- static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data);
-+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style);
-
- static void free_selected_names (GPtrArray *names);
-
-@@ -578,6 +588,23 @@
- G_PARAM_WRITABLE));
- object_class->destroy = gtk_file_selection_destroy;
- widget_class->map = gtk_file_selection_map;
-+ widget_class->style_set = gtk_file_selection_style_set;
-+
-+ gtk_widget_class_install_style_property (widget_class,
-+ g_param_spec_boolean ("show_fileops_default",
-+ _("Show fileop buttons by default"),
-+ _("Whether file operation buttons are shown by default"),
-+ TRUE,
-+ G_PARAM_READABLE));
-+
-+ gtk_widget_class_install_style_property (widget_class,
-+ g_param_spec_int ("border_width",
-+ _("Border width"),
-+ _("Width of border around the main dialog area"),
-+ 0,
-+ G_MAXINT,
-+ 10,
-+ G_PARAM_READABLE));
- }
-
- static void gtk_file_selection_set_property (GObject *object,
-@@ -649,7 +676,29 @@
- gtk_widget_grab_default (widget);
- return FALSE;
- }
--
-+
-+static void
-+gtk_file_selection_style_set (GtkWidget *filesel,
-+ GtkStyle *prev_style)
-+{
-+ gboolean show_fileops;
-+ gint border_width;
-+
-+ gtk_widget_style_get (filesel,
-+ "show_fileops_default",
-+ &show_fileops,
-+ "border_width",
-+ &border_width,
-+ NULL);
-+
-+ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width);
-+
-+ if (show_fileops)
-+ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel));
-+ else
-+ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel));
-+}
-+
- static void
- gtk_file_selection_init (GtkFileSelection *filesel)
- {
-@@ -674,17 +723,15 @@
-
- /* The dialog-sized vertical box */
- filesel->main_vbox = dialog->vbox;
-- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10);
-
- /* The horizontal box containing create, rename etc. buttons */
- filesel->button_area = gtk_hbutton_box_new ();
- gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START);
-- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0);
- gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area,
- FALSE, FALSE, 0);
- gtk_widget_show (filesel->button_area);
-
-- gtk_file_selection_show_fileop_buttons (filesel);
-+ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL);
-
- /* hbox for pulldown menu */
- pulldown_hbox = gtk_hbox_new (TRUE, 5);
-@@ -723,25 +770,32 @@
-
- /* The directories list */
-
-- model = gtk_list_store_new (1, G_TYPE_STRING);
-+ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */
- filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
- g_object_unref (model);
-
-- column = gtk_tree_view_column_new_with_attributes (_("Folders"),
-+ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL,
- gtk_cell_renderer_text_new (),
- "text", DIR_COLUMN,
- NULL);
- label = gtk_label_new_with_mnemonic (_("Fol_ders"));
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list);
- gtk_widget_show (label);
-- gtk_tree_view_column_set_widget (column, label);
-+
-+ /* gtk_tree_view_column_set_widget (column, label); */
-+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE);
-+
- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column);
-
- gtk_widget_set_size_request (filesel->dir_list,
- DIR_LIST_WIDTH, DIR_LIST_HEIGHT);
- g_signal_connect (filesel->dir_list, "row_activated",
-- G_CALLBACK (gtk_file_selection_dir_activate), filesel);
-+ G_CALLBACK (gtk_file_selection_activate), filesel);
-+
-+ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed",
-+ G_CALLBACK (gtk_file_selection_file_changed), filesel);
-+
-
- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */
-
-@@ -758,41 +812,6 @@
- gtk_widget_show (filesel->dir_list);
- gtk_widget_show (scrolled_win);
-
-- /* The files list */
-- model = gtk_list_store_new (1, G_TYPE_STRING);
-- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
-- g_object_unref (model);
--
-- column = gtk_tree_view_column_new_with_attributes (_("Files"),
-- gtk_cell_renderer_text_new (),
-- "text", FILE_COLUMN,
-- NULL);
-- label = gtk_label_new_with_mnemonic (_("_Files"));
-- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list);
-- gtk_widget_show (label);
-- gtk_tree_view_column_set_widget (column, label);
-- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column);
--
-- gtk_widget_set_size_request (filesel->file_list,
-- FILE_LIST_WIDTH, FILE_LIST_HEIGHT);
-- g_signal_connect (filesel->file_list, "row_activated",
-- G_CALLBACK (gtk_file_selection_file_activate), filesel);
-- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed",
-- G_CALLBACK (gtk_file_selection_file_changed), filesel);
--
-- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */
--
-- scrolled_win = gtk_scrolled_window_new (NULL, NULL);
-- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN);
-- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list);
-- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
-- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0);
-- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win);
-- gtk_widget_show (filesel->file_list);
-- gtk_widget_show (scrolled_win);
--
- /* action area for packing buttons into. */
- filesel->action_area = gtk_hbox_new (TRUE, 0);
- gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area,
-@@ -2008,6 +2027,23 @@
- }
-
- static void
-+gtk_file_selection_activate (GtkTreeView *tree_view,
-+ GtkTreePath *path,
-+ GtkTreeViewColumn *column,
-+ gpointer user_data)
-+{
-+ GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
-+ GtkTreeIter iter;
-+ gboolean is_file;
-+
-+ gtk_tree_model_get_iter (model, &iter, path);
-+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
-+
-+ if (! is_file)
-+ gtk_file_selection_dir_activate (tree_view, path, column, user_data);
-+}
-+
-+static void
- gtk_file_selection_file_activate (GtkTreeView *tree_view,
- GtkTreePath *path,
- GtkTreeViewColumn *column,
-@@ -2103,7 +2139,6 @@
- PossibleCompletion* poss;
- GtkTreeIter iter;
- GtkListStore *dir_model;
-- GtkListStore *file_model;
- gchar* filename;
- gchar* rem_path = rel_path;
- gchar* sel_text;
-@@ -2125,10 +2160,8 @@
- g_assert (cmpl_state->reference_dir);
-
- dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list)));
-- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list)));
-
- gtk_list_store_clear (dir_model);
-- gtk_list_store_clear (file_model);
-
- /* Set the dir list to include ./ and ../ */
- gtk_list_store_append (dir_model, &iter);
-@@ -2150,13 +2183,17 @@
- strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0)
- {
- gtk_list_store_append (dir_model, &iter);
-- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1);
-+ gtk_list_store_set (dir_model, &iter,
-+ DIR_COLUMN, filename,
-+ ISFILE_COLUMN, FALSE, -1);
- }
- }
- else
- {
-- gtk_list_store_append (file_model, &iter);
-- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1);
-+ gtk_list_store_append (dir_model, &iter);
-+ gtk_list_store_set (dir_model, &iter,
-+ DIR_COLUMN, filename,
-+ ISFILE_COLUMN, TRUE, -1);
- }
- }
-
diff --git a/package/libgtk2/old_patches/spinbutton.patch b/package/libgtk2/old_patches/spinbutton.patch
deleted file mode 100644
index c26dc6d..0000000
--- a/package/libgtk2/old_patches/spinbutton.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Index: gtk+-2.10.6/gtk/gtkspinbutton.c
-===================================================================
---- gtk+-2.10.6.orig/gtk/gtkspinbutton.c
-+++ gtk+-2.10.6/gtk/gtkspinbutton.c
-@@ -682,7 +682,7 @@ gtk_spin_button_size_allocate (GtkWidget
-
- spin = GTK_SPIN_BUTTON (widget);
- arrow_size = spin_button_get_arrow_size (spin);
-- panel_width = arrow_size + 2 * widget->style->xthickness;
-+ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness;
-
- widget->allocation = *allocation;
-
-@@ -815,19 +815,16 @@ gtk_spin_button_draw_arrow (GtkSpinButto
- {
- width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness;
-
-+ y = widget->style->ythickness;
-+ height = widget->requisition.height - (2 * y);
-+
- if (arrow_type == GTK_ARROW_UP)
- {
- x = 0;
-- y = 0;
--
-- height = widget->requisition.height / 2;
- }
- else
- {
-- x = 0;
-- y = widget->requisition.height / 2;
--
-- height = (widget->requisition.height + 1) / 2;
-+ x = width;
- }
-
- if (spin_button_at_limit (spin_button, arrow_type))
-@@ -857,32 +854,17 @@ gtk_spin_button_draw_arrow (GtkSpinButto
- shadow_type = GTK_SHADOW_OUT;
- }
- }
--
-+
- gtk_paint_box (widget->style, spin_button->panel,
- state_type, shadow_type,
- NULL, widget,
-- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down",
-+ NULL,
- x, y, width, height);
-
- height = widget->requisition.height;
-
-- if (arrow_type == GTK_ARROW_DOWN)
-- {
-- y = height / 2;
-- height = height - y - 2;
-- }
-- else
-- {
-- y = 2;
-- height = height / 2 - 2;
-- }
--
- width -= 3;
--
-- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-- x = 2;
-- else
-- x = 1;
-+ height -= 3;
-
- w = width / 2;
- w -= w % 2 - 1; /* force odd */
-@@ -1062,7 +1044,7 @@ gtk_spin_button_button_press (GtkWidget
- if (GTK_ENTRY (widget)->editable)
- gtk_spin_button_update (spin);
-
-- if (event->y <= widget->requisition.height / 2)
-+ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness))
- {
- if (event->button == 1)
- start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment);
-@@ -1097,44 +1079,11 @@ gtk_spin_button_button_release (GtkWidge
-
- arrow_size = spin_button_get_arrow_size (spin);
-
-- if (event->button == spin->button)
-- {
-- int click_child = spin->click_child;
-+ gtk_spin_button_stop_spinning (spin);
-
-- gtk_spin_button_stop_spinning (spin);
--
-- if (event->button == 3)
-- {
-- if (event->y >= 0 && event->x >= 0 &&
-- event->y <= widget->requisition.height &&
-- event->x <= arrow_size + 2 * widget->style->xthickness)
-- {
-- if (click_child == GTK_ARROW_UP &&
-- event->y <= widget->requisition.height / 2)
-- {
-- gdouble diff;
--
-- diff = spin->adjustment->upper - spin->adjustment->value;
-- if (diff > EPSILON)
-- gtk_spin_button_real_spin (spin, diff);
-- }
-- else if (click_child == GTK_ARROW_DOWN &&
-- event->y > widget->requisition.height / 2)
-- {
-- gdouble diff;
--
-- diff = spin->adjustment->value - spin->adjustment->lower;
-- if (diff > EPSILON)
-- gtk_spin_button_real_spin (spin, -diff);
-- }
-- }
-- }
-- spin_button_redraw (spin);
-+ spin_button_redraw (spin);
-
-- return TRUE;
-- }
-- else
-- return GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->button_release_event (widget, event);
-+ return TRUE;
- }
-
- static gint
diff --git a/package/libgtk2/old_patches/xsettings.patch b/package/libgtk2/old_patches/xsettings.patch
deleted file mode 100644
index b63e262..0000000
--- a/package/libgtk2/old_patches/xsettings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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