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

* New upstream release series; these are development releases, the new API

Browse Source 
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:
Loïc Minier
2007-06-13 12:05:15 +00:00
parent c4a9b3b792
commit be42e9ad9a
15 changed files with 1644 additions and 1235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
debian/changelog vendored
View File

@ -1,3 +1,24 @@
gtk+2.0 (2.11.2-1) UNRELEASED; urgency=low
* 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
-- Loic Minier <lool@dooz.org> Wed, 13 Jun 2007 12:09:29 +0200
gtk+2.0 (2.10.13-1) unstable; urgency=low gtk+2.0 (2.10.13-1) unstable; urgency=low
* Bump Conflicts to iiimf-client-gtk << 12.3.91-4. * Bump Conflicts to iiimf-client-gtk << 12.3.91-4.

2
debian/control vendored
View File

@ -6,7 +6,7 @@ Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.o
Build-Depends: debhelper (>= 5.0.22), Build-Depends: debhelper (>= 5.0.22),
gettext, gettext,
pkg-config, pkg-config,
libglib2.0-dev (>= 2.12.0), libglib2.0-dev (>= 2.13.1),
libpango1.0-dev (>= 1.12.1-2), libpango1.0-dev (>= 1.12.1-2),
libatk1.0-dev (>= 1.9.0), libatk1.0-dev (>= 1.9.0),
libx11-dev (>= 2:1.0.0-6), libx11-dev (>= 2:1.0.0-6),

2
debian/control.in vendored
View File

@ -6,7 +6,7 @@ Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5.0.22), Build-Depends: debhelper (>= 5.0.22),
gettext, gettext,
pkg-config, pkg-config,
libglib2.0-dev (>= 2.12.0), libglib2.0-dev (>= 2.13.1),
libpango1.0-dev (>= 1.12.1-2), libpango1.0-dev (>= 1.12.1-2),
libatk1.0-dev (>= 1.9.0), libatk1.0-dev (>= 1.9.0),
libx11-dev (>= 2:1.0.0-6), libx11-dev (>= 2:1.0.0-6),

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

@ -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.11.2.orig/configure.in 2007-06-06 15:02:43.000000000 +0200
+++ gtk+2.0-2.10.10/configure.in 2007-03-13 14:10:04.000000000 +0100 +++ gtk+2.0-2.11.2/configure.in 2007-06-13 11:06:48.000000000 +0200
@@ -134,6 +134,7 @@ @@ -134,6 +134,7 @@
dnl Initialize libtool dnl Initialize libtool
AC_PROG_CC AC_PROG_CC
@ -10,11 +10,11 @@ Index: gtk+2.0-2.10.10/configure.in
if test "$os_win32" = "yes"; then if test "$os_win32" = "yes"; then
if test x$enable_static = xyes -o x$enable_static = x; 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.11.2.orig/modules/input/Makefile.am 2007-06-06 13:43:17.000000000 +0200
+++ gtk+2.0-2.10.10/modules/input/Makefile.am 2007-03-13 14:10:04.000000000 +0100 +++ gtk+2.0-2.11.2/modules/input/Makefile.am 2007-06-13 11:06:48.000000000 +0200
@@ -94,8 +94,12 @@ @@ -106,8 +106,12 @@
if CROSS_COMPILING if CROSS_COMPILING
RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_IMMODULES_TEST=false
else 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 # 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.
@@ -135,7 +139,18 @@ @@ -148,7 +152,18 @@
$(IM_IME_MODULE) $(IM_IME_MODULE)
gtk.immodules: Makefile.am $(module_LTLIBRARIES) gtk.immodules: Makefile.am $(module_LTLIBRARIES)

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

