7be20e6e17
* New upstream release.
* Refresh patches.
* 022_gtkcupsutils_multipage.patch: removed, integrated upstream.
* Regenerate 070_mandatory-relibtoolize.patch.
* 014_gtktreeview_missing-icons.patch: update patch with the upstream
fix that was committed.
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
Index: gtk+-2.10.7/configure.in
|
|
===================================================================
|
|
--- gtk+-2.10.7.orig/configure.in 2007-01-09 23:18:48.410353000 +0100
|
|
+++ gtk+-2.10.7/configure.in 2007-01-09 23:18:59.591051750 +0100
|
|
@@ -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.10.7/modules/input/Makefile.am
|
|
===================================================================
|
|
--- gtk+-2.10.7.orig/modules/input/Makefile.am 2007-01-05 19:36:21.000000000 +0100
|
|
+++ gtk+-2.10.7/modules/input/Makefile.am 2007-01-09 23:18:59.591051750 +0100
|
|
@@ -94,8 +94,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.
|
|
@@ -135,7 +139,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
|
|
|