be42e9ad9a
may still change incompatibly.
- Target at experimental; include check-dist.
- Bump shlibs to >= 2.11.2.
- Refresh patches 001_static-linking-dont-query-immodules, 005_xpmico,
009_gtk-export-filechooser, 015_default-fallback-icon-theme,
033_treeview_resizing, 041_ia32-libs to apply cleanly.
- Update patch 021_loader-files-d to apply with the upstream G_MODULE
changes and the support for included modules.
- Update patch 030_gtkentry_password-char-circle to apply.
- Drop patch 031_cursor-blinking-timeout, merged upstream.
- Disable 040_filechooser_single-click for now as it doesn't apply cleanly
and doesn't seem critical; add a description and cross-refs.
- Update relibtoolizing patch, 070_mandatory-relibtoolize.
- Bump up libglib2.0-dev build-dep to >= 2.13.1.
* XXX WIP XXX
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
Index: gtk+2.0-2.11.2/configure.in
|
|
===================================================================
|
|
--- gtk+2.0-2.11.2.orig/configure.in 2007-06-06 15:02:43.000000000 +0200
|
|
+++ gtk+2.0-2.11.2/configure.in 2007-06-13 11:06:48.000000000 +0200
|
|
@@ -134,6 +134,7 @@
|
|
dnl Initialize libtool
|
|
AC_PROG_CC
|
|
AM_DISABLE_STATIC
|
|
+AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes])
|
|
|
|
if test "$os_win32" = "yes"; then
|
|
if test x$enable_static = xyes -o x$enable_static = x; then
|
|
Index: gtk+2.0-2.11.2/modules/input/Makefile.am
|
|
===================================================================
|
|
--- gtk+2.0-2.11.2.orig/modules/input/Makefile.am 2007-06-06 13:43:17.000000000 +0200
|
|
+++ gtk+2.0-2.11.2/modules/input/Makefile.am 2007-06-13 11:06:48.000000000 +0200
|
|
@@ -106,8 +106,12 @@
|
|
if CROSS_COMPILING
|
|
RUN_QUERY_IMMODULES_TEST=false
|
|
else
|
|
+if ENABLE_STATIC
|
|
+RUN_QUERY_IMMODULES_TEST=false
|
|
+else
|
|
RUN_QUERY_IMMODULES_TEST=test -z "$(DESTDIR)"
|
|
endif
|
|
+endif
|
|
|
|
# Running this if cross compiling or if DESTDIR is set is going to
|
|
# not work at all, so skip it.
|
|
@@ -148,7 +152,18 @@
|
|
$(IM_IME_MODULE)
|
|
|
|
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
|
|
- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
|
|
+ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
|
|
+ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \
|
|
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \
|
|
+ else \
|
|
+ echo "***" ; \
|
|
+ echo "*** Warning: gtk.immodules not built" ; \
|
|
+ echo "***" ; \
|
|
+ echo "*** Generate this file manually on host" ; \
|
|
+ echo "*** system using gtk-query-immodules-2.0" ; \
|
|
+ echo "***" ; \
|
|
+ touch gtk.immodules; \
|
|
+ fi
|
|
|
|
CLEANFILES = gtk.immodules
|
|
|