gtk+: Update to 2.20.1
gtk+ previously has 2 versions: 2.14.2(preferred), and 2.18.5(latest). This upgrade is from 2.18.5 to 2.20.1, so some patch(like entry-cairo.patch) in 2.14.2 is abandoned. Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
This commit is contained in:
parent
b64111f53b
commit
0e7e3ae68a
|
@ -13,7 +13,7 @@ PREFERRED_VERSION_glib-2.0-native ?= "2.24.1"
|
|||
PREFERRED_VERSION_atk ?= "1.24.0"
|
||||
PREFERRED_VERSION_cairo ?= "1.8.10"
|
||||
PREFERRED_VERSION_pango ?= "1.28.0"
|
||||
PREFERRED_VERSION_gtk+ ?= "2.14.2"
|
||||
PREFERRED_VERSION_gtk+ ?= "2.20.1"
|
||||
|
||||
PREFERRED_VERSION_librsvg ?= "2.26.3"
|
||||
|
||||
|
|
|
@ -1,32 +0,0 @@
|
|||
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,
|
|
@ -1,31 +0,0 @@
|
|||
Index: gtk+-2.14.2/configure.in
|
||||
===================================================================
|
||||
--- gtk+-2.14.2.orig/configure.in 2008-09-23 15:52:44.000000000 +0100
|
||||
+++ gtk+-2.14.2/configure.in 2008-09-23 15:53:51.000000000 +0100
|
||||
@@ -401,7 +401,7 @@
|
||||
case $enable_explicit_deps in
|
||||
auto)
|
||||
export SED
|
||||
- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
|
||||
+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
|
||||
if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
|
||||
enable_explicit_deps=yes
|
||||
else
|
||||
@@ -759,7 +759,7 @@
|
||||
dnl Now we check to see if our libtool supports shared lib deps
|
||||
dnl (in a rather ugly way even)
|
||||
if $dynworks; then
|
||||
- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
|
||||
+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
|
||||
pixbuf_deplibs_check=`$pixbuf_libtool_config | \
|
||||
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
|
||||
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
|
||||
@@ -1893,7 +1893,7 @@
|
||||
# We are using gmodule-no-export now, but I'm leaving the stripping
|
||||
# code in place for now, since pango and atk still require gmodule.
|
||||
export SED
|
||||
-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
||||
+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
||||
if test -n "$export_dynamic"; then
|
||||
GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
|
||||
GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
|
|
@ -1,19 +0,0 @@
|
|||
--- /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) \
|
|
@ -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
|
|
@ -1,31 +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(-)
|
||||
|
||||
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
|
||||
|
|
@ -1,97 +0,0 @@
|
|||
Index: gtk+-2.14.2/configure.in
|
||||
===================================================================
|
||||
--- gtk+-2.14.2.orig/configure.in 2008-09-23 16:32:42.000000000 +0100
|
||||
+++ gtk+-2.14.2/configure.in 2008-09-23 16:37:13.000000000 +0100
|
||||
@@ -1025,48 +1025,50 @@
|
||||
# check one of the variables here
|
||||
AM_CONDITIONAL(INCLUDE_GDIPLUS, [test x"$INCLUDE_gdip_ico" = xyes])
|
||||
|
||||
-if test x$gio_can_sniff = x; then
|
||||
- AC_MSG_CHECKING([if gio can sniff png])
|
||||
- gtk_save_LIBS="$LIBS"
|
||||
- gtk_save_CFLAGS="$CFLAGS"
|
||||
- LIBS="`$PKG_CONFIG --libs gio-2.0`"
|
||||
- CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
|
||||
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||
- #include <gio/gio.h>
|
||||
- static const gsize data_size = 159;
|
||||
- static const guint8 data[] =
|
||||
- {
|
||||
- 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
|
||||
- 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
|
||||
- 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
|
||||
- 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
|
||||
- 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
|
||||
- 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
|
||||
- 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
|
||||
- 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
|
||||
- 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
|
||||
- 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
|
||||
- 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
|
||||
- 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
|
||||
- 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
|
||||
- 0x42, 0x60, 0x82
|
||||
- };
|
||||
- int
|
||||
- main (int argc, char **argv)
|
||||
- {
|
||||
- char *content_type;
|
||||
- char *image_png;
|
||||
- content_type = g_content_type_guess (NULL, data, data_size, NULL);
|
||||
- image_png = g_content_type_from_mime_type ("image/png");
|
||||
- return !!strcmp (content_type, image_png);
|
||||
- }]])],
|
||||
- [gio_can_sniff=yes
|
||||
- AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])],
|
||||
- [gio_can_sniff=no])
|
||||
- AC_MSG_RESULT($gio_can_sniff)
|
||||
- LIBS="$gtk_save_LIBS"
|
||||
- CFLAGS="$gtk_save_CFLAGS"
|
||||
-fi
|
||||
+# Disabled due to cross-compile
|
||||
+#if test x$gio_can_sniff = x; then
|
||||
+# AC_MSG_CHECKING([if gio can sniff png])
|
||||
+# gtk_save_LIBS="$LIBS"
|
||||
+# gtk_save_CFLAGS="$CFLAGS"
|
||||
+# LIBS="`$PKG_CONFIG --libs gio-2.0`"
|
||||
+# CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
|
||||
+# AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||
+# #include <gio/gio.h>
|
||||
+# static const gsize data_size = 159;
|
||||
+# static const guint8 data[] =
|
||||
+# {
|
||||
+# 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
|
||||
+# 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
|
||||
+# 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
|
||||
+# 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
|
||||
+# 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
|
||||
+# 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
|
||||
+# 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
|
||||
+# 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
|
||||
+# 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
|
||||
+# 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
|
||||
+# 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
|
||||
+# 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
|
||||
+# 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
|
||||
+# 0x42, 0x60, 0x82
|
||||
+# };
|
||||
+# int
|
||||
+# main (int argc, char **argv)
|
||||
+# {
|
||||
+# char *content_type;
|
||||
+# char *image_png;
|
||||
+# content_type = g_content_type_guess (NULL, data, data_size, NULL);
|
||||
+# image_png = g_content_type_from_mime_type ("image/png");
|
||||
+# return !!strcmp (content_type, image_png);
|
||||
+# }]])],
|
||||
+# [gio_can_sniff=yes
|
||||
+# [gio_can_sniff=no])
|
||||
+# AC_MSG_RESULT($gio_can_sniff)
|
||||
+# LIBS="$gtk_save_LIBS"
|
||||
+# CFLAGS="$gtk_save_CFLAGS"
|
||||
+#fi
|
||||
+
|
||||
+AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])],
|
||||
|
||||
#
|
||||
# Allow building some or all immodules included
|
|
@ -1,103 +0,0 @@
|
|||
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,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
|
|
@ -1,100 +0,0 @@
|
|||
Index: gtk/gtkcellrenderertoggle.c
|
||||
===================================================================
|
||||
--- gtk/gtkcellrenderertoggle.c (revision 18523)
|
||||
+++ gtk/gtkcellrenderertoggle.c (working copy)
|
||||
@@ -71,6 +71,8 @@
|
||||
PROP_INDICATOR_SIZE
|
||||
};
|
||||
|
||||
+/* This is a hard-coded default which promptly gets overridden by a size
|
||||
+ calculated from the font size. */
|
||||
#define TOGGLE_WIDTH 13
|
||||
|
||||
static guint toggle_cell_signals[LAST_SIGNAL] = { 0 };
|
||||
@@ -80,8 +82,9 @@
|
||||
typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate;
|
||||
struct _GtkCellRendererTogglePrivate
|
||||
{
|
||||
- gint indicator_size;
|
||||
-
|
||||
+ gint indicator_size; /* This is the real size */
|
||||
+ gint override_size; /* This is the size set from the indicator-size property */
|
||||
+ GtkWidget *cached_widget;
|
||||
guint inconsistent : 1;
|
||||
};
|
||||
|
||||
@@ -104,6 +107,7 @@
|
||||
GTK_CELL_RENDERER (celltoggle)->ypad = 2;
|
||||
|
||||
priv->indicator_size = TOGGLE_WIDTH;
|
||||
+ priv->override_size = 0;
|
||||
priv->inconsistent = FALSE;
|
||||
}
|
||||
|
||||
@@ -210,7 +214,7 @@
|
||||
g_value_set_boolean (value, celltoggle->radio);
|
||||
break;
|
||||
case PROP_INDICATOR_SIZE:
|
||||
- g_value_set_int (value, priv->indicator_size);
|
||||
+ g_value_set_int (value, priv->override_size ? priv->override_size : priv->indicator_size);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
|
||||
@@ -245,7 +249,7 @@
|
||||
celltoggle->radio = g_value_get_boolean (value);
|
||||
break;
|
||||
case PROP_INDICATOR_SIZE:
|
||||
- priv->indicator_size = g_value_get_int (value);
|
||||
+ priv->override_size = g_value_get_int (value);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
|
||||
@@ -273,6 +277,27 @@
|
||||
}
|
||||
|
||||
static void
|
||||
+on_widget_style_set (GtkWidget *widget, GtkStyle *previous, gpointer user_data)
|
||||
+{
|
||||
+ GtkCellRendererTogglePrivate *priv = user_data;
|
||||
+ PangoContext *context;
|
||||
+ PangoFontMetrics *metrics;
|
||||
+ int height;
|
||||
+
|
||||
+ context = gtk_widget_get_pango_context (widget);
|
||||
+ metrics = pango_context_get_metrics (context,
|
||||
+ widget->style->font_desc,
|
||||
+ pango_context_get_language (context));
|
||||
+
|
||||
+ height = pango_font_metrics_get_ascent (metrics) +
|
||||
+ pango_font_metrics_get_descent (metrics);
|
||||
+
|
||||
+ pango_font_metrics_unref (metrics);
|
||||
+
|
||||
+ priv->indicator_size = PANGO_PIXELS (height * 0.85);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
|
||||
GtkWidget *widget,
|
||||
GdkRectangle *cell_area,
|
||||
@@ -287,6 +312,20 @@
|
||||
|
||||
priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell);
|
||||
|
||||
+ if (priv->override_size) {
|
||||
+ priv->indicator_size = priv->override_size;
|
||||
+ } else if (priv->cached_widget != widget) {
|
||||
+ if (priv->cached_widget) {
|
||||
+ g_object_remove_weak_pointer (widget, &priv->cached_widget);
|
||||
+ g_signal_handlers_disconnect_by_func (priv->cached_widget, on_widget_style_set, priv);
|
||||
+ }
|
||||
+ priv->cached_widget = widget;
|
||||
+ g_object_add_weak_pointer (widget, &priv->cached_widget);
|
||||
+ g_signal_connect (widget, "style-set", on_widget_style_set, priv);
|
||||
+
|
||||
+ on_widget_style_set (widget, NULL, priv);
|
||||
+ }
|
||||
+
|
||||
calc_width = (gint) cell->xpad * 2 + priv->indicator_size;
|
||||
calc_height = (gint) cell->ypad * 2 + priv->indicator_size;
|
||||
|
|
@ -13,11 +13,11 @@ since the internal value is returned without being duplicated.
|
|||
gtk/gtkrecentmanager.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
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,
|
||||
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)
|
||||
|
@ -26,6 +26,3 @@ index 317b3d5..d062572 100644
|
|||
|
||||
if (count)
|
||||
*count = ai->count;
|
||||
--
|
||||
1.6.3.1
|
||||
|
|
@ -1,11 +1,8 @@
|
|||
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 @@
|
||||
--- 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)
|
||||
{
|
||||
|
@ -13,7 +10,7 @@ diff -u -r1.55 gtkcellrenderer.c
|
|||
cairo_t *cr = gdk_cairo_create (window);
|
||||
|
||||
gdk_cairo_rectangle (cr, background_area);
|
||||
@@ -558,6 +559,16 @@
|
||||
@@ -573,6 +574,16 @@
|
||||
cairo_fill (cr);
|
||||
|
||||
cairo_destroy (cr);
|
|
@ -1,7 +1,7 @@
|
|||
Index: gtk+-2.18.5/docs/faq/Makefile.am
|
||||
Index: gtk+-2.21.2/docs/faq/Makefile.am
|
||||
===================================================================
|
||||
--- gtk+-2.18.5.orig/docs/faq/Makefile.am 2009-12-10 17:38:18.000000000 +0000
|
||||
+++ gtk+-2.18.5/docs/faq/Makefile.am 2009-12-10 17:39:27.000000000 +0000
|
||||
--- 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
|
||||
|
@ -50,10 +50,10 @@ Index: gtk+-2.18.5/docs/faq/Makefile.am
|
|||
echo "***"
|
||||
echo "*** Warning: FAQ not built"
|
||||
echo "*** DISTRIBUTION IS INCOMPLETE"
|
||||
Index: gtk+-2.18.5/gtk-doc.make
|
||||
Index: gtk+-2.21.2/gtk-doc.make
|
||||
===================================================================
|
||||
--- gtk+-2.18.5.orig/gtk-doc.make 2009-12-10 17:47:54.000000000 +0000
|
||||
+++ gtk+-2.18.5/gtk-doc.make 2009-12-10 17:48:01.000000000 +0000
|
||||
--- 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)
|
||||
|
@ -63,11 +63,11 @@ Index: gtk+-2.18.5/gtk-doc.make
|
|||
$(content_files) \
|
||||
$(HTML_IMAGES) \
|
||||
$(DOC_MAIN_SGML_FILE) \
|
||||
Index: gtk+-2.18.5/gtk/tests/Makefile.am
|
||||
Index: gtk+-2.21.2/gtk/tests/Makefile.am
|
||||
===================================================================
|
||||
--- gtk+-2.18.5.orig/gtk/tests/Makefile.am 2009-12-10 17:43:16.000000000 +0000
|
||||
+++ gtk+-2.18.5/gtk/tests/Makefile.am 2009-12-10 18:11:40.000000000 +0000
|
||||
@@ -57,13 +57,13 @@
|
||||
--- 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
|
||||
|
@ -83,16 +83,3 @@ Index: gtk+-2.18.5/gtk/tests/Makefile.am
|
|||
filechooser_SOURCES = filechooser.c pixbuf-init.c
|
||||
filechooser_LDADD = $(progs_ldadd)
|
||||
|
||||
Index: gtk+-2.18.5/tests/Makefile.am
|
||||
===================================================================
|
||||
--- gtk+-2.18.5.orig/tests/Makefile.am 2009-12-10 17:41:49.000000000 +0000
|
||||
+++ gtk+-2.18.5/tests/Makefile.am 2009-12-10 17:45:33.000000000 +0000
|
||||
@@ -339,7 +339,7 @@
|
||||
gtkoffscreenbox.h \
|
||||
testoffscreen.c
|
||||
|
||||
-testwindow_SOURCES = \
|
||||
+testwindows_SOURCES = \
|
||||
testwindows.c
|
||||
|
||||
EXTRA_DIST += \
|
|
@ -1,8 +1,8 @@
|
|||
Index: gtk+-2.14.2/configure.in
|
||||
Index: gtk+-2.21.2/configure.in
|
||||
===================================================================
|
||||
--- gtk+-2.14.2.orig/configure.in 2008-09-23 16:32:42.000000000 +0100
|
||||
+++ gtk+-2.14.2/configure.in 2008-09-23 16:37:13.000000000 +0100
|
||||
@@ -1025,48 +1025,50 @@
|
||||
--- gtk+-2.21.2.orig/configure.in 2010-06-22 18:14:40.000000000 +0800
|
||||
+++ gtk+-2.21.2/configure.in 2010-06-22 18:14:58.000000000 +0800
|
||||
@@ -1072,48 +1072,50 @@
|
||||
# check one of the variables here
|
||||
AM_CONDITIONAL(INCLUDE_GDIPLUS, [test x"$INCLUDE_gdip_ico" = xyes])
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
Index: gtk+-2.14.2/configure.in
|
||||
Index: gtk+-2.21.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 @@
|
||||
--- gtk+-2.21.2.orig/configure.in 2010-06-22 17:21:41.000000000 +0800
|
||||
+++ gtk+-2.21.2/configure.in 2010-06-22 17:28:59.000000000 +0800
|
||||
@@ -425,7 +425,7 @@
|
||||
case $enable_explicit_deps in
|
||||
auto)
|
||||
export SED
|
||||
|
@ -11,7 +11,7 @@ Index: gtk+-2.14.2/configure.in
|
|||
if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
|
||||
enable_explicit_deps=yes
|
||||
else
|
||||
@@ -759,7 +759,7 @@
|
||||
@@ -804,7 +804,7 @@
|
||||
dnl Now we check to see if our libtool supports shared lib deps
|
||||
dnl (in a rather ugly way even)
|
||||
if $dynworks; then
|
||||
|
@ -20,7 +20,7 @@ Index: gtk+-2.14.2/configure.in
|
|||
pixbuf_deplibs_check=`$pixbuf_libtool_config | \
|
||||
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
|
||||
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
|
||||
@@ -1893,7 +1893,7 @@
|
||||
@@ -1974,7 +1974,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
|
|
@ -1,8 +1,8 @@
|
|||
Index: gtk+-2.18.5/gtk/Makefile.am
|
||||
Index: gtk+-2.21.2/gtk/Makefile.am
|
||||
===================================================================
|
||||
--- gtk+-2.18.5.orig/gtk/Makefile.am 2009-12-08 15:12:46.000000000 +0000
|
||||
+++ gtk+-2.18.5/gtk/Makefile.am 2009-12-10 17:31:46.000000000 +0000
|
||||
@@ -1300,11 +1300,11 @@
|
||||
--- gtk+-2.21.2.orig/gtk/Makefile.am 2010-06-22 17:21:41.000000000 +0800
|
||||
+++ gtk+-2.21.2/gtk/Makefile.am 2010-06-22 17:28:12.000000000 +0800
|
||||
@@ -1376,11 +1376,11 @@
|
||||
./gtk-update-icon-cache
|
||||
endif
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
Index: gtk/gtkcellrenderertoggle.c
|
||||
===================================================================
|
||||
--- gtk/gtkcellrenderertoggle.c (revision 18523)
|
||||
+++ gtk/gtkcellrenderertoggle.c (working copy)
|
||||
--- gtk/gtkcellrenderertoggle.c.orig 2010-06-22 18:11:33.000000000 +0800
|
||||
+++ gtk/gtkcellrenderertoggle.c 2010-06-22 18:11:43.000000000 +0800
|
||||
@@ -71,6 +71,8 @@
|
||||
PROP_INDICATOR_SIZE
|
||||
};
|
|
@ -1,6 +1,8 @@
|
|||
--- 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 @@
|
||||
Index: gtk+-2.21.2/gdk/x11/gdkevents-x11.c
|
||||
===================================================================
|
||||
--- gtk+-2.21.2.orig/gdk/x11/gdkevents-x11.c 2010-06-22 17:28:04.000000000 +0800
|
||||
+++ gtk+-2.21.2/gdk/x11/gdkevents-x11.c 2010-06-22 17:28:06.000000000 +0800
|
||||
@@ -3062,10 +3062,9 @@
|
||||
{
|
||||
GdkScreenX11 *screen = data;
|
||||
|
||||
|
@ -13,4 +15,4 @@
|
|||
+ return GDK_FILTER_CONTINUE;
|
||||
}
|
||||
|
||||
static void
|
||||
static Bool
|
|
@ -1,49 +0,0 @@
|
|||
require gtk+.inc
|
||||
|
||||
PR = "r3"
|
||||
|
||||
SRC_URI = "http://download.gnome.org/sources/gtk+/2.14/gtk+-${PV}.tar.bz2 \
|
||||
file://xsettings.patch;patch=1 \
|
||||
file://run-iconcache.patch;patch=1 \
|
||||
file://hardcoded_libtool.patch;patch=1 \
|
||||
file://no-demos.patch;patch=1 \
|
||||
file://cellrenderer-cairo.patch;patch=1;pnum=0 \
|
||||
file://entry-cairo.patch;patch=1;pnum=0 \
|
||||
file://toggle-font.diff;patch=1;pnum=0 \
|
||||
file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch;patch=1 \
|
||||
# TO MERGE
|
||||
# file://filesystem-volumes.patch;patch=1 \
|
||||
# file://filechooser-props.patch;patch=1 \
|
||||
# file://filechooser-default.patch;patch=1 \
|
||||
# file://filechooser-sizefix.patch;patch=1 \
|
||||
# temporary
|
||||
# file://gtklabel-resize-patch;patch=1 \
|
||||
# file://menu-deactivate.patch;patch=1 \
|
||||
# file://combo-arrow-size.patch;patch=1;pnum=0 \
|
||||
file://disable-gio-png-sniff-test.diff;patch=1 \
|
||||
"
|
||||
|
||||
EXTRA_OECONF = "--without-libtiff --without-libjasper --disable-xkb --disable-glibtest --disable-cups"
|
||||
|
||||
LIBV = "2.10.0"
|
||||
|
||||
PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
|
||||
|
||||
python populate_packages_prepend () {
|
||||
import os.path
|
||||
|
||||
prologue = bb.data.getVar("postinst_prologue", d, 1)
|
||||
postinst_pixbufloader = bb.data.getVar("postinst_pixbufloader", d, 1)
|
||||
|
||||
gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
|
||||
loaders_root = os.path.join(gtk_libdir, 'loaders')
|
||||
immodules_root = os.path.join(gtk_libdir, 'immodules')
|
||||
printmodules_root = os.path.join(gtk_libdir, 'printbackends');
|
||||
|
||||
do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader)
|
||||
do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
|
||||
do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
|
||||
|
||||
if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
|
||||
bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
|
||||
}
|
|
@ -1,8 +1,12 @@
|
|||
require gtk+.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
|
||||
file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
|
||||
file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
|
||||
file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
|
||||
PR = "r0"
|
||||
|
||||
SRC_URI = "http://download.gnome.org/sources/gtk+/2.18/gtk+-${PV}.tar.bz2 \
|
||||
SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \
|
||||
file://xsettings.patch;patch=1 \
|
||||
file://run-iconcache.patch;patch=1 \
|
||||
file://hardcoded_libtool.patch;patch=1 \
|
Loading…
Reference in New Issue