gtk+: upgrade to 2.24.25
Remove patches that are no longer needed: * GtkButton-do-no-prelight: merged upstream * Duplicate-the-exec-string: upstream decided this behaviour is incorrect * cellrenderer-cairo: Cairo isn't the performance bottleneck it once was, drop * configure-nm: resolved upstrea * configurefix.patch: not applied * run-iconcache: not needed when building tarballs, and if gtk-update-icon-cache is needed at build time (e.g. user is customising default icon theme) then they can add a dependency on gtk-update-icon-cache-native. Also remove mention of patches that have been commented out for a long time. (From OE-Core rev: 9299b5d2e5f82cf0e3f66ca49dedbe2c8b18bb44) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
Richard Purdie
parent
db8bf52277
commit
9e64b6d96c
|
|
@ -1,48 +0,0 @@
|
|||
From d1f7a894674dfdd6769f1bbae31eb1a69e451a5c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 16 Nov 2012 22:07:28 +0100
|
||||
Subject: [PATCH] GtkButton: do not prelight in touchscreen mode
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Code was copied from GtkToggleButton.
|
||||
|
||||
Upstream-Status: submitted [1]
|
||||
|
||||
[1] https://bugzilla.gnome.org/show_bug.cgi?id=689138
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
gtk/gtkbutton.c | 8 ++++++--
|
||||
1 files changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
|
||||
index f472007..1beb1b6 100644
|
||||
--- a/gtk/gtkbutton.c
|
||||
+++ b/gtk/gtkbutton.c
|
||||
@@ -2079,15 +2079,19 @@ _gtk_button_set_depressed (GtkButton *button,
|
||||
static void
|
||||
gtk_button_update_state (GtkButton *button)
|
||||
{
|
||||
- gboolean depressed;
|
||||
+ gboolean depressed, touchscreen;
|
||||
GtkStateType new_state;
|
||||
|
||||
+ g_object_get (gtk_widget_get_settings (GTK_WIDGET (button)),
|
||||
+ "gtk-touchscreen-mode", &touchscreen,
|
||||
+ NULL);
|
||||
+
|
||||
if (button->activate_timeout)
|
||||
depressed = button->depress_on_activate;
|
||||
else
|
||||
depressed = button->in_button && button->button_down;
|
||||
|
||||
- if (button->in_button && (!button->button_down || !depressed))
|
||||
+ if (!touchscreen && button->in_button && (!button->button_down || !depressed))
|
||||
new_state = GTK_STATE_PRELIGHT;
|
||||
else
|
||||
new_state = depressed ? GTK_STATE_ACTIVE : GTK_STATE_NORMAL;
|
||||
--
|
||||
1.7.6.5
|
||||
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From 69b9441eab2a7215509687dc22b48b6f212d22aa Mon Sep 17 00:00:00 2001
|
||||
From: Rob Bradford <rob@linux.intel.com>
|
||||
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
|
||||
|
||||
Index: gtk+-2.21.2/gtk/gtkrecentmanager.c
|
||||
===================================================================
|
||||
--- gtk+-2.21.2.orig/gtk/gtkrecentmanager.c 2010-06-22 18:11:30.000000000 +0800
|
||||
+++ gtk+-2.21.2/gtk/gtkrecentmanager.c 2010-06-22 18:11:53.000000000 +0800
|
||||
@@ -1766,7 +1766,7 @@
|
||||
}
|
||||
|
||||
if (app_exec)
|
||||
- *app_exec = ai->exec;
|
||||
+ *app_exec = g_strdup (ai->exec);
|
||||
|
||||
if (count)
|
||||
*count = ai->count;
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
Index: gtk/gtkcellrenderer.c
|
||||
===================================================================
|
||||
--- gtk/gtkcellrenderer.c.orig 2010-06-22 17:21:22.000000000 +0800
|
||||
+++ gtk/gtkcellrenderer.c 2010-06-22 17:21:25.000000000 +0800
|
||||
@@ -566,6 +566,7 @@
|
||||
|
||||
if (cell->cell_background_set && !selected)
|
||||
{
|
||||
+#ifdef USE_CAIRO_INTERNALLY
|
||||
cairo_t *cr = gdk_cairo_create (window);
|
||||
|
||||
gdk_cairo_rectangle (cr, background_area);
|
||||
@@ -573,6 +574,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,
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
Upstream-Status: Pending
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=671515
|
||||
|
||||
Signed-Off-By: Xiaofeng Yan <xiaofeng.yan@windriver.com>
|
||||
# Pick up ${NM} from the environment
|
||||
|
||||
Updated to apply to gtk+-2.24.15
|
||||
|
||||
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
|
||||
diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac
|
||||
--- gtk+-2.24.15/configure.ac 2013-01-12 20:52:54.000000000 +0200
|
||||
+++ gtk+-2.24.15/configure.ac 2013-02-12 21:25:06.073937041 +0200
|
||||
@@ -190,7 +190,7 @@
|
||||
AC_SYS_LARGEFILE
|
||||
|
||||
AM_PROG_AS
|
||||
-AC_PATH_PROG(NM, nm, nm)
|
||||
+AC_CHECK_TOOLS(NM, [$NM nm], nm)
|
||||
|
||||
dnl Initialize maintainer mode
|
||||
AM_MAINTAINER_MODE([enable])
|
||||
|
|
@ -1,87 +0,0 @@
|
|||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Index: gtk+-2.21.2/docs/faq/Makefile.am
|
||||
===================================================================
|
||||
--- gtk+-2.21.2.orig/docs/faq/Makefile.am 2010-04-09 10:29:53.000000000 +0800
|
||||
+++ gtk+-2.21.2/docs/faq/Makefile.am 2010-06-22 17:39:24.000000000 +0800
|
||||
@@ -3,34 +3,36 @@
|
||||
EXTRA_DIST += \
|
||||
gtk-faq.sgml
|
||||
|
||||
-if HAVE_DOCBOOK
|
||||
+
|
||||
html:
|
||||
+if HAVE_DOCBOOK
|
||||
if test -w $(srcdir); then \
|
||||
(cd $(srcdir); \
|
||||
db2html gtk-faq.sgml; \
|
||||
test -d html && rm -r html; \
|
||||
mv gtk-faq html); \
|
||||
fi
|
||||
-
|
||||
-pdf:
|
||||
- if test -w $(srcdir); then \
|
||||
- (cd $(srcdir); db2pdf gtk-faq.sgml); \
|
||||
- fi
|
||||
-
|
||||
-dist-hook: html
|
||||
- cp -Rp $(srcdir)/html $(distdir)
|
||||
else
|
||||
-html:
|
||||
echo "***"
|
||||
echo "*** Warning: FAQ not built"
|
||||
echo "***"
|
||||
+endif
|
||||
|
||||
pdf:
|
||||
+if HAVE_DOCBOOK
|
||||
+ if test -w $(srcdir); then \
|
||||
+ (cd $(srcdir); db2pdf gtk-faq.sgml); \
|
||||
+ fi
|
||||
+else
|
||||
echo "***"
|
||||
echo "*** Warning: FAQ not built"
|
||||
echo "***"
|
||||
+endif
|
||||
|
||||
-dist-hook:
|
||||
+dist-hook: html
|
||||
+if HAVE_DOCBOOK
|
||||
+ cp -Rp $(srcdir)/html $(distdir)
|
||||
+else
|
||||
echo "***"
|
||||
echo "*** Warning: FAQ not built"
|
||||
echo "*** DISTRIBUTION IS INCOMPLETE"
|
||||
Index: gtk+-2.21.2/gtk-doc.make
|
||||
===================================================================
|
||||
--- gtk+-2.21.2.orig/gtk-doc.make 2010-05-28 00:01:48.000000000 +0800
|
||||
+++ gtk+-2.21.2/gtk-doc.make 2010-06-22 17:39:24.000000000 +0800
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
|
||||
|
||||
-EXTRA_DIST = \
|
||||
+EXTRA_DIST += \
|
||||
$(content_files) \
|
||||
$(HTML_IMAGES) \
|
||||
$(DOC_MAIN_SGML_FILE) \
|
||||
Index: gtk+-2.21.2/gtk/tests/Makefile.am
|
||||
===================================================================
|
||||
--- gtk+-2.21.2.orig/gtk/tests/Makefile.am 2010-06-10 20:53:46.000000000 +0800
|
||||
+++ gtk+-2.21.2/gtk/tests/Makefile.am 2010-06-22 17:39:24.000000000 +0800
|
||||
@@ -58,13 +58,13 @@
|
||||
# this doesn't work in make distcheck, since running
|
||||
# on a naked X server creates slightly different event
|
||||
# sequences than running on a normal desktop
|
||||
-# TEST_PROGS += crossingevents
|
||||
+#TEST_PROGS += crossingevents
|
||||
crossingevents_SOURCES = crossingevents.c
|
||||
crossingevents_LDADD = $(progs_ldadd)
|
||||
|
||||
# this doesn't work in make distcheck, since it doesn't
|
||||
# find file-chooser-test-dir
|
||||
-# TEST_PROGS += filechooser
|
||||
+#TEST_PROGS += filechooser
|
||||
filechooser_SOURCES = filechooser.c pixbuf-init.c
|
||||
filechooser_LDADD = $(progs_ldadd)
|
||||
|
||||
|
|
@ -1,105 +0,0 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
Index: gtk/gtkentry.c
|
||||
===================================================================
|
||||
RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
|
||||
retrieving revision 1.317
|
||||
diff -u -r1.317 gtkentry.c
|
||||
--- gtk/gtkentry.c 29 Jun 2006 09:18:05 -0000 1.317
|
||||
+++ gtk/gtkentry.c 2 Jul 2006 14:14:24 -0000
|
||||
@@ -3337,7 +3337,9 @@
|
||||
if (GTK_WIDGET_DRAWABLE (entry))
|
||||
{
|
||||
PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE);
|
||||
+#ifdef USE_CAIRO_INTERNALLY
|
||||
cairo_t *cr;
|
||||
+#endif
|
||||
gint x, y;
|
||||
gint start_pos, end_pos;
|
||||
|
||||
@@ -3345,23 +3347,35 @@
|
||||
|
||||
get_layout_position (entry, &x, &y);
|
||||
|
||||
+#ifdef USE_CAIRO_INTERNALLY
|
||||
cr = gdk_cairo_create (entry->text_area);
|
||||
|
||||
cairo_move_to (cr, x, y);
|
||||
gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]);
|
||||
pango_cairo_show_layout (cr, layout);
|
||||
+#else
|
||||
+ gdk_draw_layout (entry->text_area, widget->style->text_gc [widget->state],
|
||||
+ x, y,
|
||||
+ layout);
|
||||
+#endif
|
||||
|
||||
if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos))
|
||||
{
|
||||
gint *ranges;
|
||||
gint n_ranges, i;
|
||||
PangoRectangle logical_rect;
|
||||
- GdkColor *selection_color, *text_color;
|
||||
GtkBorder inner_border;
|
||||
+#ifdef USE_CAIRO_INTERNALLY
|
||||
+ GdkColor *selection_color, *text_color;
|
||||
+#else
|
||||
+ GdkGC *selection_gc, *text_gc;
|
||||
+ GdkRegion *clip_region;
|
||||
+#endif
|
||||
|
||||
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
|
||||
gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges);
|
||||
|
||||
+#ifdef USE_CAIRO_INTERNALLY
|
||||
if (GTK_WIDGET_HAS_FOCUS (entry))
|
||||
{
|
||||
selection_color = &widget->style->base [GTK_STATE_SELECTED];
|
||||
@@ -3390,11 +3404,46 @@
|
||||
cairo_move_to (cr, x, y);
|
||||
gdk_cairo_set_source_color (cr, text_color);
|
||||
pango_cairo_show_layout (cr, layout);
|
||||
-
|
||||
+#else
|
||||
+ if (GTK_WIDGET_HAS_FOCUS (entry))
|
||||
+ {
|
||||
+ selection_gc = widget->style->base_gc [GTK_STATE_SELECTED];
|
||||
+ text_gc = widget->style->text_gc [GTK_STATE_SELECTED];
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ selection_gc = widget->style->base_gc [GTK_STATE_ACTIVE];
|
||||
+ text_gc = widget->style->text_gc [GTK_STATE_ACTIVE];
|
||||
+ }
|
||||
+
|
||||
+ clip_region = gdk_region_new ();
|
||||
+ for (i = 0; i < n_ranges; ++i)
|
||||
+ {
|
||||
+ GdkRectangle rect;
|
||||
+
|
||||
+ rect.x = inner_border.left - entry->scroll_offset + ranges[2 * i];
|
||||
+ rect.y = y;
|
||||
+ rect.width = ranges[2 * i + 1];
|
||||
+ rect.height = logical_rect.height;
|
||||
+
|
||||
+ gdk_draw_rectangle (entry->text_area, selection_gc, TRUE,
|
||||
+ rect.x, rect.y, rect.width, rect.height);
|
||||
+
|
||||
+ gdk_region_union_with_rect (clip_region, &rect);
|
||||
+ }
|
||||
+
|
||||
+ gdk_gc_set_clip_region (text_gc, clip_region);
|
||||
+ gdk_draw_layout (entry->text_area, text_gc,
|
||||
+ x, y,
|
||||
+ layout);
|
||||
+ gdk_gc_set_clip_region (text_gc, NULL);
|
||||
+ gdk_region_destroy (clip_region);
|
||||
+#endif
|
||||
g_free (ranges);
|
||||
}
|
||||
-
|
||||
+#ifdef USE_CAIRO_INTERNALLY
|
||||
cairo_destroy (cr);
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
diff -Nurd gtk+-2.24.24/gtk/Makefile.am gtk+-2.24.24/gtk/Makefile.am
|
||||
--- gtk+-2.24.24/gtk/Makefile.am 2014-06-23 18:08:14.000000000 +0300
|
||||
+++ gtk+-2.24.24/gtk/Makefile.am 2014-09-03 23:45:12.669307700 +0300
|
||||
@@ -1391,12 +1391,12 @@
|
||||
./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 \
|
||||
- --include-image-data \
|
||||
- --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 \
|
||||
+# --include-image-data \
|
||||
+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
|
||||
+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h
|
||||
|
||||
EXTRA_DIST += \
|
||||
$(STOCK_ICONS) \
|
||||
|
|
@ -6,30 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
|
|||
file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
|
||||
SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
|
||||
file://xsettings.patch \
|
||||
file://run-iconcache.patch \
|
||||
file://configure-nm.patch \
|
||||
file://hardcoded_libtool.patch \
|
||||
file://cellrenderer-cairo.patch;striplevel=0 \
|
||||
file://toggle-font.diff;striplevel=0 \
|
||||
file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch \
|
||||
file://doc-fixes.patch \
|
||||
file://0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch \
|
||||
"
|
||||
|
||||
# TO MERGE
|
||||
# file://entry-cairo.patch;striplevel=0
|
||||
# file://filesystem-volumes.patch
|
||||
# file://filechooser-props.patch
|
||||
# file://filechooser-default.patch
|
||||
# file://filechooser-sizefix.patch
|
||||
# temporary
|
||||
# file://gtklabel-resize-patch
|
||||
# file://menu-deactivate.patch
|
||||
# file://combo-arrow-size.patch;striplevel=0
|
||||
# file://configurefix.patch
|
||||
|
||||
SRC_URI[md5sum] = "f80ac8aa95ea8482ad89656d0370752e"
|
||||
SRC_URI[sha256sum] = "12ceb2e198c82bfb93eb36348b6e9293c8fdcd60786763d04cfec7ebe7ed3d6d"
|
||||
SRC_URI[md5sum] = "612350704dd3aacb95355a4981930c6f"
|
||||
SRC_URI[sha256sum] = "38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3"
|
||||
|
||||
EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
|
||||
|
||||
Loading…
Reference in New Issue