callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* refresh and update patches

Browse Source
This commit is contained in:
Sebastian Dröge
2010-07-30 17:16:49 +00:00
parent df3cc26484
commit f768275558
15 changed files with 1694 additions and 2833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/libgtk3.0-0.postinst.in vendored
View File

@ -10,7 +10,7 @@ if [ "$1" = triggered ]; then
/@MODULES_BASE_PATH@/immodules) /@MODULES_BASE_PATH@/immodules)
# This is triggered everytime an application installs a # This is triggered everytime an application installs a
# GTK immodule loader # GTK immodule loader
/@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 /@MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/gtk.immodules || true /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 /@MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/immodules.cache || true
;; ;;
esac esac
done done
@ -21,6 +21,6 @@ fi
# Also handle the initial installation # Also handle the initial installation
if [ -d /@MODULES_BASE_PATH@/immodules ]; then if [ -d /@MODULES_BASE_PATH@/immodules ]; then
/@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 /@MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/gtk.immodules || true /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 /@MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/immodules.cache || true
fi fi

2
debian/libgtk3.0-0.postrm.in vendored
View File

@ -12,6 +12,6 @@ esac
if [ -d /@MODULES_BASE_PATH@/immodules ]; then if [ -d /@MODULES_BASE_PATH@/immodules ]; then
# Purge the cache # Purge the cache
rm -f /@MODULES_BASE_PATH@/gtk.immodules rm -f /@MODULES_BASE_PATH@/immodules.cache
rmdir -p --ignore-fail-on-non-empty /@MODULES_BASE_PATH@ rmdir -p --ignore-fail-on-non-empty /@MODULES_BASE_PATH@
fi fi

47
debian/patches/001_static-linking-dont-query-immodules.patch vendored
View File

@ -2,22 +2,23 @@ Description: Don't query immodules for the local tree when cross-compiling or
when --disable-shared was given when --disable-shared was given
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531 Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
Index: gtk+2.0-2.21.5/configure.in Index: gtk+3.0-2.90.5/configure.ac
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/configure.in 2010-07-12 18:23:54.000000000 +0200 --- gtk+3.0-2.90.5.orig/configure.ac 2010-07-10 03:00:32.000000000 +0200
+++ gtk+2.0-2.21.5/configure.in 2010-07-22 17:53:08.402066616 +0200 +++ gtk+3.0-2.90.5/configure.ac 2010-07-30 12:46:09.735086524 +0200
@@ -150,6 +150,7 @@ @@ -188,6 +188,8 @@
dnl Initialize libtool # Create libtool early, because it's used in configure
AC_PROG_CC LT_OUTPUT
AM_DISABLE_STATIC
+AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes])
dnl +AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes])
dnl Check for a working C++ compiler, but do not bail out, if none is found. +
Index: gtk+2.0-2.21.5/modules/input/Makefile.am # Make sure we use 64-bit versions of various file stuff.
AC_SYS_LARGEFILE
Index: gtk+3.0-2.90.5/modules/input/Makefile.am
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/modules/input/Makefile.am 2010-07-12 18:23:45.000000000 +0200 --- gtk+3.0-2.90.5.orig/modules/input/Makefile.am 2010-06-30 13:37:21.000000000 +0200
+++ gtk+2.0-2.21.5/modules/input/Makefile.am 2010-07-22 17:53:08.406083537 +0200 +++ gtk+3.0-2.90.5/modules/input/Makefile.am 2010-07-30 12:45:30.532083145 +0200
@@ -176,8 +176,12 @@ @@ -176,8 +176,12 @@
if CROSS_COMPILING if CROSS_COMPILING
RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_IMMODULES_TEST=false
@ -31,23 +32,3 @@ Index: gtk+2.0-2.21.5/modules/input/Makefile.am
# Running this if cross compiling or if DESTDIR is set is going to # Running this if cross compiling or if DESTDIR is set is going to
# not work at all, so skip it. # not work at all, so skip it.
@@ -238,7 +242,18 @@
included-modules: $(noinst_LTLIBRARIES)
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

