diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-12-18 14:11:05 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-12-18 14:11:05 +0000 |
| commit | 7acf4a4f3536a5701badb51a103c7e70b122f511 (patch) | |
| tree | 4baac073314480a356b6cf367e3d4a5196a67d71 | |
| parent | 344d6ad5409dafe048099294f9e404e7f188e329 (diff) | |
atk: drop obsolete versions 2.2 and 2.4
23 files changed, 0 insertions, 2433 deletions
diff --git a/packages/gtk+/gtk+-2.2.4/automake-lossage.patch b/packages/gtk+/gtk+-2.2.4/automake-lossage.patch deleted file mode 100644 index 9560abf9ba..0000000000 --- a/packages/gtk+/gtk+-2.2.4/automake-lossage.patch +++ /dev/null @@ -1,446 +0,0 @@ ---- gtk/Makefile.am.old 2003-09-03 20:50:06.000000000 +0100 -+++ gtk/Makefile.am 2004-03-07 12:17:29.000000000 +0000 -@@ -2,7 +2,7 @@ - - SUBDIRS=stock-icons theme-bits - --INCLUDES = @STRIP_BEGIN@ \ -+INCLUDES = \ - -DG_LOG_DOMAIN=\"Gtk\" \ - -DGTK_LIBDIR=\"$(libdir)\" \ - -DGTK_DATA_PREFIX=\"$(prefix)\" \ -@@ -20,8 +20,7 @@ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - @GTK_DEBUG_FLAGS@ \ -- @GTK_DEP_CFLAGS@ \ --@STRIP_END@ -+ @GTK_DEP_CFLAGS@ - - gtarget=@gdktarget@ - -@@ -67,7 +66,7 @@ - # since automake doesn't support conditionalized libsomething_la_LDFLAGS - # we use the general approach here - libgtkincludedir = $(includedir)/gtk-2.0/gtk --LDFLAGS = @STRIP_BEGIN@ \ -+AM_LDFLAGS = \ - @LDFLAGS@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic \ -@@ -77,8 +76,8 @@ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/@gdktargetlib@ \ - $(libgtk_target_ldflags) \ -- @GTK_DEP_LIBS@ \ --@STRIP_END@ -+ @GTK_DEP_LIBS@ -+ - - # - # setup source file variables -@@ -86,7 +85,7 @@ - - # GTK+ header files for public installation (non-generated, or generated - # by configure) --gtk_public_h_sources = @STRIP_BEGIN@ \ -+gtk_public_h_sources = \ - gtk.h \ - gtkaccelgroup.h \ - gtkaccellabel.h \ -@@ -228,10 +227,10 @@ - gtkvscrollbar.h \ - gtkvseparator.h \ - gtkwidget.h \ -- gtkwindow.h \ --@STRIP_END@ -+ gtkwindow.h -+ - # GTK+ header files that don't get installed --gtk_private_h_sources = @STRIP_BEGIN@ \ -+gtk_private_h_sources = \ - gtkrbtree.h \ - gtktextbtree.h \ - gtktextchildprivate.h \ -@@ -244,8 +243,7 @@ - gtkthemes.h \ - gtktreedatalist.h \ - gtktreeprivate.h \ -- gtkwindow-decorate.h \ --@STRIP_END@ -+ gtkwindow-decorate.h - - # GTK+ C sources to build the library from - -@@ -257,7 +255,7 @@ - gtktreeitem.c - endif - --gtk_c_sources = @STRIP_BEGIN@ \ -+gtk_c_sources = \ - gtkaccelgroup.c \ - gtkaccelmap.c \ - gtkaccellabel.c \ -@@ -410,15 +408,13 @@ - gtkwindow-decorate.c \ - fnmatch.c \ - xembed.h \ -- ${crufty_gtk_c_sources} \ --@STRIP_END@ -+ ${crufty_gtk_c_sources} - --gtk_plug_c_sources = @STRIP_BEGIN@ \ -+gtk_plug_c_sources = \ - gtkplug.c \ - gtksocket.c \ - gtkxembed.c \ -- gtkxembed.h \ --@STRIP_END@ -+ gtkxembed.h - - # we use our own built_sources variable rules to avoid automake's - # BUILT_SOURCES oddities -@@ -427,35 +423,34 @@ - # content - - # built sources that get installed with the header files --gtk_built_public_sources = @STRIP_BEGIN@ \ -+gtk_built_public_sources = \ - gtkmarshal.h \ -- gtktypebuiltins.h \ --@STRIP_END@ --gtk_built_private_headers = @STRIP_BEGIN@ \ -- gtkmarshalers.h \ --@STRIP_END@ -+ gtktypebuiltins.h -+ -+gtk_built_private_headers = \ -+ gtkmarshalers.h -+ - # built sources that don't get installed --gtk_built_sources = @STRIP_BEGIN@ \ -+gtk_built_sources = \ - gtktypebuiltins.c \ - gtkmarshalers.c \ - gtkmarshalers.h \ - gtkmarshal.c \ - ${gtk_built_private_headers} \ -- ${gtk_built_public_sources} \ --@STRIP_END@ --stamp_files = @STRIP_BEGIN@ \ -+ ${gtk_built_public_sources} -+ -+stamp_files = \ - stamp-gtkmarshalers.h \ - stamp-gtkmarshal.h \ -- stamp-gtktypebuiltins.h \ --@STRIP_END@ -+ stamp-gtktypebuiltins.h -+ - # non-header sources (headers should be specified in the above variables) - # that don't serve as direct make target sources, i.e. they don't have - # their own .lo rules and don't get publically installed --gtk_extra_sources = @STRIP_BEGIN@ \ -+gtk_extra_sources = \ - gtkversion.h.in \ - gtkmarshalers.list \ -- gtkmarshal.list \ --@STRIP_END@ -+ gtkmarshal.list - - # - # setup GTK+ sources and their dependencies -@@ -592,11 +587,10 @@ - - TEST_DEPS = $(DEPS) gtk.immodules - --LDADDS = @STRIP_BEGIN@ \ -+LDADDS = \ - $(gtktargetlib) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ --@STRIP_END@ -+ $(top_builddir)/gdk/$(gdktargetlib) - - # - # Installed tools -@@ -615,7 +609,7 @@ - echo $$p; \ - done - --EXTRA_DIST += @STRIP_BEGIN@ \ -+EXTRA_DIST += \ - line-arrow.xbm \ - line-wrap.xbm \ - tree_plus.xbm \ -@@ -629,9 +623,8 @@ - gtkrc.key.default \ - gtkrc.key.emacs \ - makefile.msc \ -- makefile.msc.in \ --@STRIP_END@ -+ makefile.msc.in - - install-data-local: - - ---- gdk/Makefile.am.old 2003-09-03 20:49:25.000000000 +0100 -+++ gdk/Makefile.am 2004-03-07 12:18:18.000000000 +0000 -@@ -10,7 +10,7 @@ - makeenums.pl \ - makefile.msc - --common_includes = @STRIP_BEGIN@ \ -+common_includes = \ - -DG_LOG_DOMAIN=\"Gdk\" \ - -DGDK_COMPILATION \ - -I$(top_srcdir) \ -@@ -20,8 +20,7 @@ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - @GTK_DEBUG_FLAGS@ \ -- @GDK_DEP_CFLAGS@ \ --@STRIP_END@ -+ @GDK_DEP_CFLAGS@ - - INCLUDES = $(common_includes) - gtarget=@gdktarget@ -@@ -69,7 +68,7 @@ - # libtool stuff: set version and export symbols for resolving - # since automake doesn't support conditionalized libsomething_la_LDFLAGS - # we use the general approach here --LDFLAGS = @STRIP_BEGIN@ \ -+AM_LDFLAGS = \ - @LDFLAGS@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic \ -@@ -77,8 +76,7 @@ - $(no_undefined) \ - @LIBTOOL_EXPORT_OPTIONS@ \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(gdk_win32_symbols) \ --@STRIP_END@ -+ $(gdk_win32_symbols) - - # - # setup source file variables -@@ -88,7 +86,7 @@ - # - # Note: files added here may need to be be propagated to gdk_headers in gtk/Makefile.am - # --gdk_public_h_sources = @STRIP_BEGIN@ \ -+gdk_public_h_sources = \ - gdk.h \ - gdkcolor.h \ - gdkcursor.h \ -@@ -114,16 +112,14 @@ - gdkselection.h \ - gdktypes.h \ - gdkvisual.h \ -- gdkwindow.h \ --@STRIP_END@ -+ gdkwindow.h - --gdk_headers = @STRIP_BEGIN@ \ -+gdk_headers = \ - $(gdk_public_h_sources) \ - gdkenumtypes.h \ -- gdkprivate.h \ --@STRIP_END@ -+ gdkprivate.h - --gdk_c_sources = @STRIP_BEGIN@ \ -+gdk_c_sources = \ - gdk.c \ - gdkcolor.c \ - gdkcursor.c \ -@@ -153,8 +149,7 @@ - gdkscreen.c \ - gdkselection.c \ - gdkvisual.c \ -- gdkwindow.c \ --@STRIP_END@ -+ gdkwindow.c - - # - # setup GDK sources and their dependencies -@@ -164,11 +159,10 @@ - gdkinclude_HEADERS = $(gdk_headers) - - # gdkmarshalers.c is not here becuase it is currently an empty file --common_sources = @STRIP_BEGIN@ \ -+common_sources = \ - $(gdk_c_sources) \ - gdkenumtypes.c \ -- gdkmarshalers.h \ --@STRIP_END@ -+ gdkmarshalers.h - - libgdk_x11_2_0_la_SOURCES = $(common_sources) - libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c ---- gdk-pixbuf/Makefile.am.old 2003-01-27 23:19:07.000000000 +0000 -+++ gdk-pixbuf/Makefile.am 2004-03-07 12:19:11.000000000 +0000 -@@ -238,7 +238,7 @@ - endif - - DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la --INCLUDES = @STRIP_BEGIN@ \ -+INCLUDES = \ - -DG_LOG_DOMAIN=\"GdkPixbuf\" \ - -I$(top_srcdir) -I$(top_builddir) \ - -I$(top_srcdir)/gdk-pixbuf \ -@@ -252,8 +252,7 @@ - @INCLUDED_LOADER_DEFINE@ \ - @GTK_DEBUG_FLAGS@ \ - @GDK_PIXBUF_DEP_CFLAGS@ \ -- -DGDK_PIXBUF_ENABLE_BACKEND \ --@STRIP_END@ -+ -DGDK_PIXBUF_ENABLE_BACKEND - - AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" - LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la -@@ -281,7 +280,7 @@ - # The GdkPixBuf library - # - libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf --libgdk_pixbuf_2_0_la_SOURCES = @STRIP_BEGIN@ \ -+libgdk_pixbuf_2_0_la_SOURCES = \ - gdk-pixbuf-i18n.h \ - gdk-pixbuf.c \ - gdk-pixbuf-animation.c \ -@@ -291,14 +290,13 @@ - gdk-pixbuf-scale.c \ - gdk-pixbuf-util.c \ - gdk-pixdata.c \ -- $(gdk_pixbuf_built_cfiles) \ --@STRIP_END@ --libgdk_pixbuf_2_0_la_LDFLAGS = @STRIP_BEGIN@ \ -+ $(gdk_pixbuf_built_cfiles) -+ -+libgdk_pixbuf_2_0_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - @LIBTOOL_EXPORT_OPTIONS@ \ - $(no_undefined) \ -- $(gdk_pixbuf_symbols) \ --@STRIP_END@ -+ $(gdk_pixbuf_symbols) - - libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_win32res_lo) $(GDK_PIXBUF_DEP_LIBS) - libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32res_lo) ---- demos/Makefile.am.old 2003-06-06 01:52:59.000000000 +0100 -+++ demos/Makefile.am 2004-03-07 12:20:23.000000000 +0000 -@@ -2,7 +2,7 @@ - - SUBDIRS = gtk-demo - --INCLUDES = @STRIP_BEGIN@ \ -+INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -DG_DISABLE_DEPRECATED \ -@@ -10,19 +10,17 @@ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - @GTK_DEBUG_FLAGS@ \ -- @GTK_DEP_CFLAGS@ \ --@STRIP_END@ -+ @GTK_DEP_CFLAGS@ - - DEPS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/@gdktargetlib@ \ - $(top_builddir)/gtk/@gtktargetlib@ - --LDADDS = @STRIP_BEGIN@ \ -+LDADDS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/@gdktargetlib@ \ -- $(top_builddir)/gtk/@gtktargetlib@ \ --@STRIP_END@ -+ $(top_builddir)/gtk/@gtktargetlib@ - - noinst_PROGRAMS = \ - testpixbuf \ ---- docs/faq/Makefile.am.old 2002-03-06 03:59:12.000000000 +0000 -+++ docs/faq/Makefile.am 2004-03-07 12:23:40.000000000 +0000 -@@ -14,15 +14,6 @@ - dist-hook: html - cp -Rp $(srcdir)/html $(distdir) - else --html: -- echo "***" -- echo "*** Warning: FAQ not built" -- echo "***" -- --pdf: -- echo "***" -- echo "*** Warning: FAQ not built" -- echo "***" - - dist-hook: - echo "***" ---- docs/tutorial/Makefile.am.old 2002-03-06 03:59:12.000000000 +0000 -+++ docs/tutorial/Makefile.am 2004-03-07 12:24:42.000000000 +0000 -@@ -49,15 +49,6 @@ - dist-hook: html - cp -Rp $(srcdir)/html $(distdir) - else --html: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --pdf: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" - - dist-hook: - echo "***" ---- demos/gtk-demo/Makefile.am.old 2003-06-09 22:58:32.000000000 +0100 -+++ demos/gtk-demo/Makefile.am 2004-03-07 12:25:47.000000000 +0000 -@@ -4,7 +4,7 @@ - - ## These should be in the order you want them to appear in the - ## demo app, which means alphabetized by demo title, not filename --demos = @STRIP_BEGIN@ \ -+demos = \ - appwindow.c \ - button_box.c \ - changedisplay.c \ -@@ -21,10 +21,9 @@ - sizegroup.c \ - stock_browser.c \ - textview.c \ -- tree_store.c \ --@STRIP_END@ -+ tree_store.c - --INCLUDES = @STRIP_BEGIN@ \ -+INCLUDES = \ - -DDEMOCODEDIR="\"$(democodedir)\"" \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ -@@ -33,19 +32,17 @@ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - @GTK_DEBUG_FLAGS@ \ -- @GTK_DEP_CFLAGS@ \ --@STRIP_END@ -+ @GTK_DEP_CFLAGS@ - - DEPS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/@gdktargetlib@ \ - $(top_builddir)/gtk/@gtktargetlib@ - --LDADDS = @STRIP_BEGIN@ \ -+LDADDS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/@gdktargetlib@ \ -- $(top_builddir)/gtk/@gtktargetlib@ \ --@STRIP_END@ -+ $(top_builddir)/gtk/@gtktargetlib@ - - bin_PROGRAMS = gtk-demo - diff --git a/packages/gtk+/gtk+-2.2.4/configure-lossage.patch b/packages/gtk+/gtk+-2.2.4/configure-lossage.patch deleted file mode 100644 index 04b789675d..0000000000 --- a/packages/gtk+/gtk+-2.2.4/configure-lossage.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.in~ 2003-09-04 18:06:42.000000000 +0100 -+++ configure.in 2004-03-07 12:28:12.000000000 +0000 -@@ -963,7 +963,8 @@ - - AC_MSG_CHECKING([For sufficiently new FreeType (at least 2.0.1)]) - AC_TRY_COMPILE([ --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - #include FT_ERRORS_H - ], - [(void)1;],:,have_freetype=false) diff --git a/packages/gtk+/gtk+-2.2.4/glib-2.0.m4 b/packages/gtk+/gtk+-2.2.4/glib-2.0.m4 deleted file mode 100644 index 28ccef4a5f..0000000000 --- a/packages/gtk+/gtk+-2.2.4/glib-2.0.m4 +++ /dev/null @@ -1,212 +0,0 @@ -# Configure paths for GLIB -# Owen Taylor 1997-2001 - -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or -dnl gthread is specified in MODULES, pass to pkg-config -dnl -AC_DEFUN(AM_PATH_GLIB_2_0, -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - pkg_config_args=glib-2.0 - for module in . $4 - do - case "$module" in - gmodule) - pkg_config_args="$pkg_config_args gmodule-2.0" - ;; - gobject) - pkg_config_args="$pkg_config_args gobject-2.0" - ;; - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - esac - done - - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - - no_glib="" - - if test x$PKG_CONFIG != xno ; then - if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then - : - else - echo *** pkg-config too old; version 0.7 or better required. - no_glib=yes - PKG_CONFIG=no - fi - else - no_glib=yes - fi - - min_glib_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" - enable_glibtest=no - fi - - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then - : - else - no_glib=yes - fi - fi - - if test x"$no_glib" = x ; then - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - - GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` - GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include <glib.h> -#include <stdio.h> -#include <stdlib.h> - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.glibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/" - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include <glib.h> -#include <stdio.h> -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - AC_SUBST(GLIB_GENMARSHAL) - AC_SUBST(GOBJECT_QUERY) - AC_SUBST(GLIB_MKENUMS) - rm -f conf.glibtest -]) diff --git a/packages/gtk+/gtk+-2.2.4/glib-gettext.m4 b/packages/gtk+/gtk+-2.2.4/glib-gettext.m4 deleted file mode 100644 index 862db40a93..0000000000 --- a/packages/gtk+/gtk+-2.2.4/glib-gettext.m4 +++ /dev/null @@ -1,380 +0,0 @@ -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor <otaylor@redhat.com>, 12/15/1998 -# -# Major rework to remove unused code -# Owen Taylor <otaylor@redhat.com>, 12/11/2002 -# -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002 - -# -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) - -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl - -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your <locale.h> file defines LC_MESSAGES.]) - fi - fi]) - -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) - -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) - - gt_cv_have_gettext=no - - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= - - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" - - # - # First check in libc - # - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include <libintl.h> -], - [return (int) dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - - if test "$gt_cv_func_dgettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi - - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)]) - - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv) - fi - - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" - - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi - - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) - - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - # We need to process the po/ directory. - POSUB=po - - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) - -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN(GLIB_GNU_GETTEXT, - [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS - - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) - -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN(GLIB_DEFINE_LOCALEDIR, -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) -]) - -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_in,[],[ -AC_DEFUN(AM_GLIB_GNU_GETTEXT,[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl diff --git a/packages/gtk+/gtk+-2.2.4/libtool-lossage.patch b/packages/gtk+/gtk+-2.2.4/libtool-lossage.patch deleted file mode 100644 index d291cbdd69..0000000000 --- a/packages/gtk+/gtk+-2.2.4/libtool-lossage.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.in.orig 2004-03-14 23:30:31.000000000 +0000 -+++ configure.in 2004-03-15 00:00:51.000000000 +0000 -@@ -340,7 +340,7 @@ - AC_MSG_CHECKING([Whether to write dependencies into .pc files]) - case $enable_explicit_deps in - auto) -- deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh` -+ deplib_check_method=`($host_alias-libtool --config; echo eval echo \\$deplib_check_method) | sh` - if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else -@@ -664,7 +664,7 @@ - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then -- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" - pixbuf_deplibs_check=`$pixbuf_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` diff --git a/packages/gtk+/gtk+-2.2.4/no-demos.patch b/packages/gtk+/gtk+-2.2.4/no-demos.patch deleted file mode 100644 index 7a44943d4a..0000000000 --- a/packages/gtk+/gtk+-2.2.4/no-demos.patch +++ /dev/null @@ -1,15 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- gtk+-2.2.4/Makefile.am~no-demos 2003-01-30 22:40:35.000000000 +0100 -+++ gtk+-2.2.4/Makefile.am 2004-03-11 11:49:43.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests contrib - SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros - - # require automake 1.4 diff --git a/packages/gtk+/gtk+-2.2.4/no-xwc.patch b/packages/gtk+/gtk+-2.2.4/no-xwc.patch deleted file mode 100644 index e1ee5cb5c8..0000000000 --- a/packages/gtk+/gtk+-2.2.4/no-xwc.patch +++ /dev/null @@ -1,148 +0,0 @@ ---- gdk/x11/gdkdrawable-x11.c~ 2003-08-18 17:02:39.000000000 +0100 -+++ gdk/x11/gdkdrawable-x11.c 2004-03-29 21:30:17.000000000 +0100 -@@ -636,12 +636,14 @@ - GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); - } - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font); - XmbDrawString (xdisplay, impl->xid, - fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length); - } -+#endif - else - g_error("undefined font type\n"); - } -@@ -673,6 +675,7 @@ - GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length); - g_free (text_8bit); - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - if (sizeof(GdkWChar) == sizeof(wchar_t)) -@@ -693,7 +696,8 @@ - g_free (text_wchar); - } - } -+#endif - else - g_error("undefined font type\n"); - } - ---- gdk/x11/gdkim-x11.c~ 2002-11-01 00:45:32.000000000 +0000 -+++ gdk/x11/gdkim-x11.c 2004-03-29 21:28:30.000000000 +0100 -@@ -51,6 +51,7 @@ - void - _gdk_x11_initialize_locale (void) - { -+#ifdef HAVE_XWC - wchar_t result; - gchar *current_locale; - static char *last_locale = NULL; -@@ -96,6 +97,7 @@ - GDK_NOTE (XIM, - g_message ("%s multi-byte string functions.", - gdk_use_mb ? "Using" : "Not using")); -+#endif - - return; - } -@@ -139,6 +141,7 @@ - { - gchar *mbstr; - -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -177,6 +180,7 @@ - XFree (tpr.value); - } - else -+#endif - { - gint length = 0; - gint i; -@@ -209,6 +213,7 @@ - gint - gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max) - { -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -241,7 +246,8 @@ - return len_cpy; - } - else -+#endif - { - gint i; - - ---- gdk/x11/gdkfont-x11.c~ 2003-03-06 20:17:55.000000000 +0000 -+++ gdk/x11/gdkfont-x11.c 2004-03-29 21:29:40.000000000 +0100 -@@ -594,10 +594,12 @@ - width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - width = XmbTextEscapement (fontset, text, text_length); - break; -+#endif - default: - width = 0; - } -@@ -647,6 +649,7 @@ - width = 0; - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - if (sizeof(GdkWChar) == sizeof(wchar_t)) - { -@@ -664,6 +667,7 @@ - g_free (text_wchar); - } - break; -+#endif - default: - width = 0; - } -@@ -736,6 +740,7 @@ - if (descent) - *descent = overall.descent; - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - XmbTextExtents (fontset, text, text_length, &ink, &logical); -@@ -750,6 +755,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } -@@ -822,6 +828,7 @@ - *descent = overall.descent; - break; - } -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - -@@ -849,6 +856,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } diff --git a/packages/gtk+/gtk+-2.4.13/automake-lossage.patch b/packages/gtk+/gtk+-2.4.13/automake-lossage.patch deleted file mode 100644 index 0d423ddbb9..0000000000 --- a/packages/gtk+/gtk+-2.4.13/automake-lossage.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100 -+++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100 -@@ -52,21 +52,5 @@ - - dist-hook: html - cp -Rp $(srcdir)/html $(distdir) --else --html: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --pdf: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "***" -- --dist-hook: -- echo "***" -- echo "*** Warning: Tutorial not built" -- echo "*** DISTRIBUTION IS INCOMPLETE" -- echo "***" - endif - diff --git a/packages/gtk+/gtk+-2.4.13/disable-tooltips.patch b/packages/gtk+/gtk+-2.4.13/disable-tooltips.patch deleted file mode 100644 index d71d839c3c..0000000000 --- a/packages/gtk+/gtk+-2.4.13/disable-tooltips.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100 -@@ -118,7 +118,7 @@ - tooltips->tips_data_list = NULL; - - tooltips->delay = DEFAULT_DELAY; -- tooltips->enabled = TRUE; -+ tooltips->enabled = FALSE; - tooltips->timer_tag = 0; - tooltips->use_sticky_delay = FALSE; - tooltips->last_popdown.tv_sec = -1; diff --git a/packages/gtk+/gtk+-2.4.13/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.4.13/gtk+-handhelds.patch deleted file mode 100644 index 20481f059b..0000000000 --- a/packages/gtk+/gtk+-2.4.13/gtk+-handhelds.patch +++ /dev/null @@ -1,236 +0,0 @@ ---- 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" - #include "gtkintl.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); - - GType - gtk_arrow_get_type (void) -@@ -111,6 +113,7 @@ - G_PARAM_READABLE | G_PARAM_WRITABLE)); - - widget_class->expose_event = gtk_arrow_expose; -+ widget_class->size_request = gtk_arrow_size_request; - } - - static void -@@ -166,13 +169,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; - } ---- 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 @@ - 0.0, - G_PARAM_READABLE | G_PARAM_WRITABLE)); - -+ 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)); -+ - signals[POPULATE_POPUP] = - g_signal_new ("populate_popup", - G_OBJECT_CLASS_TYPE (gobject_class), -@@ -1124,7 +1133,7 @@ - { - GtkEntry *entry = GTK_ENTRY (widget); - PangoFontMetrics *metrics; -- gint xborder, yborder; -+ gint xborder, yborder, min_width; - PangoContext *context; - - gtk_widget_ensure_style (widget); -@@ -1140,9 +1149,11 @@ - - xborder += INNER_BORDER; - yborder += 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; - 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]; - -+static GdkAtom recognize_protocols_atom, atom_atom; - - GType - gtk_range_get_type (void) -@@ -220,6 +221,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 @@ - &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); - } - -@@ -1186,7 +1196,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; -@@ -1364,7 +1374,7 @@ - return TRUE; - } - -- return FALSE; -+ return TRUE; - } - - /** diff --git a/packages/gtk+/gtk+-2.4.13/gtk-doc.m4 b/packages/gtk+/gtk+-2.4.13/gtk-doc.m4 deleted file mode 100644 index 3ec41666b2..0000000000 --- a/packages/gtk+/gtk+-2.4.13/gtk-doc.m4 +++ /dev/null @@ -1,53 +0,0 @@ -dnl -*- mode: autoconf -*- - -# serial 1 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - dnl for overriding the documentation installation directory - AC_ARG_WITH(html-dir, - AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST(HTML_DIR) - - dnl enable/disable documentation building - AC_ARG_ENABLE(gtk-doc, - AC_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [default=no]]),, - enable_gtk_doc=no) - - have_gtk_doc=no - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then - have_gtk_doc=yes - fi - - dnl do we want to do a version check? -ifelse([$1],[],, - [gtk_doc_min_version=$1 - if test "$have_gtk_doc" = yes; then - AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) - if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - have_gtk_doc=no - fi - fi -]) - if test x$enable_gtk_doc = xyes; then - if test "$have_gtk_doc" != yes; then - enable_gtk_doc=no - fi - fi - - AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) - AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") -]) diff --git a/packages/gtk+/gtk+-2.4.13/gtklabel-resize-patch b/packages/gtk+/gtk+-2.4.13/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.4.13/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.4.13/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.4.13/hardcoded_libtool.patch deleted file mode 100644 index 9da8dd8cf1..0000000000 --- a/packages/gtk+/gtk+-2.4.13/hardcoded_libtool.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- gtk+-2.4.1/configure.in 2004-05-01 02:02:06.000000000 +1000 -+++ gtk+-2.4.1/configure.in 2004-06-03 13:26:41.000000000 +1000 -@@ -350,7 +350,7 @@ - AC_MSG_CHECKING([Whether to write dependencies into .pc files]) - case $enable_explicit_deps in - auto) -- deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh` -+ deplib_check_method=`($host_alias-libtool --config; echo eval echo \\$deplib_check_method) | sh` - if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else -@@ -669,7 +669,7 @@ - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then -- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" - pixbuf_deplibs_check=`$pixbuf_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1441,7 +1441,7 @@ - # export list from -export-symbols-regex is ignored and everything - # is exported - # --export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - if test -n "$export_dynamic"; then - GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` - GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/packages/gtk+/gtk+-2.4.13/menu-deactivate.patch b/packages/gtk+/gtk+-2.4.13/menu-deactivate.patch deleted file mode 100644 index 29e665fbf3..0000000000 --- a/packages/gtk+/gtk+-2.4.13/menu-deactivate.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- gtk+-2.4.4/gtk/gtkmenushell.c.old Thu Aug 26 23:45:28 2004 -+++ gtk+-2.4.4/gtk/gtkmenushell.c Fri Aug 27 00:13:33 2004 -@@ -37,7 +37,7 @@ - #include "gtktearoffmenuitem.h" - #include "gtkwindow.h" - --#define MENU_SHELL_TIMEOUT 500 -+#define MENU_SHELL_TIMEOUT 2000 - - enum { - DEACTIVATE, -@@ -156,6 +156,7 @@ - static GtkContainerClass *parent_class = NULL; - static guint menu_shell_signals[LAST_SIGNAL] = { 0 }; - -+static int last_crossing_time; - - GType - gtk_menu_shell_get_type (void) -@@ -418,6 +419,7 @@ - gtk_grab_add (GTK_WIDGET (menu_shell)); - menu_shell->have_grab = TRUE; - menu_shell->active = TRUE; -+ last_crossing_time = 0; - } - } - -@@ -545,6 +547,13 @@ - menu_shell->activate_time = 0; - deactivate = FALSE; - } -+ -+ if (last_crossing_time != 0 -+ && ((event->time - last_crossing_time) < 500)) -+ { -+ last_crossing_time = 0; -+ deactivate = FALSE; -+ } - - if (deactivate) - { -@@ -597,6 +606,8 @@ - if (menu_shell->active) - { - menu_item = gtk_get_event_widget ((GdkEvent*) event); -+ -+ last_crossing_time = event->time; - - if (!menu_item || - (GTK_IS_MENU_ITEM (menu_item) && diff --git a/packages/gtk+/gtk+-2.4.13/no-demos.patch b/packages/gtk+/gtk+-2.4.13/no-demos.patch deleted file mode 100644 index 2f10a30dda..0000000000 --- a/packages/gtk+/gtk+-2.4.13/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.1/Makefile.am~ 2004-01-17 22:15:56.000000000 +0000 -+++ gtk+-2.4.1/Makefile.am 2004-05-08 12:25:32.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros - - # require automake 1.4 diff --git a/packages/gtk+/gtk+-2.4.13/no-xwc.patch b/packages/gtk+/gtk+-2.4.13/no-xwc.patch deleted file mode 100644 index e1ee5cb5c8..0000000000 --- a/packages/gtk+/gtk+-2.4.13/no-xwc.patch +++ /dev/null @@ -1,148 +0,0 @@ ---- gdk/x11/gdkdrawable-x11.c~ 2003-08-18 17:02:39.000000000 +0100 -+++ gdk/x11/gdkdrawable-x11.c 2004-03-29 21:30:17.000000000 +0100 -@@ -636,12 +636,14 @@ - GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); - } - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font); - XmbDrawString (xdisplay, impl->xid, - fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length); - } -+#endif - else - g_error("undefined font type\n"); - } -@@ -673,6 +675,7 @@ - GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length); - g_free (text_8bit); - } -+#ifdef HAVE_XWC - else if (font->type == GDK_FONT_FONTSET) - { - if (sizeof(GdkWChar) == sizeof(wchar_t)) -@@ -693,7 +696,8 @@ - g_free (text_wchar); - } - } -+#endif - else - g_error("undefined font type\n"); - } - ---- gdk/x11/gdkim-x11.c~ 2002-11-01 00:45:32.000000000 +0000 -+++ gdk/x11/gdkim-x11.c 2004-03-29 21:28:30.000000000 +0100 -@@ -51,6 +51,7 @@ - void - _gdk_x11_initialize_locale (void) - { -+#ifdef HAVE_XWC - wchar_t result; - gchar *current_locale; - static char *last_locale = NULL; -@@ -96,6 +97,7 @@ - GDK_NOTE (XIM, - g_message ("%s multi-byte string functions.", - gdk_use_mb ? "Using" : "Not using")); -+#endif - - return; - } -@@ -139,6 +141,7 @@ - { - gchar *mbstr; - -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -177,6 +180,7 @@ - XFree (tpr.value); - } - else -+#endif - { - gint length = 0; - gint i; -@@ -209,6 +213,7 @@ - gint - gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max) - { -+#ifdef HAVE_XWC - if (gdk_use_mb) - { - GdkDisplay *display = find_a_display (); -@@ -241,7 +246,8 @@ - return len_cpy; - } - else -+#endif - { - gint i; - - ---- gdk/x11/gdkfont-x11.c~ 2003-03-06 20:17:55.000000000 +0000 -+++ gdk/x11/gdkfont-x11.c 2004-03-29 21:29:40.000000000 +0100 -@@ -594,10 +594,12 @@ - width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - width = XmbTextEscapement (fontset, text, text_length); - break; -+#endif - default: - width = 0; - } -@@ -647,6 +649,7 @@ - width = 0; - } - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - if (sizeof(GdkWChar) == sizeof(wchar_t)) - { -@@ -664,6 +667,7 @@ - g_free (text_wchar); - } - break; -+#endif - default: - width = 0; - } -@@ -736,6 +740,7 @@ - if (descent) - *descent = overall.descent; - break; -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - XmbTextExtents (fontset, text, text_length, &ink, &logical); -@@ -750,6 +755,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } -@@ -822,6 +828,7 @@ - *descent = overall.descent; - break; - } -+#ifdef HAVE_XWC - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - -@@ -849,6 +856,7 @@ - if (descent) - *descent = ink.y + ink.height; - break; -+#endif - } - - } diff --git a/packages/gtk+/gtk+-2.4.13/scroll-timings.patch b/packages/gtk+/gtk+-2.4.13/scroll-timings.patch deleted file mode 100644 index a38b21dcc2..0000000000 --- a/packages/gtk+/gtk+-2.4.13/scroll-timings.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gtk+-2.4.4/gtk/gtkrange.c~ 2004-08-23 01:50:22.000000000 +0100 -+++ gtk+-2.4.4/gtk/gtkrange.c 2004-08-27 15:48:49.000000000 +0100 -@@ -35,9 +35,9 @@ - #include "gtkintl.h" - #include "gtkscrollbar.h" - --#define SCROLL_INITIAL_DELAY 250 /* must hold button this long before ... */ --#define SCROLL_LATER_DELAY 100 /* ... it starts repeating at this rate */ --#define UPDATE_DELAY 300 /* Delay for queued update */ -+#define SCROLL_INITIAL_DELAY 500 /* must hold button this long before ... */ -+#define SCROLL_LATER_DELAY 200 /* ... it starts repeating at this rate */ -+#define UPDATE_DELAY 1000 /* Delay for queued update */ - - enum { - PROP_0, diff --git a/packages/gtk+/gtk+-2.4.13/single-click.patch b/packages/gtk+/gtk+-2.4.13/single-click.patch deleted file mode 100644 index 21adb9b7b0..0000000000 --- a/packages/gtk+/gtk+-2.4.13/single-click.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urNd ../gtk+-2.4.4-r7/gtk+-2.4.4/gtk/gtkcalendar.c gtk+-2.4.4/gtk/gtkcalendar.c ---- ../gtk+-2.4.4-r7/gtk+-2.4.4/gtk/gtkcalendar.c 2004-07-10 05:02:10.000000000 +0100 -+++ gtk+-2.4.4/gtk/gtkcalendar.c 2004-09-18 12:41:28.000000000 +0100 -@@ -1026,9 +1026,8 @@ - private_data->drag_start_y = y; - - gtk_calendar_select_and_focus_day (calendar, day); -- } -- else if (event->type == GDK_2BUTTON_PRESS) -- { -+ -+ // Double-click action follows - private_data->in_drag = 0; - if (day_month == MONTH_CURRENT) - g_signal_emit (calendar, -diff -urNd ../gtk+-2.4.4-r7/gtk+-2.4.4/gtk/gtktreeview.c gtk+-2.4.4/gtk/gtktreeview.c ---- ../gtk+-2.4.4-r7/gtk+-2.4.4/gtk/gtktreeview.c 2004-07-10 05:02:11.000000000 +0100 -+++ gtk+-2.4.4/gtk/gtktreeview.c 2004-09-18 13:49:23.000000000 +0100 -@@ -2180,7 +2180,8 @@ - tree_view->priv->focus_column = column; - - /* decide if we edit */ -- if (event->type == GDK_BUTTON_PRESS && event->button == 1 && -+ /* Changed from button 1 to 2 so as not to conflict with the single-click activation */ -+ if (event->type == GDK_BUTTON_PRESS && event->button == 2 && - !(event->state & gtk_accelerator_get_default_mod_mask ())) - { - GtkTreePath *anchor; -@@ -2305,16 +2306,13 @@ - /* Test if a double click happened on the same row. */ - if (event->button == 1) - { -- /* We also handle triple clicks here, because a user could have done -- * a first click and a second double click on different rows. -+ /* Replaced double/triple click with single-click for PDAs. - */ -- if ((event->type == GDK_2BUTTON_PRESS -- || event->type == GDK_3BUTTON_PRESS) -- && tree_view->priv->last_button_press) -+ if (event->type == GDK_BUTTON_PRESS) - { - GtkTreePath *lsc; - -- lsc = gtk_tree_row_reference_get_path (tree_view->priv->last_button_press); -+ lsc = gtk_tree_row_reference_get_path (tree_view->priv->cursor); - - if (lsc) - { diff --git a/packages/gtk+/gtk+-2.4.13/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.4.13/small-gtkfilesel.patch deleted file mode 100644 index 20bf4cf366..0000000000 --- a/packages/gtk+/gtk+-2.4.13/small-gtkfilesel.patch +++ /dev/null @@ -1,267 +0,0 @@ -diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c ---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 -+++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100 -@@ -68,6 +68,7 @@ - #include "gtkprivate.h" - #include "gtkscrolledwindow.h" - #include "gtkstock.h" -+#include "gtksignal.h" - #include "gtktreeselection.h" - #include "gtktreeview.h" - #include "gtkvbox.h" -@@ -77,6 +78,7 @@ - #include "gtkmessagedialog.h" - #include "gtkdnd.h" - #include "gtkeventbox.h" -+#include "gtkimage.h" - - #undef GTK_DISABLE_DEPRECATED - #include "gtkoptionmenu.h" -@@ -245,7 +247,8 @@ - }; - - enum { -- DIR_COLUMN -+ DIR_COLUMN, -+ ISFILE_COLUMN - }; - - enum { -@@ -400,6 +403,12 @@ - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data); -+ -+static void gtk_file_selection_activate (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GtkTreeViewColumn *column, -+ gpointer user_data); -+ - static void gtk_file_selection_file_changed (GtkTreeSelection *selection, - gpointer user_data); - static void gtk_file_selection_dir_activate (GtkTreeView *tree_view, -@@ -419,6 +428,7 @@ - static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data); - static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data); - static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data); -+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style); - - static void free_selected_names (GPtrArray *names); - -@@ -578,6 +588,23 @@ - G_PARAM_WRITABLE)); - object_class->destroy = gtk_file_selection_destroy; - widget_class->map = gtk_file_selection_map; -+ widget_class->style_set = gtk_file_selection_style_set; -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_boolean ("show_fileops_default", -+ _("Show fileop buttons by default"), -+ _("Whether file operation buttons are shown by default"), -+ TRUE, -+ G_PARAM_READABLE)); -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("border_width", -+ _("Border width"), -+ _("Width of border around the main dialog area"), -+ 0, -+ G_MAXINT, -+ 10, -+ G_PARAM_READABLE)); - } - - static void gtk_file_selection_set_property (GObject *object, -@@ -649,7 +676,29 @@ - gtk_widget_grab_default (widget); - return FALSE; - } -- -+ -+static void -+gtk_file_selection_style_set (GtkWidget *filesel, -+ GtkStyle *prev_style) -+{ -+ gboolean show_fileops; -+ gint border_width; -+ -+ gtk_widget_style_get (filesel, -+ "show_fileops_default", -+ &show_fileops, -+ "border_width", -+ &border_width, -+ NULL); -+ -+ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width); -+ -+ if (show_fileops) -+ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel)); -+ else -+ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel)); -+} -+ - static void - gtk_file_selection_init (GtkFileSelection *filesel) - { -@@ -674,17 +723,15 @@ - - /* The dialog-sized vertical box */ - filesel->main_vbox = dialog->vbox; -- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); - - /* The horizontal box containing create, rename etc. buttons */ - filesel->button_area = gtk_hbutton_box_new (); - gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START); -- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, - FALSE, FALSE, 0); - gtk_widget_show (filesel->button_area); - -- gtk_file_selection_show_fileop_buttons (filesel); -+ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL); - - /* hbox for pulldown menu */ - pulldown_hbox = gtk_hbox_new (TRUE, 5); -@@ -723,25 +770,32 @@ - - /* The directories list */ - -- model = gtk_list_store_new (1, G_TYPE_STRING); -+ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */ - filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); - g_object_unref (model); - -- column = gtk_tree_view_column_new_with_attributes (_("Folders"), -+ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL, - gtk_cell_renderer_text_new (), - "text", DIR_COLUMN, - NULL); - label = gtk_label_new_with_mnemonic (_("Fol_ders")); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list); - gtk_widget_show (label); -- gtk_tree_view_column_set_widget (column, label); -+ -+ /* gtk_tree_view_column_set_widget (column, label); */ -+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE); -+ - gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); - gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column); - - gtk_widget_set_size_request (filesel->dir_list, - DIR_LIST_WIDTH, DIR_LIST_HEIGHT); - g_signal_connect (filesel->dir_list, "row_activated", -- G_CALLBACK (gtk_file_selection_dir_activate), filesel); -+ G_CALLBACK (gtk_file_selection_activate), filesel); -+ -+ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed", -+ G_CALLBACK (gtk_file_selection_file_changed), filesel); -+ - - /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */ - -@@ -758,41 +812,6 @@ - gtk_widget_show (filesel->dir_list); - gtk_widget_show (scrolled_win); - -- /* The files list */ -- model = gtk_list_store_new (1, G_TYPE_STRING); -- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); -- g_object_unref (model); -- -- column = gtk_tree_view_column_new_with_attributes (_("Files"), -- gtk_cell_renderer_text_new (), -- "text", FILE_COLUMN, -- NULL); -- label = gtk_label_new_with_mnemonic (_("_Files")); -- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list); -- gtk_widget_show (label); -- gtk_tree_view_column_set_widget (column, label); -- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); -- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column); -- -- gtk_widget_set_size_request (filesel->file_list, -- FILE_LIST_WIDTH, FILE_LIST_HEIGHT); -- g_signal_connect (filesel->file_list, "row_activated", -- G_CALLBACK (gtk_file_selection_file_activate), filesel); -- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed", -- G_CALLBACK (gtk_file_selection_file_changed), filesel); -- -- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */ -- -- scrolled_win = gtk_scrolled_window_new (NULL, NULL); -- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); -- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list); -- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), -- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); -- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0); -- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win); -- gtk_widget_show (filesel->file_list); -- gtk_widget_show (scrolled_win); -- - /* action area for packing buttons into. */ - filesel->action_area = gtk_hbox_new (TRUE, 0); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, -@@ -2008,6 +2027,23 @@ - } - - static void -+gtk_file_selection_activate (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GtkTreeViewColumn *column, -+ gpointer user_data) -+{ -+ GtkTreeModel *model = gtk_tree_view_get_model (tree_view); -+ GtkTreeIter iter; -+ gboolean is_file; -+ -+ gtk_tree_model_get_iter (model, &iter, path); -+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); -+ -+ if (! is_file) -+ gtk_file_selection_dir_activate (tree_view, path, column, user_data); -+} -+ -+static void - gtk_file_selection_file_activate (GtkTreeView *tree_view, - GtkTreePath *path, - GtkTreeViewColumn *column, -@@ -2103,7 +2139,6 @@ - PossibleCompletion* poss; - GtkTreeIter iter; - GtkListStore *dir_model; -- GtkListStore *file_model; - gchar* filename; - gchar* rem_path = rel_path; - gchar* sel_text; -@@ -2125,10 +2160,8 @@ - g_assert (cmpl_state->reference_dir); - - dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list))); -- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list))); - - gtk_list_store_clear (dir_model); -- gtk_list_store_clear (file_model); - - /* Set the dir list to include ./ and ../ */ - gtk_list_store_append (dir_model, &iter); -@@ -2150,13 +2183,17 @@ - strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0) - { - gtk_list_store_append (dir_model, &iter); -- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1); -+ gtk_list_store_set (dir_model, &iter, -+ DIR_COLUMN, filename, -+ ISFILE_COLUMN, FALSE, -1); - } - } - else - { -- gtk_list_store_append (file_model, &iter); -- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1); -+ gtk_list_store_append (dir_model, &iter); -+ gtk_list_store_set (dir_model, &iter, -+ DIR_COLUMN, filename, -+ ISFILE_COLUMN, TRUE, -1); - } - } - diff --git a/packages/gtk+/gtk+-2.4.13/spinbutton.patch b/packages/gtk+/gtk+-2.4.13/spinbutton.patch deleted file mode 100644 index 8ad7507af0..0000000000 --- a/packages/gtk+/gtk+-2.4.13/spinbutton.patch +++ /dev/null @@ -1,128 +0,0 @@ ---- gtk+-2.4.3/gtk/gtkspinbutton.c.old 2004-04-22 14:49:27.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtkspinbutton.c 2004-06-30 21:48:18.000000000 +0100 -@@ -733,7 +733,7 @@ - - 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; - -@@ -866,19 +866,16 @@ - { - 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)) -@@ -908,32 +905,17 @@ - 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 */ -@@ -1108,7 +1090,7 @@ - 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); -@@ -1143,44 +1125,11 @@ - - 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 (parent_class)->button_release_event (widget, event); -+ return TRUE; - } - - static gint diff --git a/packages/gtk+/gtk+-2.4.13/xsettings.patch b/packages/gtk+/gtk+-2.4.13/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.4.13/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+_2.2.4.bb b/packages/gtk+/gtk+_2.2.4.bb deleted file mode 100644 index eb308edca2..0000000000 --- a/packages/gtk+/gtk+_2.2.4.bb +++ /dev/null @@ -1,77 +0,0 @@ -LICENSE = "LGPL" -DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ -set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." -HOMEPAGE = "http://www.gtk.org" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "pango atk jpeg libpng libxext" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.2/gtk+-${PV}.tar.bz2 \ - http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2;patch=1;pnum=1 \ - file://automake-lossage.patch;patch=1;pnum=0 \ - file://configure-lossage.patch;patch=1;pnum=0 \ - file://no-demos.patch;patch=1 \ - file://libtool-lossage.patch;patch=1;pnum=0 \ - file://no-xwc.patch;patch=1;pnum=0 \ - file://glib-2.0.m4 \ - file://glib-gettext.m4" - -inherit autotools pkgconfig - -do_configure_prepend() { - install -d m4 - install ${WORKDIR}/glib-2.0.m4 m4/ - install ${WORKDIR}/glib-gettext.m4 m4/ -} - -EXTRA_OECONF = "--without-libtiff --enable-debug=no --disable-cruft" - -LIBV = "2.2.0" - -gtk_include = "gtk.h gtkaccelgroup.h gtkaccellabel.h gtkaccelmap.h gtkaccessible.h gtkadjustment.h gtkalignment.h gtkarrow.h gtkaspectframe.h gtkbbox.h gtkbin.h gtkbindings.h gtkbox.h gtkbutton.h gtkcalendar.h gtkcelleditable.h gtkcellrenderer.h gtkcellrendererpixbuf.h gtkcellrenderertext.h gtkcellrenderertoggle.h gtkcheckbutton.h gtkcheckmenuitem.h gtkclipboard.h gtkclist.h gtkcolorsel.h gtkcolorseldialog.h gtkcombo.h gtkcontainer.h gtkctree.h gtkcurve.h gtkdebug.h gtkdialog.h gtkdnd.h gtkdrawingarea.h gtkeditable.h gtkentry.h gtkenums.h gtkeventbox.h gtkfilesel.h gtkfixed.h gtkfontsel.h gtkframe.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h gtkhbox.h gtkhpaned.h gtkhruler.h gtkhscale.h gtkhscrollbar.h gtkhseparator.h gtkiconfactory.h gtkimage.h gtkimagemenuitem.h gtkimcontext.h gtkimcontextsimple.h gtkimmodule.h gtkimmulticontext.h gtkinputdialog.h gtkinvisible.h gtkitem.h gtkitemfactory.h gtklabel.h gtklayout.h gtklist.h gtklistitem.h gtkliststore.h gtkmain.h gtkmarshal.h gtkmenu.h gtkmenubar.h gtkmenuitem.h gtkmenushell.h gtkmessagedialog.h gtkmisc.h gtknotebook.h gtkobject.h gtkoldeditable.h gtkoptionmenu.h gtkpaned.h gtkpixmap.h gtkplug.h gtkpreview.h gtkprivate.h gtkprogress.h gtkprogressbar.h gtkradiobutton.h gtkradiomenuitem.h gtkrange.h gtkrc.h gtkruler.h gtkscale.h gtkscrollbar.h gtkscrolledwindow.h gtkselection.h gtkseparator.h gtkseparatormenuitem.h gtksettings.h gtksignal.h gtksizegroup.h gtksocket.h gtkspinbutton.h gtkstatusbar.h gtkstock.h gtkstyle.h gtktable.h gtktearoffmenuitem.h gtktext.h gtktextbuffer.h gtktextchild.h gtktextdisplay.h gtktextiter.h gtktextlayout.h gtktextmark.h gtktexttag.h gtktexttagtable.h gtktextview.h gtktipsquery.h gtktogglebutton.h gtktoolbar.h gtktooltips.h gtktree.h gtktreednd.h gtktreeitem.h gtktreemodel.h gtktreemodelsort.h gtktreeselection.h gtktreesortable.h gtktreestore.h gtktreeview.h gtktreeviewcolumn.h gtktypebuiltins.h gtktypeutils.h gtkvbbox.h gtkvbox.h gtkversion.h gtkviewport.h gtkvpaned.h gtkvruler.h gtkvscale.h gtkvscrollbar.h gtkvseparator.h gtkwidget.h gtkwindow.h" -gdk_include = "gdk.h gdkcolor.h gdkcursor.h gdkdisplay.h gdkdisplaymanager.h gdkdnd.h gdkdrawable.h gdkenumtypes.h gdkevents.h gdkfont.h gdkgc.h gdki18n.h gdkimage.h gdkinput.h gdkkeys.h gdkkeysyms.h gdkpango.h gdkpixbuf.h gdkpixmap.h gdkprivate.h gdkproperty.h gdkregion.h gdkrgb.h gdkscreen.h gdkselection.h gdktypes.h gdkvisual.h gdkwindow.h x11/gdkx.h" -gdk_pixbuf_include = "gdk-pixbuf-animation.h gdk-pixbuf-enum-types.h gdk-pixbuf-features.h gdk-pixbuf-io.h gdk-pixbuf-loader.h gdk-pixbuf-marshal.h gdk-pixbuf.h gdk-pixdata.h" - -do_stage () { - oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR} - - mkdir -p ${STAGING_INCDIR}/gtk-2.0/gtk - for i in ${gtk_include}; do - install -m 0644 gtk/$i ${STAGING_INCDIR}/gtk-2.0/gtk/$i - done - - mkdir -p ${STAGING_INCDIR}/gtk-2.0/gdk - for i in ${gdk_include}; do - install -m 0644 gdk/$i ${STAGING_INCDIR}/gtk-2.0/gdk/`basename $i` - done - - mkdir -p ${STAGING_INCDIR}/gtk-2.0/gdk-pixbuf - for i in ${gdk_pixbuf_include}; do - install -m 0644 gdk-pixbuf/$i ${STAGING_INCDIR}/gtk-2.0/gdk-pixbuf/$i - done - - mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include - install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h - - install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/ -} - -do_install_append () { - install -d ${D}${sysconfdir}/gtk-2.0 -} - -PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*" - -python populate_packages_prepend () { - import os.path - - gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) - loaders_root = os.path.join(gtk_libdir, 'loaders') - immodules_root = os.path.join(gtk_libdir, 'immodules') - - do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders') - do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules') -} diff --git a/packages/gtk+/gtk+_2.4.13.bb b/packages/gtk+/gtk+_2.4.13.bb deleted file mode 100644 index 83f6be1982..0000000000 --- a/packages/gtk+/gtk+_2.4.13.bb +++ /dev/null @@ -1,78 +0,0 @@ -LICENSE = "LGPL" -DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ -set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." -HOMEPAGE = "http://www.gtk.org" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor" -PR = "r7" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \ - file://no-demos.patch;patch=1 \ - file://no-xwc.patch;patch=1;pnum=0 \ - file://automake-lossage.patch;patch=1 \ - file://gtk+-handhelds.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://spinbutton.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://gtk-doc.m4 \ - file://small-gtkfilesel.patch;patch=1 \ - file://single-click.patch;patch=1" - -inherit autotools pkgconfig flow-lossage - -do_configure_prepend() { - install -d m4 - install ${WORKDIR}/gtk-doc.m4 m4/ -} - -FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ - ${bindir}/gtk-query-immodules-2.0 \ - ${libdir}/lib*.so.* \ - ${datadir}/themes ${sysconfdir}" -FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" - -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" - -EXTRA_OECONF = "--without-libtiff --disable-xkb" -# --disable-cruft - -LIBV = "2.4.0" - -do_stage () { - oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR} - - autotools_stage_includes - - mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include - install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h - - install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/ -} - -do_install_append () { - install -d ${D}${sysconfdir}/gtk-2.0 -} - -PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*" - -python populate_packages_prepend () { - import os.path - - gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) - loaders_root = os.path.join(gtk_libdir, 'loaders') - immodules_root = os.path.join(gtk_libdir, 'immodules') - - do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders') - do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules') - - if (bb.data.getVar('DEBIAN_NAMES', d, 1)): - bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) -} |