@ -1,8 +1,8 @@
Index: gtk+2.0-2.10.10/gdk-pixbuf/io-ico.c Index: gtk+2.0-2.11.2/gdk-pixbuf/io-ico.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.10.orig/gdk-pixbuf/io-ico.c 2007-03-12 14:57:04.000000000 +0100 --- gtk+2.0-2.11.2.orig/gdk-pixbuf/io-ico.c 2007-06-06 13:43:15.000000000 +0200
+++ gtk+2.0-2.10.10/gdk-pixbuf/io-ico.c 2007-03-13 14:10:18.000000000 +0100 +++ gtk+2.0-2.11.2/gdk-pixbuf/io-ico.c 2007-06-13 11:07:11.000000000 +0200
@@ -210,6 +210,14 @@ @@ -208,6 +208,14 @@
State->HeaderSize = 6 + IconCount*16; State->HeaderSize = 6 + IconCount*16;

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

@ -26,10 +26,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.10.12/gtk/Makefile.am Index: gtk+2.0-2.11.2/gtk/Makefile.am
=================================================================== ===================================================================
--- gtk+2.0-2.10.12.orig/gtk/Makefile.am 2007-05-02 18:41:42.000000000 +0200 --- gtk+2.0-2.11.2.orig/gtk/Makefile.am 2007-06-06 13:43:08.000000000 +0200
+++ gtk+2.0-2.10.12/gtk/Makefile.am 2007-05-30 15:24:54.000000000 +0200 +++ gtk+2.0-2.11.2/gtk/Makefile.am 2007-06-13 11:07:26.000000000 +0200
@@ -33,6 +33,8 @@ @@ -33,6 +33,8 @@
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \
@ -39,7 +39,7 @@ Index: gtk+2.0-2.10.12/gtk/Makefile.am
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \ $(GTK_DEBUG_FLAGS) \
@@ -329,7 +331,10 @@ @@ -333,7 +335,10 @@
# 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 = \
gtktextlayout.h \ gtktextlayout.h \
@ -51,7 +51,7 @@ Index: gtk+2.0-2.10.12/gtk/Makefile.am
# GTK+ header files that don't get installed # GTK+ header files that don't get installed
gtk_private_h_sources = \ gtk_private_h_sources = \
@@ -338,10 +343,7 @@ @@ -347,10 +352,7 @@
gtkfilechooserdefault.h \ gtkfilechooserdefault.h \
gtkfilechooserembed.h \ gtkfilechooserembed.h \
gtkfilechooserentry.h \ gtkfilechooserentry.h \
@ -62,11 +62,11 @@ Index: gtk+2.0-2.10.12/gtk/Makefile.am
gtkfilesystemunix.h \ gtkfilesystemunix.h \
gtkhsv.h \ gtkhsv.h \
gtkiconcache.h \ gtkiconcache.h \
Index: gtk+2.0-2.10.12/gtk/gtk.symbols Index: gtk+2.0-2.11.2/gtk/gtk.symbols
=================================================================== ===================================================================
--- gtk+2.0-2.10.12.orig/gtk/gtk.symbols 2007-05-02 18:26:59.000000000 +0200 --- gtk+2.0-2.11.2.orig/gtk/gtk.symbols 2007-06-06 14:59:53.000000000 +0200
+++ gtk+2.0-2.10.12/gtk/gtk.symbols 2007-05-30 15:24:16.000000000 +0200 +++ gtk+2.0-2.11.2/gtk/gtk.symbols 2007-06-13 11:07:26.000000000 +0200
@@ -1363,6 +1363,12 @@ @@ -1380,6 +1380,12 @@
#endif #endif
#endif #endif
@ -79,10 +79,10 @@ Index: gtk+2.0-2.10.12/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.10.12/gtk/gtkfilechooserprivate.h Index: gtk+2.0-2.11.2/gtk/gtkfilechooserprivate.h
=================================================================== ===================================================================
--- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserprivate.h 2007-05-02 18:26:59.000000000 +0200 --- gtk+2.0-2.11.2.orig/gtk/gtkfilechooserprivate.h 2007-06-06 13:43:08.000000000 +0200
+++ gtk+2.0-2.10.12/gtk/gtkfilechooserprivate.h 2007-05-30 15:24:16.000000000 +0200 +++ gtk+2.0-2.11.2/gtk/gtkfilechooserprivate.h 2007-06-13 11:07:26.000000000 +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__
@ -98,10 +98,10 @@ Index: gtk+2.0-2.10.12/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.10.12/gtk/gtkfilechooserutils.c Index: gtk+2.0-2.11.2/gtk/gtkfilechooserutils.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserutils.c 2007-05-02 18:26:59.000000000 +0200 --- gtk+2.0-2.11.2.orig/gtk/gtkfilechooserutils.c 2007-06-06 13:43:08.000000000 +0200
+++ gtk+2.0-2.10.12/gtk/gtkfilechooserutils.c 2007-05-30 15:24:16.000000000 +0200 +++ gtk+2.0-2.11.2/gtk/gtkfilechooserutils.c 2007-06-13 11:07:26.000000000 +0200
@@ -119,6 +119,22 @@ @@ -119,6 +119,22 @@
"do-overwrite-confirmation"); "do-overwrite-confirmation");
} }
@ -132,10 +132,10 @@ Index: gtk+2.0-2.10.12/gtk/gtkfilechooserutils.c
+ +
+#define __GTK_FILE_CHOOSER_UTILS_C__ +#define __GTK_FILE_CHOOSER_UTILS_C__
+#include "gtkaliasdef.c" +#include "gtkaliasdef.c"
Index: gtk+2.0-2.10.12/gtk/gtkfilechooserutils.h Index: gtk+2.0-2.11.2/gtk/gtkfilechooserutils.h
=================================================================== ===================================================================
--- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserutils.h 2007-05-02 18:26:59.000000000 +0200 --- gtk+2.0-2.11.2.orig/gtk/gtkfilechooserutils.h 2007-06-06 13:43:08.000000000 +0200
+++ gtk+2.0-2.10.12/gtk/gtkfilechooserutils.h 2007-05-30 15:24:16.000000000 +0200 +++ gtk+2.0-2.11.2/gtk/gtkfilechooserutils.h 2007-06-13 11:07:26.000000000 +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__
@ -161,10 +161,10 @@ Index: gtk+2.0-2.10.12/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.10.12/gtk/gtkfilesystemmodel.h Index: gtk+2.0-2.11.2/gtk/gtkfilesystemmodel.h
=================================================================== ===================================================================
--- gtk+2.0-2.10.12.orig/gtk/gtkfilesystemmodel.h 2007-05-02 18:26:59.000000000 +0200 --- gtk+2.0-2.11.2.orig/gtk/gtkfilesystemmodel.h 2007-06-06 13:43:08.000000000 +0200
+++ gtk+2.0-2.10.12/gtk/gtkfilesystemmodel.h 2007-05-30 15:24:16.000000000 +0200 +++ gtk+2.0-2.11.2/gtk/gtkfilesystemmodel.h 2007-06-13 11:07:26.000000000 +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__
@ -176,10 +176,10 @@ Index: gtk+2.0-2.10.12/gtk/gtkfilesystemmodel.h
#include <glib-object.h> #include <glib-object.h>
#include "gtkfilesystem.h" #include "gtkfilesystem.h"
#include <gtk/gtktreemodel.h> #include <gtk/gtktreemodel.h>
Index: gtk+2.0-2.10.12/tests/autotestfilechooser.c Index: gtk+2.0-2.11.2/tests/autotestfilechooser.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.12.orig/tests/autotestfilechooser.c 2007-05-02 18:27:12.000000000 +0200 --- gtk+2.0-2.11.2.orig/tests/autotestfilechooser.c 2007-06-06 13:43:15.000000000 +0200
+++ gtk+2.0-2.10.12/tests/autotestfilechooser.c 2007-05-30 15:24:16.000000000 +0200 +++ gtk+2.0-2.11.2/tests/autotestfilechooser.c 2007-06-13 11:07:26.000000000 +0200
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
*/ */

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

