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

* debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch:

Browse Source 
- Removed, GtkFileSelection is deprecated.
* debian/patches/*
  - Refreshed.
This commit is contained in:
Emilio Pozuelo Monfort
2009-08-18 22:25:53 +00:00
parent b2adfc4f03
commit 9585409878
17 changed files with 42849 additions and 9104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -8,6 +8,10 @@ gtk+2.0 (2.17.8-1) UNRELEASED; urgency=low
- Configure with --with-libjasper, it's disabled by default now.
* debian/control.in:
- Remove conflicts and replaces no longer needed for packages in stable.
* debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch:
- Removed, GtkFileSelection is deprecated.
* debian/patches/*
- Refreshed.
-- Emilio Pozuelo Monfort <pochu@ubuntu.com> Tue, 18 Aug 2009 20:41:54 +0200

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

@ -1,8 +1,6 @@
Index: gtk+-2.14.7/configure.in
===================================================================
--- gtk+-2.14.7.orig/configure.in 2009-01-07 17:33:57.000000000 +0100
+++ gtk+-2.14.7/configure.in 2009-02-17 23:06:24.718714576 +0100
@@ -152,6 +152,7 @@ esac
--- a/configure.in
+++ b/configure.in
@@ -157,6 +157,7 @@
dnl Initialize libtool
AC_PROG_CC
AM_DISABLE_STATIC
@ -10,11 +8,9 @@ Index: gtk+-2.14.7/configure.in
dnl
dnl Check for a working C++ compiler, but do not bail out, if none is found.
Index: gtk+-2.14.7/modules/input/Makefile.am
===================================================================
--- gtk+-2.14.7.orig/modules/input/Makefile.am 2009-01-07 17:33:31.000000000 +0100
+++ gtk+-2.14.7/modules/input/Makefile.am 2009-02-17 23:06:24.731083956 +0100
@@ -178,8 +178,12 @@ dist_imconffile_DATA = im-multipress.con
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -178,8 +178,12 @@
if CROSS_COMPILING
RUN_QUERY_IMMODULES_TEST=false
else
@ -27,7 +23,7 @@ Index: gtk+-2.14.7/modules/input/Makefile.am
# Running this if cross compiling or if DESTDIR is set is going to
# not work at all, so skip it.
@@ -240,7 +244,18 @@ noinst_LTLIBRARIES = \
@@ -240,7 +244,18 @@
included-modules: $(noinst_LTLIBRARIES)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)

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

@ -1,19 +1,16 @@
Index: gtk+2.0-2.15.5/configure.in
===================================================================
--- gtk+2.0-2.15.5.orig/configure.in 2009-03-03 00:53:16.000000000 -0300
+++ gtk+2.0-2.15.5/configure.in 2009-03-03 00:57:09.000000000 -0300
@@ -1703,21 +1703,23 @@
--- a/configure.in
+++ b/configure.in
@@ -1712,19 +1712,22 @@
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
GDK_PACKAGES="$PANGO_PACKAGES gio-2.0"
if test "x$gdktarget" = "xx11"; then
- GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES cairo-xlib"
+ GDK_PRIVATE_PACKAGES="$X_PACKAGES cairo-xlib"
fi
-GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 $X_PACKAGES cairo-$cairo_backend"
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
+GDK_PACKAGES="$PANGO_PACKAGES gio-2.0"
+GDK_PRIVATE_PACKAGES="$X_PACKAGES cairo-$cairo_backend"
+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
#
# If we aren't writing explicit dependencies, then don't put the extra libraries we need
# into the pkg-config files
@ -30,10 +27,8 @@ Index: gtk+2.0-2.15.5/configure.in
AC_SUBST(GDK_EXTRA_LIBS)
AC_SUBST(GDK_EXTRA_CFLAGS)
AC_SUBST(GDK_DEP_LIBS)
Index: gtk+2.0-2.15.5/gdk-2.0.pc.in
===================================================================
--- gtk+2.0-2.15.5.orig/gdk-2.0.pc.in 2009-03-02 16:03:47.000000000 -0300
+++ gtk+2.0-2.15.5/gdk-2.0.pc.in 2009-03-03 00:53:35.000000000 -0300
--- a/gdk-2.0.pc.in
+++ b/gdk-2.0.pc.in
@@ -8,5 +8,6 @@
Description: GTK+ Drawing Kit (${target} target)
Version: @VERSION@

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

File diff suppressed because it is too large Load Diff

8
debian/patches/005_xpmico.patch vendored
View File

@ -1,8 +1,6 @@
Index: gtk+2.0-2.11.2/gdk-pixbuf/io-ico.c
===================================================================
--- gtk+2.0-2.11.2.orig/gdk-pixbuf/io-ico.c 2007-06-06 13:43:15.000000000 +0200
+++ gtk+2.0-2.11.2/gdk-pixbuf/io-ico.c 2007-06-13 11:07:11.000000000 +0200
@@ -208,6 +208,14 @@
--- a/gdk-pixbuf/io-ico.c
+++ b/gdk-pixbuf/io-ico.c
@@ -231,6 +231,14 @@
State->HeaderSize = 6 + IconCount*16;

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

@ -34,11 +34,9 @@
* tests/autotestfilechooser.c: build with
GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
Index: gtk+2.0-2.14.0/gtk/Makefile.am
===================================================================
--- gtk+2.0-2.14.0.orig/gtk/Makefile.am 2008-09-04 06:35:27.000000000 +0200
+++ gtk+2.0-2.14.0/gtk/Makefile.am 2008-09-05 00:36:25.000000000 +0200
@@ -34,6 +34,8 @@
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -42,6 +42,8 @@
-I$(top_srcdir)/gdk \
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_DISABLE_DEPRECATED \
@ -47,7 +45,7 @@ Index: gtk+2.0-2.14.0/gtk/Makefile.am
-DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
@@ -336,12 +338,16 @@
@@ -348,12 +350,16 @@
# Installed header files without compatibility guarantees
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
@ -67,7 +65,7 @@ Index: gtk+2.0-2.14.0/gtk/Makefile.am
gtksearchenginesimple.h \
gtkdndcursors.h \
gtkentryprivate.h \
@@ -349,11 +355,7 @@
@@ -362,11 +368,7 @@
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@ -79,11 +77,9 @@ Index: gtk+2.0-2.14.0/gtk/Makefile.am
gtkiconcache.h \
gtkintl.h \
gtkkeyhash.h \
Index: gtk+2.0-2.14.0/gtk/gtk.symbols
===================================================================
--- gtk+2.0-2.14.0.orig/gtk/gtk.symbols 2008-09-04 06:35:27.000000000 +0200
+++ gtk+2.0-2.14.0/gtk/gtk.symbols 2008-09-05 00:36:25.000000000 +0200
@@ -1492,6 +1492,12 @@
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1610,6 +1610,12 @@
#endif
#endif
@ -96,10 +92,8 @@ Index: gtk+2.0-2.14.0/gtk/gtk.symbols
#if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__)
#if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__)
gtk_file_chooser_widget_get_type G_GNUC_CONST
Index: gtk+2.0-2.14.0/gtk/gtkfilechooserprivate.h
===================================================================
--- gtk+2.0-2.14.0.orig/gtk/gtkfilechooserprivate.h 2008-09-04 06:35:27.000000000 +0200
+++ gtk+2.0-2.14.0/gtk/gtkfilechooserprivate.h 2008-09-05 00:36:25.000000000 +0200
--- a/gtk/gtkfilechooserprivate.h
+++ b/gtk/gtkfilechooserprivate.h
@@ -21,6 +21,14 @@
#ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
#define __GTK_FILE_CHOOSER_PRIVATE_H__
@ -115,12 +109,10 @@ Index: gtk+2.0-2.14.0/gtk/gtkfilechooserprivate.h
#include "gtkfilechooser.h"
#include "gtkfilesystem.h"
#include "gtkfilesystemmodel.h"
Index: gtk+2.0-2.14.0/gtk/gtkfilechooserutils.c
===================================================================
--- gtk+2.0-2.14.0.orig/gtk/gtkfilechooserutils.c 2008-09-04 06:35:27.000000000 +0200
+++ gtk+2.0-2.14.0/gtk/gtkfilechooserutils.c 2008-09-05 00:36:25.000000000 +0200
@@ -119,6 +119,22 @@
"do-overwrite-confirmation");
--- a/gtk/gtkfilechooserutils.c
+++ b/gtk/gtkfilechooserutils.c
@@ -122,6 +122,22 @@
"create-folders");
}
+#ifdef MAEMO_CHANGES
@ -142,17 +134,15 @@ Index: gtk+2.0-2.14.0/gtk/gtkfilechooserutils.c
/**
* _gtk_file_chooser_delegate_iface_init:
* @iface: a #GtkFileChoserIface structure
@@ -360,3 +376,6 @@
@@ -363,3 +379,6 @@
g_signal_emit_by_name (data, "confirm-overwrite", &conf);
return conf;
}
+
+#define __GTK_FILE_CHOOSER_UTILS_C__
+#include "gtkaliasdef.c"
Index: gtk+2.0-2.14.0/gtk/gtkfilechooserutils.h
===================================================================
--- gtk+2.0-2.14.0.orig/gtk/gtkfilechooserutils.h 2008-09-04 06:35:27.000000000 +0200
+++ gtk+2.0-2.14.0/gtk/gtkfilechooserutils.h 2008-09-05 00:36:25.000000000 +0200
--- a/gtk/gtkfilechooserutils.h
+++ b/gtk/gtkfilechooserutils.h
@@ -22,6 +22,14 @@
#ifndef __GTK_FILE_CHOOSER_UTILS_H__
#define __GTK_FILE_CHOOSER_UTILS_H__
@ -168,7 +158,7 @@ Index: gtk+2.0-2.14.0/gtk/gtkfilechooserutils.h
#include "gtkfilechooserprivate.h"
G_BEGIN_DECLS
@@ -45,6 +53,9 @@
@@ -46,6 +54,9 @@
} GtkFileChooserProp;
void _gtk_file_chooser_install_properties (GObjectClass *klass);
@ -178,10 +168,8 @@ Index: gtk+2.0-2.14.0/gtk/gtkfilechooserutils.h
void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver,
Index: gtk+2.0-2.14.0/gtk/gtkfilesystemmodel.h
===================================================================
--- gtk+2.0-2.14.0.orig/gtk/gtkfilesystemmodel.h 2008-09-04 06:35:27.000000000 +0200
+++ gtk+2.0-2.14.0/gtk/gtkfilesystemmodel.h 2008-09-05 00:36:25.000000000 +0200
--- a/gtk/gtkfilesystemmodel.h
+++ b/gtk/gtkfilesystemmodel.h
@@ -21,6 +21,10 @@
#ifndef __GTK_FILE_SYSTEM_MODEL_H__
#define __GTK_FILE_SYSTEM_MODEL_H__
@ -193,10 +181,8 @@ Index: gtk+2.0-2.14.0/gtk/gtkfilesystemmodel.h
#include "gtkfilesystem.h"
#include <gtk/gtktreemodel.h>
Index: gtk+2.0-2.14.0/gtk/gtkquery.h
===================================================================
--- gtk+2.0-2.14.0.orig/gtk/gtkquery.h 2008-09-04 06:35:27.000000000 +0200
+++ gtk+2.0-2.14.0/gtk/gtkquery.h 2008-09-05 00:36:25.000000000 +0200
--- a/gtk/gtkquery.h
+++ b/gtk/gtkquery.h
@@ -23,6 +23,14 @@
#ifndef __GTK_QUERY_H__
#define __GTK_QUERY_H__
@ -212,10 +198,8 @@ Index: gtk+2.0-2.14.0/gtk/gtkquery.h
#include <glib-object.h>
G_BEGIN_DECLS
Index: gtk+2.0-2.14.0/gtk/gtksearchengine.h
===================================================================
--- gtk+2.0-2.14.0.orig/gtk/gtksearchengine.h 2008-09-04 06:35:28.000000000 +0200
+++ gtk+2.0-2.14.0/gtk/gtksearchengine.h 2008-09-05 00:36:25.000000000 +0200
--- a/gtk/gtksearchengine.h
+++ b/gtk/gtksearchengine.h
@@ -23,6 +23,14 @@
#ifndef __GTK_SEARCH_ENGINE_H__
#define __GTK_SEARCH_ENGINE_H__

8
debian/patches/010_gdkpixbuf_-lm.patch vendored
View File

@ -1,8 +1,6 @@
Index: gtk+-2.12.1/configure.in
===================================================================
--- gtk+-2.12.1.orig/configure.in 2007-11-18 01:23:24.599043331 +0100
+++ gtk+-2.12.1/configure.in 2007-11-18 01:23:24.695048802 +0100
@@ -1537,7 +1537,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=pr
--- a/configure.in
+++ b/configure.in
@@ -1782,7 +1782,7 @@
CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
if test $enable_explicit_deps != yes ; then

6
debian/patches/015_default-fallback-icon-theme.patch vendored
View File

@ -1,6 +1,6 @@
--- gtk+2.0-2.11.6.orig/gtk/gtksettings.c 2007-07-20 22:12:29.000000000 +0200
+++ gtk+2.0-2.11.6/gtk/gtksettings.c 2007-07-23 22:00:25.000000000 +0200
@@ -290,7 +290,7 @@
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -301,7 +301,7 @@
g_param_spec_string ("gtk-fallback-icon-theme",
P_("Fallback Icon Theme Name"),
P_("Name of a icon theme to fall back to"),

14
debian/patches/020_immodules-files-d.patch vendored
View File

@ -1,8 +1,6 @@
Index: gtk+2.0-2.14.0/gtk/gtkimmodule.c
===================================================================
--- gtk+2.0-2.14.0.orig/gtk/gtkimmodule.c 2008-09-04 06:35:28.000000000 +0200
+++ gtk+2.0-2.14.0/gtk/gtkimmodule.c 2008-09-05 00:36:29.000000000 +0200
@@ -58,6 +58,9 @@
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -70,6 +70,9 @@
#define GTK_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_CAST ((im_module), GTK_TYPE_IM_MODULE, GtkIMModule))
#define GTK_IS_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_TYPE ((im_module), GTK_TYPE_IM_MODULE))
@ -12,7 +10,7 @@ Index: gtk+2.0-2.14.0/gtk/gtkimmodule.c
struct _GtkIMModule
{
GTypeModule parent_instance;
@@ -298,19 +301,15 @@
@@ -310,19 +313,15 @@
}
static void
@ -33,7 +31,7 @@ Index: gtk+2.0-2.14.0/gtk/gtkimmodule.c
#define do_builtin(m) \
{ \
const GtkIMContextInfo **contexts; \
@@ -368,18 +367,6 @@
@@ -380,18 +379,6 @@
#undef do_builtin
@ -52,7 +50,7 @@ Index: gtk+2.0-2.14.0/gtk/gtkimmodule.c
while (!have_error && pango_read_line (file, line_buf))
{
const char *p;
@@ -477,10 +464,76 @@
@@ -489,10 +476,76 @@
else if (module)
add_module (module, infos);

16
debian/patches/021_loader-files-d.patch vendored
View File

@ -1,7 +1,5 @@
Index: gtk+2.0-2.14.2/gdk-pixbuf/Makefile.am
===================================================================
--- gtk+2.0-2.14.2.orig/gdk-pixbuf/Makefile.am 2008-09-18 03:49:27.000000000 +0200
+++ gtk+2.0-2.14.2/gdk-pixbuf/Makefile.am 2008-09-18 11:14:51.000000000 +0200
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -62,6 +62,7 @@
libgdk_pixbuf-2.0.la
@ -19,10 +17,8 @@ Index: gtk+2.0-2.14.2/gdk-pixbuf/Makefile.am
LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
noinst_PROGRAMS = test-gdk-pixbuf
Index: gtk+2.0-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
--- gtk+2.0-2.14.2.orig/gdk-pixbuf/gdk-pixbuf-io.c 2008-09-18 11:14:59.000000000 +0200
+++ gtk+2.0-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c 2008-09-18 11:15:06.000000000 +0200
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -51,6 +51,9 @@
#define SNIFF_BUFFER_SIZE 4096
#define LOAD_BUFFER_SIZE 65536
@ -33,7 +29,7 @@ Index: gtk+2.0-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c
#ifndef GDK_PIXBUF_USE_GIO_MIME
static gint
format_check (GdkPixbufModule *module, guchar *buffer, int size)
@@ -310,115 +313,93 @@
@@ -316,115 +319,93 @@
gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module,
GError **error);
@ -225,7 +221,7 @@ Index: gtk+2.0-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c
while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) {
const char *p;
@@ -556,8 +537,156 @@
@@ -562,8 +543,156 @@
g_free (line_buf);
}
g_string_free (tmp_buf, TRUE);

20
debian/patches/022_module-files-append-compat-module-files-d.patch vendored
View File

@ -1,6 +1,6 @@
--- a/gtk/gtkimmodule.c 2008-05-11 00:40:56.000000000 +0200
+++ b/gtk/gtkimmodule.c 2008-05-11 00:41:25.000000000 +0200
@@ -31,6 +31,7 @@
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -8,7 +8,7 @@
#include <glib/gstdio.h>
#include <gmodule.h>
@@ -383,10 +384,32 @@
@@ -489,10 +490,32 @@
GTK_BINARY_VERSION,
"immodule-files.d",
NULL);
@ -41,7 +41,7 @@
list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
im_module_files_d_str,
@@ -438,6 +461,9 @@
@@ -544,6 +567,9 @@
g_strfreev (files);
g_free (list_str);
@ -51,9 +51,9 @@
g_free (im_module_files_d_str);
g_free (im_module_file_str);
}
--- a/gdk-pixbuf/gdk-pixbuf-io.c 2008-05-11 00:40:56.000000000 +0200
+++ b/gdk-pixbuf/gdk-pixbuf-io.c 2008-05-11 00:40:56.000000000 +0200
@@ -518,6 +518,18 @@
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -553,6 +553,18 @@
#ifdef USE_GMODULE
GIOChannel *channel;
gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file ();
@ -72,7 +72,7 @@
gchar *list_str;
char **files;
GError *error = NULL;
@@ -579,6 +591,18 @@
@@ -636,6 +648,18 @@
#undef load_one_builtin_module
#ifdef USE_GMODULE
@ -91,7 +91,7 @@
list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
gdkpixbuf_module_file_str,
PIXBUF_FILES_LIBDIR,
@@ -634,6 +658,10 @@
@@ -691,6 +715,10 @@
}
g_strfreev (files);

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

@ -1,8 +1,6 @@
Index: gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
--- gtk+2.0-2.11.3.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-16 14:25:47.000000000 +0200
+++ gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-16 14:26:24.000000000 +0200
@@ -280,8 +280,20 @@
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -307,8 +307,20 @@
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
if (!result)
@ -25,10 +23,8 @@ Index: gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c
return result;
}
Index: gtk+2.0-2.11.3/gtk/gtkrc.c
===================================================================
--- gtk+2.0-2.11.3.orig/gtk/gtkrc.c 2007-06-15 20:07:37.000000000 +0200
+++ gtk+2.0-2.11.3/gtk/gtkrc.c 2007-06-16 14:26:24.000000000 +0200
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -450,7 +450,20 @@
if (im_module_file)
result = g_strdup (im_module_file);

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

@ -1,8 +1,6 @@
Index: gtk+-2.12.11/gtk/gtktreeview.c
===================================================================
--- gtk+-2.12.11.orig/gtk/gtktreeview.c 2008-07-10 19:00:15.873743659 +0200
+++ gtk+-2.12.11/gtk/gtktreeview.c 2008-07-10 19:00:29.729244218 +0200
@@ -9679,7 +9679,8 @@ gtk_tree_view_focus_to_cursor (GtkTreeVi
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -9482,7 +9482,8 @@
if (cursor_path)
{

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

@ -1,6 +1,6 @@
--- a/gtk/updateiconcache.c 2008-04-01 11:10:40.000000000 +0200
+++ b/gtk/updateiconcache.c 2008-04-01 11:11:54.000000000 +0200
@@ -658,7 +658,7 @@
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -660,7 +660,7 @@
directories = g_list_append (directories, g_strdup (subdir));
}
else

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

@ -1,8 +1,6 @@
Index: gtk+2.0-2.15.2/modules/printbackends/cups/gtkprintbackendcups.c
===================================================================
--- gtk+2.0-2.15.2.orig/modules/printbackends/cups/gtkprintbackendcups.c 2009-01-27 05:03:03.000000000 +0100
+++ gtk+2.0-2.15.2/modules/printbackends/cups/gtkprintbackendcups.c 2009-01-27 11:23:44.000000000 +0100
@@ -329,8 +329,9 @@
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -340,8 +340,9 @@
/* TODO: check if it is a ps or pdf printer */
@ -13,7 +11,7 @@ Index: gtk+2.0-2.15.2/modules/printbackends/cups/gtkprintbackendcups.c
ppd_file = gtk_printer_cups_get_ppd (GTK_PRINTER_CUPS (printer));
if (ppd_file != NULL)
@@ -397,6 +398,7 @@
@@ -408,6 +409,7 @@
if (level == 3)
cairo_ps_surface_restrict_to_level (surface, CAIRO_PS_LEVEL_3);
@ -21,10 +19,8 @@ Index: gtk+2.0-2.15.2/modules/printbackends/cups/gtkprintbackendcups.c
cairo_surface_set_fallback_resolution (surface,
2.0 * gtk_print_settings_get_printer_lpi (settings),
Index: gtk+2.0-2.15.2/modules/printbackends/lpr/gtkprintbackendlpr.c
===================================================================
--- gtk+2.0-2.15.2.orig/modules/printbackends/lpr/gtkprintbackendlpr.c 2009-01-27 05:03:03.000000000 +0100
+++ gtk+2.0-2.15.2/modules/printbackends/lpr/gtkprintbackendlpr.c 2009-01-27 11:24:49.000000000 +0100
--- a/modules/printbackends/lpr/gtkprintbackendlpr.c
+++ b/modules/printbackends/lpr/gtkprintbackendlpr.c
@@ -31,6 +31,8 @@
#include <cairo.h>
#include <cairo-ps.h>

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

File diff suppressed because it is too large Load Diff

1
debian/patches/series vendored
View File

@ -1,7 +1,6 @@
001_static-linking-dont-query-immodules.patch
002_static-linking-dont-build-perf.patch
003_gdk.pc_privates.patch
004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
005_xpmico.patch
009_gtk-export-filechooser.patch
010_gdkpixbuf_-lm.patch