8
debian/patches/002_static-linking-dont-build-perf.patch vendored
View File

@ -1,10 +1,10 @@
Description: don't build perf measurement tools in static builds Description: don't build perf measurement tools in static builds
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346559 Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346559
Index: gtk+2.0-2.21.5/Makefile.am Index: gtk+3.0-2.90.5/Makefile.am
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/Makefile.am 2010-07-12 18:23:43.000000000 +0200 --- gtk+3.0-2.90.5.orig/Makefile.am 2010-06-30 13:37:16.000000000 +0200
+++ gtk+2.0-2.21.5/Makefile.am 2010-07-22 17:54:31.193051851 +0200 +++ gtk+3.0-2.90.5/Makefile.am 2010-07-30 18:57:46.184082799 +0200
@@ -1,7 +1,12 @@ @@ -1,7 +1,12 @@
## Makefile.am for GTK+ ## Makefile.am for GTK+
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
@ -18,4 +18,4 @@ Index: gtk+2.0-2.21.5/Makefile.am
+SRC_SUBDIRS = gdk gtk modules demos tests $(MAYBE_PERF) +SRC_SUBDIRS = gdk gtk modules demos tests $(MAYBE_PERF)
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
# require automake 1.4 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

16
debian/patches/003_gdk.pc_privates.patch vendored
View File

@ -1,8 +1,8 @@
Index: gtk+2.0-2.21.5/configure.in Index: gtk+3.0-2.90.5/configure.ac
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/configure.in 2010-07-22 17:53:08.402066616 +0200 --- gtk+3.0-2.90.5.orig/configure.ac 2010-07-30 12:46:09.000000000 +0200
+++ gtk+2.0-2.21.5/configure.in 2010-07-22 17:54:32.685052226 +0200 +++ gtk+3.0-2.90.5/configure.ac 2010-07-30 18:58:23.812082593 +0200
@@ -1310,23 +1310,27 @@ @@ -1302,23 +1302,27 @@
# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c # Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
if test "x$gdktarget" = "xx11"; then if test "x$gdktarget" = "xx11"; then
@ -35,14 +35,14 @@ Index: gtk+2.0-2.21.5/configure.in
AC_SUBST(GDK_EXTRA_LIBS) AC_SUBST(GDK_EXTRA_LIBS)
AC_SUBST(GDK_EXTRA_CFLAGS) AC_SUBST(GDK_EXTRA_CFLAGS)
AC_SUBST(GDK_DEP_LIBS) AC_SUBST(GDK_DEP_LIBS)
Index: gtk+2.0-2.21.5/gdk-2.0.pc.in Index: gtk+3.0-2.90.5/gdk-3.0.pc.in
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/gdk-2.0.pc.in 2010-07-12 18:23:43.000000000 +0200 --- gtk+3.0-2.90.5.orig/gdk-3.0.pc.in 2010-07-30 18:58:42.904083678 +0200
+++ gtk+2.0-2.21.5/gdk-2.0.pc.in 2010-07-22 17:54:32.685052226 +0200 +++ gtk+3.0-2.90.5/gdk-3.0.pc.in 2010-07-30 18:59:03.548085289 +0200
@@ -8,5 +8,6 @@ @@ -8,5 +8,6 @@
Description: GTK+ Drawing Kit (${target} target) Description: GTK+ Drawing Kit (${target} target)
Version: @VERSION@ Version: @VERSION@
Requires: @GDK_PACKAGES@ Requires: @GDK_PACKAGES@
+Requires.private: @GDK_PRIVATE_PACKAGES@ +Requires.private: @GDK_PRIVATE_PACKAGES@
Libs: -L${libdir} -lgdk-${target}-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@ Libs: -L${libdir} -lgdk-${target}-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@
Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @GDK_EXTRA_CFLAGS@ Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ -I${libdir}/gtk-@GTK_API_VERSION@/include @GDK_EXTRA_CFLAGS@ -DGSEAL_ENABLE

1220
debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch vendored
View File

File diff suppressed because it is too large Load Diff

20
debian/patches/005_support_disabling_x11_extensions.patch vendored
View File

