* New upstream release series; these are development releases, the new API
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
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
Index: gtk+2.0-2.10.10/configure.in
|
||||
Index: gtk+2.0-2.11.2/configure.in
|
||||
===================================================================
|
||||
--- gtk+2.0-2.10.10.orig/configure.in 2007-03-13 14:10:00.000000000 +0100
|
||||
+++ gtk+2.0-2.10.10/configure.in 2007-03-13 14:10:04.000000000 +0100
|
||||
--- 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
|
||||
@ -10,11 +10,11 @@ Index: gtk+2.0-2.10.10/configure.in
|
||||
|
||||
if test "$os_win32" = "yes"; then
|
||||
if test x$enable_static = xyes -o x$enable_static = x; then
|
||||
Index: gtk+2.0-2.10.10/modules/input/Makefile.am
|
||||
Index: gtk+2.0-2.11.2/modules/input/Makefile.am
|
||||
===================================================================
|
||||
--- gtk+2.0-2.10.10.orig/modules/input/Makefile.am 2007-03-12 14:58:52.000000000 +0100
|
||||
+++ gtk+2.0-2.10.10/modules/input/Makefile.am 2007-03-13 14:10:04.000000000 +0100
|
||||
@@ -94,8 +94,12 @@
|
||||
--- 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
|
||||
@ -27,7 +27,7 @@ Index: gtk+2.0-2.10.10/modules/input/Makefile.am
|
||||
|
||||
# Running this if cross compiling or if DESTDIR is set is going to
|
||||
# not work at all, so skip it.
|
||||
@@ -135,7 +139,18 @@
|
||||
@@ -148,7 +152,18 @@
|
||||
$(IM_IME_MODULE)
|
||||
|
||||
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
|
||||
|
||||
Reference in New Issue
Block a user