summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/gtk+/gtk+-2.11.6/gtk+-handhelds.patch149
-rw-r--r--meta/packages/gtk+/gtk+-2.11.6/scroll-timings.patch11
-rw-r--r--meta/packages/gtk+/gtk+-2.11.6/single-click.patch56
-rw-r--r--meta/packages/gtk+/gtk+-2.11.6/spinbutton.patch130
-rw-r--r--meta/packages/gtk+/gtk+_2.11.6.bb6
5 files changed, 1 insertions, 351 deletions
diff --git a/meta/packages/gtk+/gtk+-2.11.6/gtk+-handhelds.patch b/meta/packages/gtk+/gtk+-2.11.6/gtk+-handhelds.patch
deleted file mode 100644
index 1ea86ce6b..000000000
--- a/meta/packages/gtk+/gtk+-2.11.6/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/meta/packages/gtk+/gtk+-2.11.6/scroll-timings.patch b/meta/packages/gtk+/gtk+-2.11.6/scroll-timings.patch
deleted file mode 100644
index 3f823a788..000000000
--- a/meta/packages/gtk+/gtk+-2.11.6/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/meta/packages/gtk+/gtk+-2.11.6/single-click.patch b/meta/packages/gtk+/gtk+-2.11.6/single-click.patch
deleted file mode 100644
index 250f1629f..000000000
--- a/meta/packages/gtk+/gtk+-2.11.6/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/meta/packages/gtk+/gtk+-2.11.6/spinbutton.patch b/meta/packages/gtk+/gtk+-2.11.6/spinbutton.patch
deleted file mode 100644
index c26dc6d93..000000000
--- a/meta/packages/gtk+/gtk+-2.11.6/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/meta/packages/gtk+/gtk+_2.11.6.bb b/meta/packages/gtk+/gtk+_2.11.6.bb
index 570a782b1..8cdfa8bcb 100644
--- a/meta/packages/gtk+/gtk+_2.11.6.bb
+++ b/meta/packages/gtk+/gtk+_2.11.6.bb
@@ -19,18 +19,14 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.11/gtk+-${PV}.tar.bz2 \
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://range-no-redraw.patch;patch=1;pnum=0 \
file://scrolled-placement.patch;patch=1;pnum=0"
# temporary
# file://gtklabel-resize-patch;patch=1 \
# file://menu-deactivate.patch;patch=1 \
# file://combo-arrow-size.patch;patch=1;pnum=0 \
-# file://range-no-redraw.patch;patch=1;pnum=0 \
# die die die
-# file://scroll-timings.patch;patch=1 \
# file://pangoxft2.10.6.diff;patch=1"
-# file://gtk+-handhelds.patch;patch=1
-# file://single-click.patch;patch=1
-# file://spinbutton.patch;patch=1 \
EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"