@ -3,10 +3,10 @@ Author: Cyril Brulebois <kibi@debian.org>
Support disabling X11 extensions Support disabling X11 extensions
Index: gtk+2.0-2.21.5/configure.in Index: gtk+3.0-2.90.5/configure.ac
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/configure.in 2010-07-22 17:54:32.685052226 +0200 --- gtk+3.0-2.90.5.orig/configure.ac 2010-07-30 18:58:23.000000000 +0200
+++ gtk+2.0-2.21.5/configure.in 2010-07-22 17:54:36.285051810 +0200 +++ gtk+3.0-2.90.5/configure.ac 2010-07-30 19:02:06.696082790 +0200
@@ -241,6 +241,18 @@ @@ -241,6 +241,18 @@
[AC_HELP_STRING([--enable-xinerama], [AC_HELP_STRING([--enable-xinerama],
[support xinerama extension if available [default=yes]])],, [support xinerama extension if available [default=yes]])],,
@ -26,8 +26,8 @@ Index: gtk+2.0-2.21.5/configure.in
AC_ARG_ENABLE(rebuilds, AC_ARG_ENABLE(rebuilds,
[AC_HELP_STRING([--disable-rebuilds], [AC_HELP_STRING([--disable-rebuilds],
[disable all source autogeneration rules])],, [disable all source autogeneration rules])],,
@@ -1187,7 +1199,8 @@ @@ -1178,7 +1190,8 @@
AM_CONDITIONAL(XINPUT_XFREE, test x$with_xinput = xxfree || test x$with_xinput = xyes) AM_CONDITIONAL(XINPUT_2, test "x$have_xinput2" = "xyes")
# Check for the RANDR extension # Check for the RANDR extension
- if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then - if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
@ -36,17 +36,17 @@ Index: gtk+2.0-2.21.5/configure.in
AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library]) AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
X_PACKAGES="$X_PACKAGES xrandr" X_PACKAGES="$X_PACKAGES xrandr"
@@ -1203,7 +1216,8 @@ @@ -1194,7 +1207,8 @@
# Checks for XFixes extension # Checks for XFixes extension
- if $PKG_CONFIG --exists xfixes ; then - if $PKG_CONFIG --exists xfixes ; then
+ if test x"$enable_xfixes" != xno && \ + if test x"$enable_xfixes" != xno && \
+ $PKG_CONFIG --exists xfixes ; then + $PKG_CONFIG --exists xfixes ; then
AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension]) AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
X_PACKAGES="$X_PACKAGES xfixes" X_PACKAGES="$X_PACKAGES xfixes"
@@ -1212,7 +1226,8 @@ @@ -1203,7 +1217,8 @@
# Checks for Xcomposite extension # Checks for Xcomposite extension
@ -56,7 +56,7 @@ Index: gtk+2.0-2.21.5/configure.in
AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension]) AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
X_PACKAGES="$X_PACKAGES xcomposite" X_PACKAGES="$X_PACKAGES xcomposite"
@@ -1221,7 +1236,7 @@ @@ -1212,7 +1227,7 @@
# Checks for Xdamage extension # Checks for Xdamage extension

60
debian/patches/009_gtk-export-filechooser.patch vendored
View File