@ -1,8 +1,8 @@
Index: gtk+2.0-2.10.12/gtk/gtksettings.c Index: gtk+2.0-2.11.2/gtk/gtksettings.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.12.orig/gtk/gtksettings.c 2007-05-03 21:26:35.000000000 +0200 --- gtk+2.0-2.11.2.orig/gtk/gtksettings.c 2007-06-06 13:43:08.000000000 +0200
+++ gtk+2.0-2.10.12/gtk/gtksettings.c 2007-05-03 21:26:40.000000000 +0200 +++ gtk+2.0-2.11.2/gtk/gtksettings.c 2007-06-13 11:07:39.000000000 +0200
@@ -247,7 +247,7 @@ @@ -289,7 +289,7 @@
g_param_spec_string ("gtk-fallback-icon-theme", g_param_spec_string ("gtk-fallback-icon-theme",
P_("Fallback Icon Theme Name"), P_("Fallback Icon Theme Name"),
P_("Name of a icon theme to fall back to"), P_("Name of a icon theme to fall back to"),

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

@ -1,7 +1,7 @@
Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.10.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-03-12 14:57:01.000000000 +0100 --- gtk+2.0-2.11.2.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-06 13:43:15.000000000 +0200
+++ gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c 2007-03-13 14:10:35.000000000 +0100 +++ gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-13 11:57:45.000000000 +0200
@@ -45,6 +45,9 @@ @@ -45,6 +45,9 @@
#undef STRICT #undef STRICT
#endif #endif
@ -12,9 +12,9 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
static gint static gint
format_check (GdkPixbufModule *module, guchar *buffer, int size) format_check (GdkPixbufModule *module, guchar *buffer, int size)
{ {
@@ -282,28 +285,93 @@ @@ -284,87 +287,93 @@
return result;
} #endif /* USE_GMODULE */
+/* FIXME this is a static copy of a public pango function which should really +/* FIXME this is a static copy of a public pango function which should really
+ * livein glib */ + * livein glib */
@ -95,6 +95,7 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
-gdk_pixbuf_io_init (void) -gdk_pixbuf_io_init (void)
+process_module_file (const gchar *filename, GIOChannel *channel) +process_module_file (const gchar *filename, GIOChannel *channel)
{ {
-#ifdef USE_GMODULE
- GIOChannel *channel; - GIOChannel *channel;
gchar *line_buf; gchar *line_buf;
gsize term; gsize term;
@ -106,18 +107,76 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
int n_patterns = 0; int n_patterns = 0;
GdkPixbufModulePattern *pattern; GdkPixbufModulePattern *pattern;
- GError *error = NULL; - GError *error = NULL;
-#endif
- GdkPixbufModule *builtin_module = NULL;
-
-#define load_one_builtin_module(format) \
- builtin_module = g_new0 (GdkPixbufModule, 1); \
- builtin_module->module_name = #format; \
- if (_gdk_pixbuf_load_module (builtin_module, NULL)) \
- file_formats = g_slist_prepend (file_formats, builtin_module);\
- else \
- g_free (builtin_module)
-
-#ifdef INCLUDE_ani
- load_one_builtin_module (ani);
-#endif
-#ifdef INCLUDE_png
- load_one_builtin_module (png);
-#endif
-#ifdef INCLUDE_bmp
- load_one_builtin_module (bmp);
-#endif
-#ifdef INCLUDE_wbmp
- load_one_builtin_module (wbmp);
-#endif
-#ifdef INCLUDE_gif
- load_one_builtin_module (gif);
-#endif
-#ifdef INCLUDE_ico
- load_one_builtin_module (ico);
-#endif
-#ifdef INCLUDE_jpeg
- load_one_builtin_module (jpeg);
-#endif
-#ifdef INCLUDE_pnm
- load_one_builtin_module (pnm);
-#endif
-#ifdef INCLUDE_ras
- load_one_builtin_module (ras);
-#endif
-#ifdef INCLUDE_tiff
- load_one_builtin_module (tiff);
-#endif
-#ifdef INCLUDE_xpm
- load_one_builtin_module (xpm);
-#endif
-#ifdef INCLUDE_xbm
- load_one_builtin_module (xbm);
-#endif
-#ifdef INCLUDE_tga
- load_one_builtin_module (tga);
-#endif
-#ifdef INCLUDE_pcx
- load_one_builtin_module (pcx);
-#endif
-
-#undef load_one_builtin_module
-#ifdef USE_GMODULE
- channel = g_io_channel_new_file (filename, "r", &error); - channel = g_io_channel_new_file (filename, "r", &error);
- if (!channel) { - if (!channel) {
- g_warning ("Cannot open pixbuf loader module file '%s': %s", - /* Don't bother warning if we have some built-in loaders */
- filename, error->message); - if (file_formats == NULL)
- g_warning ("Cannot open pixbuf loader module file '%s': %s",
- filename, error->message);
- return; - return;
- } - }
- -
while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) { while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) {
const char *p; const char *p;
@@ -436,8 +504,81 @@ @@ -497,8 +506,138 @@
g_free (line_buf); g_free (line_buf);
} }
g_string_free (tmp_buf, TRUE); g_string_free (tmp_buf, TRUE);
@ -128,6 +187,7 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
+static void +static void
+gdk_pixbuf_io_init (void) +gdk_pixbuf_io_init (void)
+{ +{
+#ifdef USE_GMODULE
+ GIOChannel *channel; + GIOChannel *channel;
+ gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file (); + gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file ();
+ /* FIXME: using an absolute path requires patching Makefile.am */ + /* FIXME: using an absolute path requires patching Makefile.am */
@ -139,7 +199,63 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
+ char **files; + char **files;
+ GError *error = NULL; + GError *error = NULL;
+ int n; + int n;
+#endif
+ GdkPixbufModule *builtin_module = NULL;
+ +
+#define load_one_builtin_module(format) \
+ builtin_module = g_new0 (GdkPixbufModule, 1); \
+ builtin_module->module_name = #format; \
+ if (_gdk_pixbuf_load_module (builtin_module, NULL)) \
+ file_formats = g_slist_prepend (file_formats, builtin_module);\
+ else \
+ g_free (builtin_module)
+
+#ifdef INCLUDE_ani
+ load_one_builtin_module (ani);
+#endif
+#ifdef INCLUDE_png
+ load_one_builtin_module (png);
+#endif
+#ifdef INCLUDE_bmp
+ load_one_builtin_module (bmp);
+#endif
+#ifdef INCLUDE_wbmp
+ load_one_builtin_module (wbmp);
+#endif
+#ifdef INCLUDE_gif
+ load_one_builtin_module (gif);
+#endif
+#ifdef INCLUDE_ico
+ load_one_builtin_module (ico);
+#endif
+#ifdef INCLUDE_jpeg
+ load_one_builtin_module (jpeg);
+#endif
+#ifdef INCLUDE_pnm
+ load_one_builtin_module (pnm);
+#endif
+#ifdef INCLUDE_ras
+ load_one_builtin_module (ras);
+#endif
+#ifdef INCLUDE_tiff
+ load_one_builtin_module (tiff);
+#endif
+#ifdef INCLUDE_xpm
+ load_one_builtin_module (xpm);
+#endif
+#ifdef INCLUDE_xbm
+ load_one_builtin_module (xbm);
+#endif
+#ifdef INCLUDE_tga
+ load_one_builtin_module (tga);
+#endif
+#ifdef INCLUDE_pcx
+ load_one_builtin_module (pcx);
+#endif
+
+#undef load_one_builtin_module
+
+#ifdef USE_GMODULE
+ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S, + list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
+ gdkpixbuf_module_file_str, + gdkpixbuf_module_file_str,
+ gdkpixbuf_module_files_d_str, + gdkpixbuf_module_files_d_str,
@ -198,6 +314,6 @@ Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
+ g_free (list_str); + g_free (list_str);
+ g_free (gdkpixbuf_module_files_d_str); + g_free (gdkpixbuf_module_files_d_str);
+ g_free (gdkpixbuf_module_file_str); + g_free (gdkpixbuf_module_file_str);
#endif
} }
/* actually load the image handler - gdk_pixbuf_get_module only get a */

14
debian/patches/030_gtkentry_password-char-circle.patch vendored
View File

@ -1,8 +1,8 @@
Index: gtk+2.0-2.10.10/gtk/gtkentry.c Index: gtk+2.0-2.11.2/gtk/gtkentry.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.10.orig/gtk/gtkentry.c 2007-03-12 14:51:19.000000000 +0100 --- gtk+2.0-2.11.2.orig/gtk/gtkentry.c 2007-06-06 13:43:09.000000000 +0200
+++ gtk+2.0-2.10.10/gtk/gtkentry.c 2007-03-13 14:10:39.000000000 +0100 +++ gtk+2.0-2.11.2/gtk/gtkentry.c 2007-06-13 11:37:03.000000000 +0200
@@ -526,7 +526,7 @@ @@ -537,7 +537,7 @@
g_param_spec_unichar ("invisible-char", g_param_spec_unichar ("invisible-char",
P_("Invisible character"), P_("Invisible character"),
P_("The character to use when masking entry contents (in \"password mode\")"), P_("The character to use when masking entry contents (in \"password mode\")"),
@ -11,7 +11,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkentry.c
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
@@ -1064,7 +1064,7 @@ @@ -1101,7 +1101,7 @@
entry->editable = TRUE; entry->editable = TRUE;
entry->visible = TRUE; entry->visible = TRUE;
@ -20,7 +20,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkentry.c
entry->dnd_position = -1; entry->dnd_position = -1;
entry->width_chars = -1; entry->width_chars = -1;
entry->is_cell_renderer = FALSE; entry->is_cell_renderer = FALSE;
@@ -4325,9 +4325,9 @@ @@ -4495,9 +4495,9 @@
* gtk_entry_set_visibility() has been called to set text visibility * gtk_entry_set_visibility() has been called to set text visibility
* to %FALSE. i.e. this is the character used in "password mode" to * to %FALSE. i.e. this is the character used in "password mode" to
* show the user how many characters have been typed. The default * show the user how many characters have been typed. The default
@ -30,6 +30,6 @@ Index: gtk+2.0-2.10.10/gtk/gtkentry.c
+ * invisible char is a black circle (Unicode character 25CF). If + * invisible char is a black circle (Unicode character 25CF). If
+ * you set the invisible char to 0, then the user will get no + * you set the invisible char to 0, then the user will get no
+ * feedback at all; there will be no text on the screen as they type. + * feedback at all; there will be no text on the screen as they type.
*
**/ **/
void void
gtk_entry_set_invisible_char (GtkEntry *entry,

38
debian/patches/033_treeview_resizing.patch vendored
View File

@ -1,8 +1,8 @@
Index: gtk+-2.10.12/gtk/gtktreeviewcolumn.c Index: gtk+2.0-2.11.2/gtk/gtktreeviewcolumn.c
=================================================================== ===================================================================
--- gtk+-2.10.12.orig/gtk/gtktreeviewcolumn.c 2007-05-18 19:06:21.720534000 +0200 --- gtk+2.0-2.11.2.orig/gtk/gtktreeviewcolumn.c 2007-06-06 14:59:53.000000000 +0200
+++ gtk+-2.10.12/gtk/gtktreeviewcolumn.c 2007-05-18 19:36:28.845472250 +0200 +++ gtk+2.0-2.11.2/gtk/gtktreeviewcolumn.c 2007-06-13 11:38:51.000000000 +0200
@@ -2115,6 +2115,7 @@ @@ -2129,6 +2129,7 @@
tree_column->tree_view != NULL && tree_column->tree_view != NULL &&
GTK_WIDGET_REALIZED (tree_column->tree_view)) GTK_WIDGET_REALIZED (tree_column->tree_view))
{ {
@ -10,11 +10,11 @@ Index: gtk+-2.10.12/gtk/gtktreeviewcolumn.c
gtk_widget_queue_resize (tree_column->tree_view); gtk_widget_queue_resize (tree_column->tree_view);
} }
Index: gtk+-2.10.12/gtk/gtktreeview.c Index: gtk+2.0-2.11.2/gtk/gtktreeview.c
=================================================================== ===================================================================
--- gtk+-2.10.12.orig/gtk/gtktreeview.c 2007-05-18 19:06:21.696532500 +0200 --- gtk+2.0-2.11.2.orig/gtk/gtktreeview.c 2007-06-06 13:43:08.000000000 +0200
+++ gtk+-2.10.12/gtk/gtktreeview.c 2007-05-18 20:30:24.331677500 +0200 +++ gtk+2.0-2.11.2/gtk/gtktreeview.c 2007-06-13 11:38:51.000000000 +0200
@@ -2093,18 +2093,20 @@ @@ -2105,18 +2105,20 @@
/* GtkWidget::size_allocate helper */ /* GtkWidget::size_allocate helper */
static void static void
@ -37,7 +37,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
tree_view = GTK_TREE_VIEW (widget); tree_view = GTK_TREE_VIEW (widget);
@@ -2139,12 +2141,38 @@ @@ -2151,12 +2153,38 @@
number_of_expand_columns++; number_of_expand_columns++;
} }
@ -77,7 +77,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
for (list = (rtl ? last_column : first_column); for (list = (rtl ? last_column : first_column);
list != (rtl ? first_column->prev : last_column->next); list != (rtl ? first_column->prev : last_column->next);
list = (rtl ? list->prev : list->next)) list = (rtl ? list->prev : list->next))
@@ -2199,6 +2227,10 @@ @@ -2211,6 +2239,10 @@
{ {
column->width += extra; column->width += extra;
} }
@ -88,7 +88,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
g_object_notify (G_OBJECT (column), "width"); g_object_notify (G_OBJECT (column), "width");
@@ -2233,13 +2265,13 @@ @@ -2245,13 +2277,13 @@
g_return_if_fail (GTK_IS_TREE_VIEW (widget)); g_return_if_fail (GTK_IS_TREE_VIEW (widget));
@ -105,7 +105,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
tmp_list = tree_view->priv->children; tmp_list = tree_view->priv->children;
while (tmp_list) while (tmp_list)
@@ -2326,7 +2358,7 @@ @@ -2338,7 +2370,7 @@
allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view)); allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
} }
@ -114,7 +114,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
if (tree_view->priv->tree == NULL) if (tree_view->priv->tree == NULL)
invalidate_empty_focus (tree_view); invalidate_empty_focus (tree_view);
@@ -2737,7 +2769,7 @@ @@ -2749,7 +2781,7 @@
gtk_grab_add (widget); gtk_grab_add (widget);
GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE); GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
@ -123,7 +123,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
/* block attached dnd signal handler */ /* block attached dnd signal handler */
drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data"); drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data");
@@ -3450,6 +3482,8 @@ @@ -3458,6 +3490,8 @@
{ {
column->use_resized_width = TRUE; column->use_resized_width = TRUE;
column->resized_width = new_width; column->resized_width = new_width;
@ -132,7 +132,7 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
gtk_widget_queue_resize (widget); gtk_widget_queue_resize (widget);
} }
@@ -11192,7 +11226,7 @@ @@ -11253,7 +11287,7 @@
if (GTK_WIDGET_REALIZED (tree_view)) if (GTK_WIDGET_REALIZED (tree_view))
{ {
gtk_widget_queue_resize (GTK_WIDGET (tree_view)); gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@ -141,11 +141,11 @@ Index: gtk+-2.10.12/gtk/gtktreeview.c
} }
g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0); g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
Index: gtk+-2.10.12/gtk/gtktreeprivate.h Index: gtk+2.0-2.11.2/gtk/gtktreeprivate.h
=================================================================== ===================================================================
--- gtk+-2.10.12.orig/gtk/gtktreeprivate.h 2007-05-18 19:06:21.648529500 +0200 --- gtk+2.0-2.11.2.orig/gtk/gtktreeprivate.h 2007-06-06 13:43:08.000000000 +0200
+++ gtk+-2.10.12/gtk/gtktreeprivate.h 2007-05-18 19:36:28.869473750 +0200 +++ gtk+2.0-2.11.2/gtk/gtktreeprivate.h 2007-06-13 11:38:51.000000000 +0200
@@ -263,6 +263,10 @@ @@ -264,6 +264,10 @@
gboolean tree_lines_enabled; gboolean tree_lines_enabled;
GdkGC *tree_line_gc; GdkGC *tree_line_gc;

