aboutsummaryrefslogtreecommitdiffstats
path: root/packages/gtk+/gtk+-2.2.4
diff options
context:
space:
mode:
Diffstat (limited to 'packages/gtk+/gtk+-2.2.4')
-rw-r--r--packages/gtk+/gtk+-2.2.4/.mtn2git_empty0
-rw-r--r--packages/gtk+/gtk+-2.2.4/automake-lossage.patch446
-rw-r--r--packages/gtk+/gtk+-2.2.4/configure-lossage.patch12
-rw-r--r--packages/gtk+/gtk+-2.2.4/glib-2.0.m4212
-rw-r--r--packages/gtk+/gtk+-2.2.4/glib-gettext.m4380
-rw-r--r--packages/gtk+/gtk+-2.2.4/libtool-lossage.patch20
-rw-r--r--packages/gtk+/gtk+-2.2.4/no-demos.patch15
-rw-r--r--packages/gtk+/gtk+-2.2.4/no-xwc.patch148
8 files changed, 1233 insertions, 0 deletions
diff --git a/packages/gtk+/gtk+-2.2.4/.mtn2git_empty b/packages/gtk+/gtk+-2.2.4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk+/gtk+-2.2.4/.mtn2git_empty
diff --git a/packages/gtk+/gtk+-2.2.4/automake-lossage.patch b/packages/gtk+/gtk+-2.2.4/automake-lossage.patch
index e69de29bb2..9560abf9ba 100644
--- a/packages/gtk+/gtk+-2.2.4/automake-lossage.patch
+++ b/packages/gtk+/gtk+-2.2.4/automake-lossage.patch
@@ -0,0 +1,446 @@
+--- 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
index e69de29bb2..04b789675d 100644
--- a/packages/gtk+/gtk+-2.2.4/configure-lossage.patch
+++ b/packages/gtk+/gtk+-2.2.4/configure-lossage.patch
@@ -0,0 +1,12 @@
+--- 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
index e69de29bb2..28ccef4a5f 100644
--- a/packages/gtk+/gtk+-2.2.4/glib-2.0.m4
+++ b/packages/gtk+/gtk+-2.2.4/glib-2.0.m4
@@ -0,0 +1,212 @@
+# 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, &micro) != 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
index e69de29bb2..862db40a93 100644
--- a/packages/gtk+/gtk+-2.2.4/glib-gettext.m4
+++ b/packages/gtk+/gtk+-2.2.4/glib-gettext.m4
@@ -0,0 +1,380 @@
+# 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
index e69de29bb2..d291cbdd69 100644
--- a/packages/gtk+/gtk+-2.2.4/libtool-lossage.patch
+++ b/packages/gtk+/gtk+-2.2.4/libtool-lossage.patch
@@ -0,0 +1,20 @@
+--- 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
index e69de29bb2..7a44943d4a 100644
--- a/packages/gtk+/gtk+-2.2.4/no-demos.patch
+++ b/packages/gtk+/gtk+-2.2.4/no-demos.patch
@@ -0,0 +1,15 @@
+
+#
+# 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
index e69de29bb2..e1ee5cb5c8 100644
--- a/packages/gtk+/gtk+-2.2.4/no-xwc.patch
+++ b/packages/gtk+/gtk+-2.2.4/no-xwc.patch
@@ -0,0 +1,148 @@
+--- 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
+ }
+
+ }
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-28 18:08:58 +0000