summaryrefslogtreecommitdiff
path: root/package/gtk+
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-12-30 22:45:29 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-12-30 22:45:29 +0100
commit220a96f9926788ed531717f78e44fdf1e7ab3b34 (patch)
tree406f65eea71fabd8cf66c2bd1108ec63f8c349ee /package/gtk+
parent38af8185ea05a1c5d1abb32a68a025e3b4afa4d6 (diff)
rework architecture / embedded systems concept
Make configuration of new targets cheap. Just add a new file in target/arch/sys-enabled/foo. See other files for syntax. While doing runtime tests with the new infrastructure I've updated a lot of other stuff: - gcc 4.5.2 - uClibc 0.9.32-rc1 (NPTL) - strongswan, php, miredo, parted, util-linux-ng, e2fsprogs I promise, this is the last big fat commit this year ;)
Diffstat (limited to 'package/gtk+')
-rw-r--r--package/gtk+/Makefile9
-rw-r--r--package/gtk+/patches/patch-Makefile_in11
-rw-r--r--package/gtk+/patches/patch-gtk_gtktypefuncs_c70
3 files changed, 4 insertions, 86 deletions
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index a9aa56c20..41972cbbc 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -4,15 +4,16 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= gtk+
-PKG_VERSION:= 2.18.6
+PKG_VERSION:= 2.22.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= f98617af9f6be3065f64248f78dae2b7
+PKG_MD5SUM:= dd1830395a6b9265a1e1989af7a3c5bf
PKG_DESCR:= GTK+ library
PKG_SECTION:= libs
PKG_DEPENDS:= glib
PKG_BUILDDEP:= cairo atk pango libXext renderproto libXrender
+PKG_BUILDDEP+= gdk-pixbuf libXcomposite
PKG_URL:= http://www.gtk.org/
-PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gtk+/2.18/
+PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gtk+/2.22/
PKG_SUBPKGS:= LIBGTK
@@ -26,8 +27,6 @@ $(eval $(call PKG_template,LIBGTK,libgtk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
CONFIGURE_ENV+= gio_can_sniff=no \
ac_cv_path_GTK_UPDATE_ICON_CACHE=""
-CONFIGURE_ARGS+= --without-libtiff \
- --without-libjpeg
post-install:
${INSTALL_DIR} ${IDIR_LIBGTK}/usr/lib
diff --git a/package/gtk+/patches/patch-Makefile_in b/package/gtk+/patches/patch-Makefile_in
deleted file mode 100644
index 02ebabfca..000000000
--- a/package/gtk+/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index a5ed911a2..000000000
--- a/package/gtk+/patches/patch-gtk_gtktypefuncs_c
+++ /dev/null
@@ -1,70 +0,0 @@
---- 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();