3
debian/patches/040_filechooser_single-click.patch vendored
View File

@ -1,3 +1,6 @@
Debian #405296; GNOME #148828; permit single click in filechooser instead of
requiring double-click.
Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c
=================================================================== ===================================================================
--- gtk+-2.10.12.orig/gtk/gtkfilechooserdefault.c 2007-05-18 18:33:08.711978750 +0200 --- gtk+-2.10.12.orig/gtk/gtkfilechooserdefault.c 2007-05-18 18:33:08.711978750 +0200

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

@ -1,7 +1,7 @@
Index: gtk+2.0-2.10.11/gdk-pixbuf/gdk-pixbuf-io.c Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.11.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-04-13 10:56:36.000000000 +0200 --- gtk+2.0-2.11.2.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-13 11:44:25.000000000 +0200
+++ gtk+2.0-2.10.11/gdk-pixbuf/gdk-pixbuf-io.c 2007-04-13 10:56:40.000000000 +0200 +++ gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-13 11:44:41.000000000 +0200
@@ -280,8 +280,20 @@ @@ -280,8 +280,20 @@
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE")); gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
@ -25,11 +25,11 @@ Index: gtk+2.0-2.10.11/gdk-pixbuf/gdk-pixbuf-io.c
return result; return result;
} }
Index: gtk+2.0-2.10.11/gtk/gtkrc.c Index: gtk+2.0-2.11.2/gtk/gtkrc.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.11.orig/gtk/gtkrc.c 2007-04-13 10:56:36.000000000 +0200 --- gtk+2.0-2.11.2.orig/gtk/gtkrc.c 2007-06-06 13:43:09.000000000 +0200
+++ gtk+2.0-2.10.11/gtk/gtkrc.c 2007-04-13 10:56:40.000000000 +0200 +++ gtk+2.0-2.11.2/gtk/gtkrc.c 2007-06-13 11:44:41.000000000 +0200
@@ -447,7 +447,20 @@ @@ -449,7 +449,20 @@
if (im_module_file) if (im_module_file)
result = g_strdup (im_module_file); result = g_strdup (im_module_file);
else else
@ -51,7 +51,7 @@ Index: gtk+2.0-2.10.11/gtk/gtkrc.c
} }
return result; return result;
@@ -519,7 +532,21 @@ @@ -521,7 +534,21 @@
else else
{ {
const gchar *home; const gchar *home;
@ -74,7 +74,7 @@ Index: gtk+2.0-2.10.11/gtk/gtkrc.c
gtk_rc_add_default_file (str); gtk_rc_add_default_file (str);
g_free (str); g_free (str);
@@ -527,7 +554,21 @@ @@ -529,7 +556,21 @@
home = g_get_home_dir (); home = g_get_home_dir ();
if (home) if (home)
{ {

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

File diff suppressed because it is too large Load Diff

3
debian/patches/series vendored
View File

@ -9,8 +9,7 @@
020_immodules-files-d.patch 020_immodules-files-d.patch
021_loader-files-d.patch 021_loader-files-d.patch
030_gtkentry_password-char-circle.patch 030_gtkentry_password-char-circle.patch
031_cursor-blinking-timeout.patch
033_treeview_resizing.patch 033_treeview_resizing.patch
040_filechooser_single-click.patch #040_filechooser_single-click.patch
041_ia32-libs.patch 041_ia32-libs.patch
070_mandatory-relibtoolize.patch 070_mandatory-relibtoolize.patch

4
debian/rules vendored
View File

@ -3,6 +3,8 @@
# Debian GNOME Maintainers # Debian GNOME Maintainers
DISABLE_UPDATE_UPLOADERS := 1 DISABLE_UPDATE_UPLOADERS := 1
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
# prevent accidental uploads to unstable
include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
# get-orig-source target # get-orig-source target
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
@ -40,7 +42,7 @@ DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//') VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
APIVER := 2.0 APIVER := 2.0
SONAME := 0 SONAME := 0
SHVER := 2.10.12-3 SHVER := 2.11.2
# earliest version that this release has backwards binary compatibility for # earliest version that this release has backwards binary compatibility for
GTK_BINARY_VERSION := 2.10.0 GTK_BINARY_VERSION := 2.10.0