@ -34,10 +34,10 @@
* tests/autotestfilechooser.c: build with * tests/autotestfilechooser.c: build with
GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
Index: gtk+2.0-2.21.5/gtk/Makefile.am Index: gtk+3.0-2.90.5/gtk/Makefile.am
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/gtk/Makefile.am 2010-07-12 18:23:44.000000000 +0200 --- gtk+3.0-2.90.5.orig/gtk/Makefile.am 2010-07-10 03:01:27.000000000 +0200
+++ gtk+2.0-2.21.5/gtk/Makefile.am 2010-07-22 17:54:37.921095291 +0200 +++ gtk+3.0-2.90.5/gtk/Makefile.am 2010-07-30 19:02:24.463083637 +0200
@@ -49,6 +49,8 @@ @@ -49,6 +49,8 @@
-I$(top_srcdir) -I../gdk \ -I$(top_srcdir) -I../gdk \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \
@ -47,7 +47,7 @@ Index: gtk+2.0-2.21.5/gtk/Makefile.am
-DGTK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
@@ -356,12 +358,16 @@ @@ -349,12 +351,16 @@
# Installed header files without compatibility guarantees # Installed header files without compatibility guarantees
# that are not included in gtk/gtk.h # that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \ gtk_semi_private_h_sources = \
@ -67,7 +67,7 @@ Index: gtk+2.0-2.21.5/gtk/Makefile.am
gtksearchenginesimple.h \ gtksearchenginesimple.h \
gtkdndcursors.h \ gtkdndcursors.h \
gtkentryprivate.h \ gtkentryprivate.h \
@@ -370,11 +376,7 @@ @@ -363,11 +369,7 @@
gtkfilechooserdefault.h \ gtkfilechooserdefault.h \
gtkfilechooserembed.h \ gtkfilechooserembed.h \
gtkfilechooserentry.h \ gtkfilechooserentry.h \
@ -79,11 +79,11 @@ Index: gtk+2.0-2.21.5/gtk/Makefile.am
gtkiconcache.h \ gtkiconcache.h \
gtkintl.h \ gtkintl.h \
gtkkeyhash.h \ gtkkeyhash.h \
Index: gtk+2.0-2.21.5/gtk/gtk.symbols Index: gtk+3.0-2.90.5/gtk/gtk.symbols
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/gtk/gtk.symbols 2010-07-12 18:57:41.000000000 +0200 --- gtk+3.0-2.90.5.orig/gtk/gtk.symbols 2010-07-12 16:05:33.000000000 +0200
+++ gtk+2.0-2.21.5/gtk/gtk.symbols 2010-07-22 17:54:37.941054321 +0200 +++ gtk+3.0-2.90.5/gtk/gtk.symbols 2010-07-30 19:02:24.479083436 +0200
@@ -1639,6 +1639,12 @@ @@ -1348,6 +1348,12 @@
#endif #endif
#endif #endif
@ -96,10 +96,10 @@ Index: gtk+2.0-2.21.5/gtk/gtk.symbols
#if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__) #if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__)
#if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__) #if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__)
gtk_file_chooser_widget_get_type G_GNUC_CONST gtk_file_chooser_widget_get_type G_GNUC_CONST
Index: gtk+2.0-2.21.5/gtk/gtkfilechooserprivate.h Index: gtk+3.0-2.90.5/gtk/gtkfilechooserprivate.h
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/gtk/gtkfilechooserprivate.h 2010-06-16 17:27:01.000000000 +0200 --- gtk+3.0-2.90.5.orig/gtk/gtkfilechooserprivate.h 2010-06-16 17:27:01.000000000 +0200
+++ gtk+2.0-2.21.5/gtk/gtkfilechooserprivate.h 2010-07-22 17:54:37.941054321 +0200 +++ gtk+3.0-2.90.5/gtk/gtkfilechooserprivate.h 2010-07-30 19:02:24.499082975 +0200
@@ -21,6 +21,14 @@ @@ -21,6 +21,14 @@
#ifndef __GTK_FILE_CHOOSER_PRIVATE_H__ #ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
#define __GTK_FILE_CHOOSER_PRIVATE_H__ #define __GTK_FILE_CHOOSER_PRIVATE_H__
@ -115,11 +115,11 @@ Index: gtk+2.0-2.21.5/gtk/gtkfilechooserprivate.h
#include "gtkfilechooser.h" #include "gtkfilechooser.h"
#include "gtkfilesystem.h" #include "gtkfilesystem.h"
#include "gtkfilesystemmodel.h" #include "gtkfilesystemmodel.h"
Index: gtk+2.0-2.21.5/gtk/gtkfilechooserutils.c Index: gtk+3.0-2.90.5/gtk/gtkfilechooserutils.c
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/gtk/gtkfilechooserutils.c 2010-07-12 18:23:44.000000000 +0200 --- gtk+3.0-2.90.5.orig/gtk/gtkfilechooserutils.c 2010-07-10 03:00:19.000000000 +0200
+++ gtk+2.0-2.21.5/gtk/gtkfilechooserutils.c 2010-07-22 17:54:37.949054430 +0200 +++ gtk+3.0-2.90.5/gtk/gtkfilechooserutils.c 2010-07-30 19:02:24.507083642 +0200
@@ -122,6 +122,22 @@ @@ -119,6 +119,22 @@
"create-folders"); "create-folders");
} }
@ -142,17 +142,17 @@ Index: gtk+2.0-2.21.5/gtk/gtkfilechooserutils.c
/** /**
* _gtk_file_chooser_delegate_iface_init: * _gtk_file_chooser_delegate_iface_init:
* @iface: a #GtkFileChoserIface structure * @iface: a #GtkFileChoserIface structure
@@ -363,3 +379,6 @@ @@ -360,3 +376,6 @@
g_signal_emit_by_name (data, "confirm-overwrite", &conf); g_signal_emit_by_name (data, "confirm-overwrite", &conf);
return conf; return conf;
} }
+ +
+#define __GTK_FILE_CHOOSER_UTILS_C__ +#define __GTK_FILE_CHOOSER_UTILS_C__
+#include "gtkaliasdef.c" +#include "gtkaliasdef.c"
Index: gtk+2.0-2.21.5/gtk/gtkfilechooserutils.h Index: gtk+3.0-2.90.5/gtk/gtkfilechooserutils.h
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/gtk/gtkfilechooserutils.h 2010-07-12 18:23:44.000000000 +0200 --- gtk+3.0-2.90.5.orig/gtk/gtkfilechooserutils.h 2010-06-30 13:37:19.000000000 +0200
+++ gtk+2.0-2.21.5/gtk/gtkfilechooserutils.h 2010-07-22 17:54:37.961058330 +0200 +++ gtk+3.0-2.90.5/gtk/gtkfilechooserutils.h 2010-07-30 19:02:24.515083192 +0200
@@ -22,6 +22,14 @@ @@ -22,6 +22,14 @@
#ifndef __GTK_FILE_CHOOSER_UTILS_H__ #ifndef __GTK_FILE_CHOOSER_UTILS_H__
#define __GTK_FILE_CHOOSER_UTILS_H__ #define __GTK_FILE_CHOOSER_UTILS_H__
@ -168,7 +168,7 @@ Index: gtk+2.0-2.21.5/gtk/gtkfilechooserutils.h
#include "gtkfilechooserprivate.h" #include "gtkfilechooserprivate.h"
G_BEGIN_DECLS G_BEGIN_DECLS
@@ -46,6 +54,9 @@ @@ -45,6 +53,9 @@
} GtkFileChooserProp; } GtkFileChooserProp;
void _gtk_file_chooser_install_properties (GObjectClass *klass); void _gtk_file_chooser_install_properties (GObjectClass *klass);
@ -178,10 +178,10 @@ Index: gtk+2.0-2.21.5/gtk/gtkfilechooserutils.h
void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface); void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver, void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver,
Index: gtk+2.0-2.21.5/gtk/gtkfilesystemmodel.h Index: gtk+3.0-2.90.5/gtk/gtkfilesystemmodel.h
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/gtk/gtkfilesystemmodel.h 2010-06-16 17:27:02.000000000 +0200 --- gtk+3.0-2.90.5.orig/gtk/gtkfilesystemmodel.h 2010-06-16 17:27:02.000000000 +0200
+++ gtk+2.0-2.21.5/gtk/gtkfilesystemmodel.h 2010-07-22 17:54:37.961058330 +0200 +++ gtk+3.0-2.90.5/gtk/gtkfilesystemmodel.h 2010-07-30 19:02:24.527082900 +0200
@@ -21,6 +21,10 @@ @@ -21,6 +21,10 @@
#ifndef __GTK_FILE_SYSTEM_MODEL_H__ #ifndef __GTK_FILE_SYSTEM_MODEL_H__
#define __GTK_FILE_SYSTEM_MODEL_H__ #define __GTK_FILE_SYSTEM_MODEL_H__
@ -193,10 +193,10 @@ Index: gtk+2.0-2.21.5/gtk/gtkfilesystemmodel.h
#include <gio/gio.h> #include <gio/gio.h>
#include <gtk/gtkfilefilter.h> #include <gtk/gtkfilefilter.h>
#include <gtk/gtktreemodel.h> #include <gtk/gtktreemodel.h>
Index: gtk+2.0-2.21.5/gtk/gtkquery.h Index: gtk+3.0-2.90.5/gtk/gtkquery.h
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/gtk/gtkquery.h 2009-04-02 15:54:56.000000000 +0200 --- gtk+3.0-2.90.5.orig/gtk/gtkquery.h 2009-04-02 15:54:56.000000000 +0200
+++ gtk+2.0-2.21.5/gtk/gtkquery.h 2010-07-22 17:54:37.977054916 +0200 +++ gtk+3.0-2.90.5/gtk/gtkquery.h 2010-07-30 19:02:24.543084235 +0200
@@ -23,6 +23,14 @@ @@ -23,6 +23,14 @@
#ifndef __GTK_QUERY_H__ #ifndef __GTK_QUERY_H__
#define __GTK_QUERY_H__ #define __GTK_QUERY_H__
@ -212,10 +212,10 @@ Index: gtk+2.0-2.21.5/gtk/gtkquery.h
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
Index: gtk+2.0-2.21.5/gtk/gtksearchengine.h Index: gtk+3.0-2.90.5/gtk/gtksearchengine.h
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/gtk/gtksearchengine.h 2010-04-09 04:29:58.000000000 +0200 --- gtk+3.0-2.90.5.orig/gtk/gtksearchengine.h 2010-04-09 04:29:58.000000000 +0200
+++ gtk+2.0-2.21.5/gtk/gtksearchengine.h 2010-07-22 17:54:37.977054916 +0200 +++ gtk+3.0-2.90.5/gtk/gtksearchengine.h 2010-07-30 19:02:24.555085689 +0200
@@ -23,6 +23,14 @@ @@ -23,6 +23,14 @@
#ifndef __GTK_SEARCH_ENGINE_H__ #ifndef __GTK_SEARCH_ENGINE_H__
#define __GTK_SEARCH_ENGINE_H__ #define __GTK_SEARCH_ENGINE_H__

13
debian/patches/011_immodule-cache-dir.patch vendored
View File

@ -1,13 +0,0 @@
Index: gtk+2.0-2.21.5/gtk/gtkrc.c
===================================================================
--- gtk+2.0-2.21.5.orig/gtk/gtkrc.c 2010-07-12 18:23:45.000000000 +0200
+++ gtk+2.0-2.21.5/gtk/gtkrc.c 2010-07-22 17:55:14.909054236 +0200
@@ -450,7 +450,7 @@
if (im_module_file)
result = g_strdup (im_module_file);
else
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
+ result = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, "gtk.immodules", NULL);
}
return result;

48
debian/patches/041_ia32-libs.patch vendored
View File

@ -1,69 +1,63 @@
Index: gtk+2.0-2.21.5/gtk/gtkrc.c Index: gtk+3.0-2.90.5/gtk/gtkrc.c
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/gtk/gtkrc.c 2010-07-22 17:55:14.000000000 +0200 --- gtk+3.0-2.90.5.orig/gtk/gtkrc.c 2010-07-10 03:00:19.000000000 +0200
+++ gtk+2.0-2.21.5/gtk/gtkrc.c 2010-07-22 17:57:19.657052790 +0200 +++ gtk+3.0-2.90.5/gtk/gtkrc.c 2010-07-30 19:12:34.775081660 +0200
@@ -450,7 +450,20 @@ @@ -450,6 +450,17 @@
if (im_module_file) if (im_module_file)
result = g_strdup (im_module_file); result = g_strdup (im_module_file);
else else
- result = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, "gtk.immodules", NULL);
+ {
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) +#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
+# if defined (__i386__) +# if defined (__i386__)
+ result = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, "gtk.immodules.32", NULL); + result = gtk_rc_make_default_dir ("immodules.cache.32");
+# else +# else
+ result = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, "gtk.immodules.64", NULL); + result = gtk_rc_make_default_dir ("immodules.cache.64");
+# endif +# endif
+ /* Prefer compat gtk.immodules file if it's usable. */ + /* Prefer compat immodules.cache file if it's usable. */
+ if (g_file_test(result, G_FILE_TEST_EXISTS)) + if (g_file_test(result, G_FILE_TEST_EXISTS))
+ return result; + return result;
+ g_free (result); + g_free (result);
+#endif +#endif
+ result = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, "gtk.immodules", NULL); result = gtk_rc_make_default_dir ("immodules.cache");
+ }
} }
return result; @@ -522,7 +533,21 @@
@@ -522,7 +535,21 @@
else else
{ {
const gchar *home; const gchar *home;
- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) +#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
+# if defined (__i386__) +# if defined (__i386__)
+ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc.32", NULL); + str = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtkrc.32", NULL);
+# else +# else
+ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc.64", NULL); + str = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtkrc.64", NULL);
+# endif +# endif
+ /* Prefer compat gtkrc if it's usable. */ + /* Prefer compat gtkrc if it's usable. */
+ if (!g_file_test(str, G_FILE_TEST_EXISTS)) + if (!g_file_test(str, G_FILE_TEST_EXISTS))
+ { + {
+ g_free (str), /* continue in next line */ + g_free (str), /* continue in next line */
+#endif +#endif
+ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); str = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtkrc", NULL);
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) +#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
+ } + }
+#endif +#endif
gtk_rc_add_default_file (str); gtk_rc_add_default_file (str);
g_free (str); g_free (str);
@@ -530,7 +557,21 @@ @@ -530,7 +555,21 @@
home = g_get_home_dir (); home = g_get_home_dir ();
if (home) if (home)
{ {
- str = g_build_filename (home, ".gtkrc-2.0", NULL);
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) +#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
+# if defined (__i386__) +# if defined (__i386__)
+ str = g_build_filename (home, ".gtkrc-2.0.32", NULL); + str = g_build_filename (home, ".gtkrc-3.0.32", NULL);
+# else +# else
+ str = g_build_filename (home, ".gtkrc-2.0.64", NULL); + str = g_build_filename (home, ".gtkrc-3.0.64", NULL);
+# endif +# endif
+ /* Prefer compat .gtkrc-2.0 if it's usable. */ + /* Prefer compat .gtkrc-3.0 if it's usable. */
+ if (!g_file_test(str, G_FILE_TEST_EXISTS)) + if (!g_file_test(str, G_FILE_TEST_EXISTS))
+ { + {
+ g_free (str), /* continue in next line */ + g_free (str), /* continue in next line */
+#endif +#endif
+ str = g_build_filename (home, ".gtkrc-2.0", NULL); str = g_build_filename (home, ".gtkrc-3.0", NULL);
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) +#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
+ } + }
+#endif +#endif

