diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/gtk+/Makefile | 4 | ||||
| -rw-r--r-- | package/gtk+/patches/patch-Makefile_in | 8 | ||||
| -rw-r--r-- | package/gtk+/patches/patch-gtk_gtktypefuncs_c | 78 |
3 files changed, 6 insertions, 84 deletions
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile index 24d7ce1d0..e048165bd 100644 --- a/package/gtk+/Makefile +++ b/package/gtk+/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gtk+ -PKG_VERSION:= 2.24.6 +PKG_VERSION:= 2.24.22 PKG_EXTRAVER:= 2.24 PKG_RELEASE:= 1 -PKG_MD5SUM:= 4d7efde4ac24dbaa720bc0744eee8235 +PKG_MD5SUM:= 5fbbfb7637bbd571a572a2dae0e736d2 PKG_DESCR:= GTK+ library PKG_SECTION:= libs PKG_DEPENDS:= glib diff --git a/package/gtk+/patches/patch-Makefile_in b/package/gtk+/patches/patch-Makefile_in index 2303be5c0..7732e28b9 100644 --- a/package/gtk+/patches/patch-Makefile_in +++ b/package/gtk+/patches/patch-Makefile_in @@ -1,11 +1,11 @@ ---- gtk+-2.24.6.orig/Makefile.in 2011-08-30 22:23:21.000000000 +0200 -+++ gtk+-2.24.6/Makefile.in 2011-11-08 18:27:10.745082865 +0100 -@@ -459,7 +459,7 @@ XVFB_START = \ +--- gtk+-2.24.22.orig/Makefile.in 2013-10-11 11:58:05.000000000 +0200 ++++ gtk+-2.24.22/Makefile.in 2013-12-17 12:22:11.517248005 +0100 +@@ -552,7 +552,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY -SRC_SUBDIRS = gdk gtk modules demos tests perf -+SRC_SUBDIRS = gdk gtk modules tests perf ++SRC_SUBDIRS = gdk gtk modules perf SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build # require automake 1.4 diff --git a/package/gtk+/patches/patch-gtk_gtktypefuncs_c b/package/gtk+/patches/patch-gtk_gtktypefuncs_c deleted file mode 100644 index 2a98f9002..000000000 --- a/package/gtk+/patches/patch-gtk_gtktypefuncs_c +++ /dev/null @@ -1,78 +0,0 @@ ---- gtk+-2.24.6.orig/gtk/gtktypefuncs.c 2011-08-30 22:24:44.000000000 +0200 -+++ gtk+-2.24.6/gtk/gtktypefuncs.c 2011-11-08 18:06:50.273051952 +0100 -@@ -54,8 +54,8 @@ - *tp++ = gdk_pixbuf_simple_anim_get_type(); - *tp++ = gdk_pixbuf_simple_anim_iter_get_type(); - *tp++ = gdk_pixmap_get_type(); --*tp++ = gdk_property_state_get_type(); - *tp++ = gdk_prop_mode_get_type(); -+*tp++ = gdk_property_state_get_type(); - *tp++ = gdk_rectangle_get_type(); - *tp++ = gdk_rgb_dither_get_type(); - *tp++ = gdk_screen_get_type(); -@@ -190,14 +190,14 @@ - *tp++ = gtk_icon_view_drop_position_get_type(); - *tp++ = gtk_icon_view_get_type(); - *tp++ = gtk_identifier_get_type(); --*tp++ = gtk_image_get_type(); --*tp++ = gtk_image_menu_item_get_type(); --*tp++ = gtk_image_type_get_type(); - *tp++ = gtk_im_context_get_type(); - *tp++ = gtk_im_context_simple_get_type(); - *tp++ = gtk_im_multicontext_get_type(); - *tp++ = gtk_im_preedit_style_get_type(); - *tp++ = gtk_im_status_style_get_type(); -+*tp++ = gtk_image_get_type(); -+*tp++ = gtk_image_menu_item_get_type(); -+*tp++ = gtk_image_type_get_type(); - *tp++ = gtk_info_bar_get_type(); - *tp++ = gtk_invisible_get_type(); - *tp++ = gtk_item_get_type(); -@@ -281,10 +281,10 @@ - *tp++ = gtk_response_type_get_type(); - *tp++ = gtk_scale_button_get_type(); - *tp++ = gtk_scale_get_type(); --*tp++ = gtk_scrollbar_get_type(); --*tp++ = gtk_scrolled_window_get_type(); - *tp++ = gtk_scroll_step_get_type(); - *tp++ = gtk_scroll_type_get_type(); -+*tp++ = gtk_scrollbar_get_type(); -+*tp++ = gtk_scrolled_window_get_type(); - *tp++ = gtk_selection_data_get_type(); - *tp++ = gtk_selection_mode_get_type(); - *tp++ = gtk_sensitivity_type_get_type(); -@@ -301,11 +301,11 @@ - *tp++ = gtk_sort_type_get_type(); - *tp++ = gtk_spin_button_get_type(); - *tp++ = gtk_spin_button_update_policy_get_type(); --*tp++ = gtk_spinner_get_type(); - *tp++ = gtk_spin_type_get_type(); -+*tp++ = gtk_spinner_get_type(); - *tp++ = gtk_state_type_get_type(); --*tp++ = gtk_statusbar_get_type(); - *tp++ = gtk_status_icon_get_type(); -+*tp++ = gtk_statusbar_get_type(); - *tp++ = gtk_style_get_type(); - *tp++ = gtk_submenu_direction_get_type(); - *tp++ = gtk_submenu_placement_get_type(); -@@ -329,16 +329,16 @@ - *tp++ = gtk_toggle_action_get_type(); - *tp++ = gtk_toggle_button_get_type(); - *tp++ = gtk_toggle_tool_button_get_type(); --*tp++ = gtk_toolbar_child_type_get_type(); --*tp++ = gtk_toolbar_get_type(); --*tp++ = gtk_toolbar_space_style_get_type(); --*tp++ = gtk_toolbar_style_get_type(); - *tp++ = gtk_tool_button_get_type(); - *tp++ = gtk_tool_item_get_type(); - *tp++ = gtk_tool_item_group_get_type(); - *tp++ = gtk_tool_palette_drag_targets_get_type(); - *tp++ = gtk_tool_palette_get_type(); - *tp++ = gtk_tool_shell_get_type(); -+*tp++ = gtk_toolbar_child_type_get_type(); -+*tp++ = gtk_toolbar_get_type(); -+*tp++ = gtk_toolbar_space_style_get_type(); -+*tp++ = gtk_toolbar_style_get_type(); - *tp++ = gtk_tooltip_get_type(); - *tp++ = gtk_tree_drag_dest_get_type(); - *tp++ = gtk_tree_drag_source_get_type(); |