summaryrefslogtreecommitdiff
path: root/package/gtk+
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-05 12:15:12 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-05 12:15:12 +0100
commit65b27b644c5817eb63fe7b8392236c37e0386f9b (patch)
tree31dcf3f300443fae37ed57c6c86fec960e3de9da /package/gtk+
parent9230fde0381a7dcc7e3d86e954382a01a8fcfd63 (diff)
update some packages to latest upstream
- openssh, aircrack-ng, autoconf, lighttpd - use mplayer svn version
Diffstat (limited to 'package/gtk+')
-rw-r--r--package/gtk+/Makefile4
-rw-r--r--package/gtk+/patches/patch-Makefile_in11
-rw-r--r--package/gtk+/patches/patch-gtk_gtktypefuncs_c70
3 files changed, 84 insertions, 1 deletions
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index 09765990a..d4e3b19e9 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -21,7 +21,8 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,GTK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_STYLE:= gnu
-CONFIGURE_ENV+= gio_can_sniff=no
+CONFIGURE_ENV+= gio_can_sniff=no \
+ ac_cv_path_GTK_UPDATE_ICON_CACHE=""
CONFIGURE_ARGS+= --without-libtiff \
--without-libjpeg
BUILD_STYLE:= auto
@@ -29,5 +30,6 @@ INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_GTK}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_GTK}/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gtk+/patches/patch-Makefile_in b/package/gtk+/patches/patch-Makefile_in
new file mode 100644
index 000000000..02ebabfca
--- /dev/null
+++ b/package/gtk+/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- gtk+-2.18.3.orig/Makefile.in 2009-10-17 03:53:04.000000000 +0200
++++ gtk+-2.18.3/Makefile.in 2009-12-04 22:04:14.000000000 +0100
+@@ -464,7 +464,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-pixbuf gdk gtk modules demos tests perf contrib
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+
+ # require automake 1.4
diff --git a/package/gtk+/patches/patch-gtk_gtktypefuncs_c b/package/gtk+/patches/patch-gtk_gtktypefuncs_c
new file mode 100644
index 000000000..a5ed911a2
--- /dev/null
+++ b/package/gtk+/patches/patch-gtk_gtktypefuncs_c
@@ -0,0 +1,70 @@
+--- gtk+-2.18.3.orig/gtk/gtktypefuncs.c 2009-10-17 03:58:56.000000000 +0200
++++ gtk+-2.18.3/gtk/gtktypefuncs.c 2009-12-04 21:57:40.000000000 +0100
+@@ -53,8 +53,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();
+@@ -191,14 +191,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_input_dialog_get_type();
+ *tp++ = gtk_invisible_get_type();
+@@ -283,10 +283,10 @@
+ *tp++ = gtk_ruler_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();
+@@ -305,8 +305,8 @@
+ *tp++ = gtk_spin_button_update_policy_get_type();
+ *tp++ = gtk_spin_type_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();
+@@ -330,13 +330,13 @@
+ *tp++ = gtk_toggle_action_get_type();
+ *tp++ = gtk_toggle_button_get_type();
+ *tp++ = gtk_toggle_tool_button_get_type();
++*tp++ = gtk_tool_button_get_type();
++*tp++ = gtk_tool_item_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_tool_button_get_type();
+-*tp++ = gtk_tool_item_get_type();
+-*tp++ = gtk_tool_shell_get_type();
+ *tp++ = gtk_tooltip_get_type();
+ *tp++ = gtk_tree_drag_dest_get_type();
+ *tp++ = gtk_tree_drag_source_get_type();