8
debian/patches/042_treeview_single-focus.patch vendored
View File

@ -1,8 +1,8 @@
Index: gtk+2.0-2.21.5/gtk/gtktreeview.c Index: gtk+3.0-2.90.5/gtk/gtktreeview.c
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/gtk/gtktreeview.c 2010-07-12 18:32:54.000000000 +0200 --- gtk+3.0-2.90.5.orig/gtk/gtktreeview.c 2010-07-10 03:00:19.000000000 +0200
+++ gtk+2.0-2.21.5/gtk/gtktreeview.c 2010-07-22 17:57:20.833053801 +0200 +++ gtk+3.0-2.90.5/gtk/gtktreeview.c 2010-07-30 19:12:47.187084280 +0200
@@ -9591,7 +9591,8 @@ @@ -9588,7 +9588,8 @@
if (cursor_path) if (cursor_path)
{ {

6
debian/patches/060_ignore-random-icons.patch vendored
View File

@ -1,7 +1,7 @@
Index: gtk+2.0-2.21.5/gtk/updateiconcache.c Index: gtk+3.0-2.90.5/gtk/updateiconcache.c
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/gtk/updateiconcache.c 2010-05-08 06:39:07.000000000 +0200 --- gtk+3.0-2.90.5.orig/gtk/updateiconcache.c 2010-05-08 06:39:07.000000000 +0200
+++ gtk+2.0-2.21.5/gtk/updateiconcache.c 2010-07-22 17:57:21.973055310 +0200 +++ gtk+3.0-2.90.5/gtk/updateiconcache.c 2010-07-30 19:12:50.495114783 +0200
@@ -660,7 +660,7 @@ @@ -660,7 +660,7 @@
directories = g_list_append (directories, g_strdup (subdir)); directories = g_list_append (directories, g_strdup (subdir));
} }

