diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch | 195 | ||||
-rw-r--r-- | packages/gtk+/gtk+_2.10.6.bb | 22 |
2 files changed, 65 insertions, 152 deletions
diff --git a/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch index 20481f059b..1ea86ce6b2 100644 --- a/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch +++ b/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch @@ -1,8 +1,10 @@ ---- gtk+-2.4.1/gtk/gtkarrow.c 2004-03-13 09:51:13.000000000 +1100 -+++ gtk+-2.4.1/gtk/gtkarrow.c 2004-05-26 14:52:17.000000000 +1000 -@@ -29,7 +29,7 @@ - #include "gtkarrow.h" +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 @@ -16,17 +18,17 @@ +static void gtk_arrow_size_request (GtkWidget *arrow, + GtkRequisition *requisition); - GType - gtk_arrow_get_type (void) -@@ -111,6 +113,7 @@ - G_PARAM_READABLE | G_PARAM_WRITABLE)); + + 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 -@@ -166,13 +169,18 @@ +@@ -143,13 +146,18 @@ } static void @@ -48,162 +50,73 @@ arrow->arrow_type = GTK_ARROW_RIGHT; arrow->shadow_type = GTK_SHADOW_OUT; } ---- gtk+-2.4.1/gtk/gtkcalendar.c 2004-03-06 14:37:26.000000000 +1100 -+++ gtk+-2.4.1/gtk/gtkcalendar.c 2004-05-26 14:58:57.000000000 +1000 -@@ -340,6 +340,9 @@ - static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar, - guint day); - -+static void gtk_calendar_do_select_day (GtkCalendar *calendar, -+ guint day); -+ - static void gtk_calendar_paint_arrow (GtkWidget *widget, - guint arrow); - static void gtk_calendar_paint_day_num (GtkWidget *widget, -@@ -861,13 +864,13 @@ - if (month_len < calendar->selected_day) - { - calendar->selected_day = 0; -- gtk_calendar_select_day (calendar, month_len); -+ gtk_calendar_do_select_day (calendar, month_len); - } - else - { - if (calendar->selected_day < 0) - calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1]; -- gtk_calendar_select_day (calendar, calendar->selected_day); -+ gtk_calendar_do_select_day (calendar, calendar->selected_day); - } - - gtk_widget_queue_draw (GTK_WIDGET (calendar)); -@@ -908,10 +911,10 @@ - if (month_len < calendar->selected_day) - { - calendar->selected_day = 0; -- gtk_calendar_select_day (calendar, month_len); -+ gtk_calendar_do_select_day (calendar, month_len); - } - else -- gtk_calendar_select_day (calendar, calendar->selected_day); -+ gtk_calendar_do_select_day (calendar, calendar->selected_day); - - gtk_widget_queue_draw (GTK_WIDGET (calendar)); - gtk_calendar_thaw (calendar); -@@ -939,10 +942,10 @@ - if (month_len < calendar->selected_day) - { - calendar->selected_day = 0; -- gtk_calendar_select_day (calendar, month_len); -+ gtk_calendar_do_select_day (calendar, month_len); - } - else -- gtk_calendar_select_day (calendar, calendar->selected_day); -+ gtk_calendar_do_select_day (calendar, calendar->selected_day); - - gtk_widget_queue_draw (GTK_WIDGET (calendar)); - gtk_calendar_thaw (calendar); -@@ -974,10 +977,10 @@ - if (month_len < calendar->selected_day) - { - calendar->selected_day = 0; -- gtk_calendar_select_day (calendar, month_len); -+ gtk_calendar_do_select_day (calendar, month_len); - } - else -- gtk_calendar_select_day (calendar, calendar->selected_day); -+ gtk_calendar_do_select_day (calendar, calendar->selected_day); - - gtk_widget_queue_draw (GTK_WIDGET (calendar)); - gtk_calendar_thaw (calendar); -@@ -2480,9 +2483,9 @@ - return TRUE; - } - --void --gtk_calendar_select_day (GtkCalendar *calendar, -- guint day) -+static void -+gtk_calendar_do_select_day (GtkCalendar *calendar, -+ guint day) - { - g_return_if_fail (GTK_IS_CALENDAR (calendar)); - g_return_if_fail (day <= 31); -@@ -2499,6 +2502,13 @@ - if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar))) - gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day); - } -+} -+ -+void -+gtk_calendar_select_day (GtkCalendar *calendar, -+ guint day) -+{ -+ gtk_calendar_do_select_day (calendar, day); - - calendar->selected_day = day; - ---- gtk+-2.4.1/gtk/gtkentry.c 2004-04-22 08:08:08.000000000 +1000 -+++ gtk+-2.4.1/gtk/gtkentry.c 2004-05-26 14:52:17.000000000 +1000 -@@ -557,6 +557,15 @@ +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, - G_PARAM_READABLE | G_PARAM_WRITABLE)); - + GTK_PARAM_READWRITE)); + ++ // Added by gtk+-handhelds.patch + gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("min_width", -+ _("Minimum width"), -+ _("Minimum width of the entry field"), -+ 0, -+ G_MAXINT, -+ MIN_ENTRY_WIDTH, -+ G_PARAM_READABLE)); ++ 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)); ++ ++ + - signals[POPULATE_POPUP] = - g_signal_new ("populate_popup", - G_OBJECT_CLASS_TYPE (gobject_class), -@@ -1124,7 +1133,7 @@ + /** + * 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; - gtk_widget_ensure_style (widget); -@@ -1140,9 +1149,11 @@ - - xborder += INNER_BORDER; - yborder += INNER_BORDER; -- -+ +@@ -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; -+ requisition->width = min_width + xborder * 2; +- 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); ---- gtk+-2.4.1/gtk/gtkrange.c 2004-03-06 14:38:08.000000000 +1100 -+++ gtk+-2.4.1/gtk/gtkrange.c 2004-05-26 14:52:17.000000000 +1000 -@@ -180,6 +180,7 @@ - static GtkWidgetClass *parent_class = NULL; - static guint signals[LAST_SIGNAL]; +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; - GType - gtk_range_get_type (void) -@@ -220,6 +221,9 @@ + 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); + - parent_class = g_type_class_peek_parent (class); - gobject_class->set_property = gtk_range_set_property; -@@ -815,6 +819,12 @@ + 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); @@ -216,7 +129,7 @@ widget->style = gtk_style_attach (widget->style, widget->window); } -@@ -1186,7 +1196,7 @@ +@@ -1569,7 +1579,7 @@ /* ignore presses when we're already doing something else. */ if (range->layout->grab_location != MOUSE_OUTSIDE) @@ -225,7 +138,7 @@ range->layout->mouse_x = event->x; range->layout->mouse_y = event->y; -@@ -1364,7 +1374,7 @@ +@@ -1778,7 +1788,7 @@ return TRUE; } diff --git a/packages/gtk+/gtk+_2.10.6.bb b/packages/gtk+/gtk+_2.10.6.bb index 9fa07674f0..2ea55b33c5 100644 --- a/packages/gtk+/gtk+_2.10.6.bb +++ b/packages/gtk+/gtk+_2.10.6.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" -PR = "r5" +PR = "r6" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" @@ -13,20 +13,20 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ file://automake-lossage.patch;patch=1 \ - file://disable-tooltips.patch;patch=1 \ - file://gtklabel-resize-patch;patch=1 \ - file://menu-deactivate.patch;patch=1 \ - file://xsettings.patch;patch=1 \ - file://scroll-timings.patch;patch=1 \ - file://small-gtkfilesel.patch;patch=1 \ - file://migration.patch;patch=1;pnum=0 \ + file://disable-tooltips.patch;patch=1 \ + file://gtklabel-resize-patch;patch=1 \ + file://menu-deactivate.patch;patch=1 \ + file://xsettings.patch;patch=1 \ + file://scroll-timings.patch;patch=1 \ + file://small-gtkfilesel.patch;patch=1 \ + file://migration.patch;patch=1;pnum=0 \ file://run-iconcache.patch;patch=1 \ file://hardcoded_libtool.patch;patch=1 \ file://no-demos.patch;patch=1 \ file://pangoxft2.10.6.diff;patch=1 \ - file://single-click.patch;patch=1 \ - file://spinbutton.patch;patch=1" -# file://gtk+-handhelds.patch;patch=1 + file://single-click.patch;patch=1 \ + file://spinbutton.patch;patch=1 \ + file://gtk+-handhelds.patch;patch=1" inherit autotools pkgconfig |