7122af5f6f
* Add a missing libatk1.0-dev (>= 1.9.0) build-dep for ATK.
* Replace GTK_BINARY_VERSION in debian/*.in to set the binary version of
binary modules; it is set via debian/scripts/vars and currently in use in
update-gdkpixbuf-loaders.in and update-gtk-immodules.in.
* Remove fake support for version argument from update-gdkpixbuf-loaders and
update-gtk-immodules.
* New upstream development releases with API additions, and non-public API
changes and removals.
- Target at experimental.
- Update copyright from AUTHORS.
- Update upstream URL.
- Bump up libglib2.0-dev build-dep to >= 2.12.0.
- Add a libdirectfb-dev (>= 0.9.24) build-dep for DirectFB.
- Add a libcupsys2-dev (>= 1.2) build-dep for CUPS printing backend.
- Bump shlibs to >= 2.10.0.
- Update list of docs to ship.
- Update watch file to track stable releases and use HTTP.
- Set GTK_BINARY_VERSION to 2.10.0.
- Replace 001_gtk+-2.2.0-buildfix-immodule patch with
001_static-linking-dont-query-immodules which has more chances to be
merged upstream.
- Drop 006_gtk+-2.8.17-directfb patch, merged upstream.
- Refresh patches: 000_gtk+-2.0.6-exportsymbols,
003_default_fallback_icon_theme,
004_gtk+-ximian-gtk2-filesel-navbutton-5,
007_implicit_pointer_conversion_gdkdrawable_directfb.
- Update 070_mandatory-relibtoolize with libtoolize --force --copy &&
aclocal-1.7 -I m4macros && autoconf && automake-1.7.
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
diff -urN gtk+-2.10.1.orig/configure.in gtk+-2.10.1/configure.in
|
|
--- gtk+-2.10.1.orig/configure.in 2006-08-15 00:12:10.000000000 +0200
|
|
+++ gtk+-2.10.1/configure.in 2006-08-15 10:09:55.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
|
|
diff -urN gtk+-2.10.1.orig/modules/input/Makefile.am gtk+-2.10.1/modules/input/Makefile.am
|
|
--- gtk+-2.10.1.orig/modules/input/Makefile.am 2006-01-29 05:00:45.000000000 +0100
|
|
+++ gtk+-2.10.1/modules/input/Makefile.am 2006-08-15 10:09:55.000000000 +0200
|
|
@@ -89,8 +89,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.
|
|
@@ -130,7 +134,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
|
|
|