12
debian/patches/061_use_pdf_as_default_printing_standard.patch vendored
View File

@ -1,7 +1,7 @@
Index: gtk+2.0-2.21.5/modules/printbackends/cups/gtkprintbackendcups.c Index: gtk+3.0-2.90.5/modules/printbackends/cups/gtkprintbackendcups.c
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/modules/printbackends/cups/gtkprintbackendcups.c 2010-06-28 01:19:39.000000000 +0200 --- gtk+3.0-2.90.5.orig/modules/printbackends/cups/gtkprintbackendcups.c 2010-06-28 01:19:39.000000000 +0200
+++ gtk+2.0-2.21.5/modules/printbackends/cups/gtkprintbackendcups.c 2010-07-22 17:57:22.973051749 +0200 +++ gtk+3.0-2.90.5/modules/printbackends/cups/gtkprintbackendcups.c 2010-07-30 19:12:53.163085281 +0200
@@ -344,8 +344,9 @@ @@ -344,8 +344,9 @@
/* TODO: check if it is a ps or pdf printer */ /* TODO: check if it is a ps or pdf printer */
@ -21,10 +21,10 @@ Index: gtk+2.0-2.21.5/modules/printbackends/cups/gtkprintbackendcups.c
cairo_surface_set_fallback_resolution (surface, cairo_surface_set_fallback_resolution (surface,
2.0 * gtk_print_settings_get_printer_lpi (settings), 2.0 * gtk_print_settings_get_printer_lpi (settings),
Index: gtk+2.0-2.21.5/modules/printbackends/lpr/gtkprintbackendlpr.c Index: gtk+3.0-2.90.5/modules/printbackends/lpr/gtkprintbackendlpr.c
=================================================================== ===================================================================
--- gtk+2.0-2.21.5.orig/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-06-16 17:27:06.000000000 +0200 --- gtk+3.0-2.90.5.orig/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-06-16 17:27:06.000000000 +0200
+++ gtk+2.0-2.21.5/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-07-22 17:57:23.001065368 +0200 +++ gtk+3.0-2.90.5/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-07-30 19:12:53.171184913 +0200
@@ -31,6 +31,8 @@ @@ -31,6 +31,8 @@
#include <cairo.h> #include <cairo.h>
#include <cairo-ps.h> #include <cairo-ps.h>

3061
debian/patches/070_mandatory-relibtoolize.patch vendored
View File

File diff suppressed because it is too large Load Diff

2
debian/patches/series vendored
View File

@ -1,10 +1,8 @@
001_static-linking-dont-query-immodules.patch 001_static-linking-dont-query-immodules.patch
002_static-linking-dont-build-perf.patch 002_static-linking-dont-build-perf.patch
003_gdk.pc_privates.patch 003_gdk.pc_privates.patch
004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
005_support_disabling_x11_extensions.patch 005_support_disabling_x11_extensions.patch
009_gtk-export-filechooser.patch 009_gtk-export-filechooser.patch
011_immodule-cache-dir.patch
015_default-fallback-icon-theme.patch 015_default-fallback-icon-theme.patch
022_disable-viqr-im-for-vi-locale.patch 022_disable-viqr-im-for-vi-locale.patch
041_ia32-libs.patch 041_ia32-libs.patch