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

* New upstream release.

Browse Source 
- Drop patch 003_default_fallback_icon_theme, upstream added a fallback on
    hicolor.
  - Drop patch 015_gdkmain-x11_button-mask.patch, merged upstream.
  - Refresh patches.
  - Relibtoolize.
This commit is contained in:
Loïc Minier
2007-03-13 14:49:38 +00:00
parent 309ea8ddc9
commit 76fe0d9fb4
19 changed files with 1221 additions and 29267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,4 +1,4 @@
gtk+2.0 (2.10.9-2) UNRELEASED; urgency=low gtk+2.0 (2.10.10-1) UNRELEASED; urgency=low
* Move build and install base dirs to debian/build and debian/install * Move build and install base dirs to debian/build and debian/install
instead of debian/tmp/build and debian/tmp/install. instead of debian/tmp/build and debian/tmp/install.
@ -6,8 +6,14 @@ gtk+2.0 (2.10.9-2) UNRELEASED; urgency=low
* Make debian/control PHONY. * Make debian/control PHONY.
* Use @DOC_PKG@ to point at the HTML doc as well. * Use @DOC_PKG@ to point at the HTML doc as well.
* Tune udeb description. * Tune udeb description.
* New upstream release.
- Drop patch 003_default_fallback_icon_theme, upstream added a fallback on
hicolor.
- Drop patch 015_gdkmain-x11_button-mask.patch, merged upstream.
- Refresh patches.
- Relibtoolize.
-- Loic Minier <lool@dooz.org> Thu, 8 Mar 2007 17:59:09 +0100 -- Loic Minier <lool@dooz.org> Tue, 13 Mar 2007 14:29:12 +0100
gtk+2.0 (2.10.9-1) experimental; urgency=low gtk+2.0 (2.10.9-1) experimental; urgency=low

7
debian/patches/000_gtk+-2.0.6-exportsymbols.patch vendored
View File

@ -1,6 +1,7 @@
diff -urN gtk+-2.10.1.orig/configure.in gtk+-2.10.1/configure.in Index: gtk+2.0-2.10.10/configure.in
--- gtk+-2.10.1.orig/configure.in 2006-07-17 04:57:44.000000000 +0200 ===================================================================
+++ gtk+-2.10.1/configure.in 2006-08-15 00:03:49.000000000 +0200 --- gtk+2.0-2.10.10.orig/configure.in 2007-03-12 15:07:22.000000000 +0100
+++ gtk+2.0-2.10.10/configure.in 2007-03-13 14:10:00.000000000 +0100
@@ -351,7 +351,8 @@ @@ -351,7 +351,8 @@
if test "$os_win32" != yes; then if test "$os_win32" != yes; then
# libtool option to control which symbols are exported # libtool option to control which symbols are exported

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

@ -1,7 +1,7 @@
Index: gtk+-2.10.7/configure.in Index: gtk+2.0-2.10.10/configure.in
=================================================================== ===================================================================
--- gtk+-2.10.7.orig/configure.in 2007-01-09 23:18:48.410353000 +0100 --- gtk+2.0-2.10.10.orig/configure.in 2007-03-13 14:10:00.000000000 +0100
+++ gtk+-2.10.7/configure.in 2007-01-09 23:18:59.591051750 +0100 +++ gtk+2.0-2.10.10/configure.in 2007-03-13 14:10:04.000000000 +0100
@@ -134,6 +134,7 @@ @@ -134,6 +134,7 @@
dnl Initialize libtool dnl Initialize libtool
AC_PROG_CC AC_PROG_CC
@ -10,10 +10,10 @@ Index: gtk+-2.10.7/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.10.7/modules/input/Makefile.am Index: gtk+2.0-2.10.10/modules/input/Makefile.am
=================================================================== ===================================================================
--- gtk+-2.10.7.orig/modules/input/Makefile.am 2007-01-05 19:36:21.000000000 +0100 --- gtk+2.0-2.10.10.orig/modules/input/Makefile.am 2007-03-12 14:58:52.000000000 +0100
+++ gtk+-2.10.7/modules/input/Makefile.am 2007-01-09 23:18:59.591051750 +0100 +++ gtk+2.0-2.10.10/modules/input/Makefile.am 2007-03-13 14:10:04.000000000 +0100
@@ -94,8 +94,12 @@ @@ -94,8 +94,12 @@
if CROSS_COMPILING if CROSS_COMPILING
RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_IMMODULES_TEST=false

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

@ -1,6 +1,7 @@
diff -urN gtk+-2.10.1.orig/Makefile.am gtk+-2.10.1/Makefile.am Index: gtk+2.0-2.10.10/Makefile.am
--- gtk+-2.10.1.orig/Makefile.am 2006-05-05 18:07:44.000000000 +0200 ===================================================================
+++ gtk+-2.10.1/Makefile.am 2006-08-15 11:57:07.000000000 +0200 --- gtk+2.0-2.10.10.orig/Makefile.am 2007-03-12 15:12:11.000000000 +0100
+++ gtk+2.0-2.10.10/Makefile.am 2007-03-13 14:10:07.000000000 +0100
@@ -1,6 +1,11 @@ @@ -1,6 +1,11 @@
## Makefile.am for GTK+ ## Makefile.am for GTK+

13
debian/patches/003_default_fallback_icon_theme.patch vendored
View File

@ -1,13 +0,0 @@
Index: gtk+2.0-2.10.6/gtk/gtkicontheme.c
===================================================================
--- gtk+2.0-2.10.6.orig/gtk/gtkicontheme.c 2006-08-15 20:25:35.000000000 +0200
+++ gtk+2.0-2.10.6/gtk/gtkicontheme.c 2006-12-28 23:41:22.000000000 +0100
@@ -393,6 +393,8 @@
"gtk-fallback-icon-theme", &fallback_theme, NULL);
}
+ if (!fallback_theme)
+ fallback_theme = g_strdup ("gnome");
if (!theme)
theme = g_strdup (DEFAULT_THEME_NAME);

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

@ -1,7 +1,7 @@
Index: gtk+2.0-2.10.6/gtk/gtkfilesel.c Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.6.orig/gtk/gtkfilesel.c 2006-09-10 08:33:13.000000000 +0200 --- gtk+2.0-2.10.10.orig/gtk/gtkfilesel.c 2007-03-12 14:51:01.000000000 +0100
+++ gtk+2.0-2.10.6/gtk/gtkfilesel.c 2006-12-28 23:41:30.000000000 +0100 +++ gtk+2.0-2.10.10/gtk/gtkfilesel.c 2007-03-13 14:10:10.000000000 +0100
@@ -79,9 +79,13 @@ @@ -79,9 +79,13 @@
#undef GTK_DISABLE_DEPRECATED #undef GTK_DISABLE_DEPRECATED
#include "gtkoptionmenu.h" #include "gtkoptionmenu.h"
@ -388,10 +388,10 @@ Index: gtk+2.0-2.10.6/gtk/gtkfilesel.c
static gint static gint
gtk_file_selection_key_press (GtkWidget *widget, gtk_file_selection_key_press (GtkWidget *widget,
GdkEventKey *event, GdkEventKey *event,
Index: gtk+2.0-2.10.6/gtk/stock-icons/ximian-icons.h Index: gtk+2.0-2.10.10/gtk/stock-icons/ximian-icons.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gtk+2.0-2.10.6/gtk/stock-icons/ximian-icons.h 2006-12-28 23:41:30.000000000 +0100 +++ gtk+2.0-2.10.10/gtk/stock-icons/ximian-icons.h 2007-03-13 14:10:10.000000000 +0100
@@ -0,0 +1,825 @@ @@ -0,0 +1,825 @@
+/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ +/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+ +

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

@ -1,6 +1,7 @@
diff -Nur gtk+-2.4.9.orig/gdk-pixbuf/io-ico.c gtk+-2.4.9/gdk-pixbuf/io-ico.c Index: gtk+2.0-2.10.10/gdk-pixbuf/io-ico.c
--- gtk+-2.4.9.orig/gdk-pixbuf/io-ico.c 2004-08-25 18:52:18.000000000 +0200 ===================================================================
+++ gtk+-2.4.9/gdk-pixbuf/io-ico.c 2004-09-15 00:40:17.000000000 +0200 --- gtk+2.0-2.10.10.orig/gdk-pixbuf/io-ico.c 2007-03-12 14:57:04.000000000 +0100
+++ gtk+2.0-2.10.10/gdk-pixbuf/io-ico.c 2007-03-13 14:10:18.000000000 +0100
@@ -210,6 +210,14 @@ @@ -210,6 +210,14 @@
State->HeaderSize = 6 + IconCount*16; State->HeaderSize = 6 + IconCount*16;

7
debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch vendored
View File

@ -1,6 +1,7 @@
diff -urN gtk+-2.10.1.orig/gdk/directfb/gdkdrawable-directfb.c gtk+-2.10.1/gdk/directfb/gdkdrawable-directfb.c Index: gtk+2.0-2.10.10/gdk/directfb/gdkdrawable-directfb.c
--- gtk+-2.10.1.orig/gdk/directfb/gdkdrawable-directfb.c 2006-07-14 02:17:52.000000000 +0200 ===================================================================
+++ gtk+-2.10.1/gdk/directfb/gdkdrawable-directfb.c 2006-08-15 00:09:16.000000000 +0200 --- gtk+2.0-2.10.10.orig/gdk/directfb/gdkdrawable-directfb.c 2007-03-12 15:06:54.000000000 +0100
+++ gtk+2.0-2.10.10/gdk/directfb/gdkdrawable-directfb.c 2007-03-13 14:10:23.000000000 +0100
@@ -45,6 +45,7 @@ @@ -45,6 +45,7 @@
#include "gdkregion-generic.h" #include "gdkregion-generic.h"
#include "gdkalias.h" #include "gdkalias.h"

6
debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch vendored
View File

@ -1,5 +1,7 @@
--- gtk+-2.8.18-dfb/gdk/directfb/gdkgc-directfb.c.orig 2006-08-02 15:57:02.000000000 +0200 Index: gtk+2.0-2.10.10/gdk/directfb/gdkgc-directfb.c
+++ gtk+-2.8.18-dfb/gdk/directfb/gdkgc-directfb.c 2006-08-02 15:56:28.000000000 +0200 ===================================================================
--- gtk+2.0-2.10.10.orig/gdk/directfb/gdkgc-directfb.c 2007-03-12 15:06:51.000000000 +0100
+++ gtk+2.0-2.10.10/gdk/directfb/gdkgc-directfb.c 2007-03-13 14:10:26.000000000 +0100
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
*/ */

18
debian/patches/011_directfb-build-fixes-from-head.patch vendored
View File

@ -1,7 +1,7 @@
Index: gtk+2.0-2.10.4/gdk/directfb/gdkcolor-directfb.c Index: gtk+2.0-2.10.10/gdk/directfb/gdkcolor-directfb.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gdk/directfb/gdkcolor-directfb.c 2006-09-24 11:28:43.000000000 +0200 --- gtk+2.0-2.10.10.orig/gdk/directfb/gdkcolor-directfb.c 2007-03-12 15:06:53.000000000 +0100
+++ gtk+2.0-2.10.4/gdk/directfb/gdkcolor-directfb.c 2006-09-24 11:33:24.000000000 +0200 +++ gtk+2.0-2.10.10/gdk/directfb/gdkcolor-directfb.c 2007-03-13 14:10:27.000000000 +0100
@@ -38,12 +38,10 @@ @@ -38,12 +38,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -24,10 +24,10 @@ Index: gtk+2.0-2.10.4/gdk/directfb/gdkcolor-directfb.c
- -
#define __GDK_COLOR_X11_C__ #define __GDK_COLOR_X11_C__
#include "gdkaliasdef.c" #include "gdkaliasdef.c"
Index: gtk+2.0-2.10.4/gdk/directfb/gdkwindow-directfb.c Index: gtk+2.0-2.10.10/gdk/directfb/gdkwindow-directfb.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gdk/directfb/gdkwindow-directfb.c 2006-09-24 11:29:06.000000000 +0200 --- gtk+2.0-2.10.10.orig/gdk/directfb/gdkwindow-directfb.c 2007-03-12 15:06:56.000000000 +0100
+++ gtk+2.0-2.10.4/gdk/directfb/gdkwindow-directfb.c 2006-09-24 11:34:19.000000000 +0200 +++ gtk+2.0-2.10.10/gdk/directfb/gdkwindow-directfb.c 2007-03-13 14:10:27.000000000 +0100
@@ -2990,6 +2990,12 @@ @@ -2990,6 +2990,12 @@
iface->process_updates = gdk_window_impl_directfb_process_updates; iface->process_updates = gdk_window_impl_directfb_process_updates;
} }
@ -41,10 +41,10 @@ Index: gtk+2.0-2.10.4/gdk/directfb/gdkwindow-directfb.c
#define __GDK_WINDOW_X11_C__ #define __GDK_WINDOW_X11_C__
#include "gdkaliasdef.c" #include "gdkaliasdef.c"
Index: gtk+2.0-2.10.4/gdk/directfb/Makefile.am Index: gtk+2.0-2.10.10/gdk/directfb/Makefile.am
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gdk/directfb/Makefile.am 2006-09-24 11:29:12.000000000 +0200 --- gtk+2.0-2.10.10.orig/gdk/directfb/Makefile.am 2007-03-12 15:08:50.000000000 +0100
+++ gtk+2.0-2.10.4/gdk/directfb/Makefile.am 2006-09-24 11:34:51.000000000 +0200 +++ gtk+2.0-2.10.10/gdk/directfb/Makefile.am 2007-03-13 14:10:27.000000000 +0100
@@ -4,12 +4,11 @@ @@ -4,12 +4,11 @@
INCLUDES = \ INCLUDES = \

6
debian/patches/013_gdkproperty-directfb-strdup.patch vendored
View File

@ -1,7 +1,7 @@
Index: gtk+2.0-2.10.6/gdk/directfb/gdkproperty-directfb.c Index: gtk+2.0-2.10.10/gdk/directfb/gdkproperty-directfb.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.6.orig/gdk/directfb/gdkproperty-directfb.c 2006-10-08 16:07:31.000000000 +0200 --- gtk+2.0-2.10.10.orig/gdk/directfb/gdkproperty-directfb.c 2007-03-12 15:08:51.000000000 +0100
+++ gtk+2.0-2.10.6/gdk/directfb/gdkproperty-directfb.c 2006-10-08 16:07:53.000000000 +0200 +++ gtk+2.0-2.10.10/gdk/directfb/gdkproperty-directfb.c 2007-03-13 14:10:31.000000000 +0100
@@ -192,7 +192,7 @@ @@ -192,7 +192,7 @@
if (GPOINTER_TO_INT (atom) >= atoms_to_names->len) if (GPOINTER_TO_INT (atom) >= atoms_to_names->len)
return NULL; return NULL;

26
debian/patches/015_gdkmain-x11_button-mask.patch vendored
View File

@ -1,26 +0,0 @@
Index: gtk+-2.10.7/gdk/x11/gdkmain-x11.c
===================================================================
--- gtk+-2.10.7.orig/gdk/x11/gdkmain-x11.c 2007-02-17 23:39:12.000000000 +0100
+++ gtk+-2.10.7/gdk/x11/gdkmain-x11.c 2007-02-17 23:39:31.000000000 +0100
@@ -504,6 +504,12 @@
}
}
+#define GDK_ANY_BUTTON_MASK (GDK_BUTTON1_MASK | \
+ GDK_BUTTON2_MASK | \
+ GDK_BUTTON3_MASK | \
+ GDK_BUTTON4_MASK | \
+ GDK_BUTTON5_MASK)
+
/**
* _gdk_xgrab_check_button_event:
* @window: a #GdkWindow
@@ -533,7 +539,7 @@
case ButtonRelease:
if (display_x11->pointer_xgrab_window &&
display_x11->pointer_xgrab_implicit &&
- (xevent->xbutton.state & ~(GDK_BUTTON1_MASK << (xevent->xbutton.button - 1))) == 0)
+ (xevent->xbutton.state & GDK_ANY_BUTTON_MASK & ~(GDK_BUTTON1_MASK << (xevent->xbutton.button - 1))) == 0)
{
display_x11->pointer_xgrab_window = NULL;
}

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

@ -1,7 +1,7 @@
Index: gtk+-2.10.9/gtk/gtkimmodule.c Index: gtk+2.0-2.10.10/gtk/gtkimmodule.c
=================================================================== ===================================================================
--- gtk+-2.10.9.orig/gtk/gtkimmodule.c 2007-03-01 21:45:33.000000000 +0100 --- gtk+2.0-2.10.10.orig/gtk/gtkimmodule.c 2007-03-12 14:51:28.000000000 +0100
+++ gtk+-2.10.9/gtk/gtkimmodule.c 2007-03-01 21:45:35.000000000 +0100 +++ gtk+2.0-2.10.10/gtk/gtkimmodule.c 2007-03-13 14:10:33.000000000 +0100
@@ -59,6 +59,9 @@ @@ -59,6 +59,9 @@
#define GTK_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_CAST ((im_module), GTK_TYPE_IM_MODULE, GtkIMModule)) #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)) #define GTK_IS_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_TYPE ((im_module), GTK_TYPE_IM_MODULE))

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

@ -1,7 +1,7 @@
Index: gtk+2.0-2.10.4/gdk-pixbuf/gdk-pixbuf-io.c Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gdk-pixbuf/gdk-pixbuf-io.c 2006-09-10 08:33:10.000000000 +0200 --- 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.10.4/gdk-pixbuf/gdk-pixbuf-io.c 2006-09-23 10:17:46.000000000 +0200 +++ gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c 2007-03-13 14:10:35.000000000 +0100
@@ -45,6 +45,9 @@ @@ -45,6 +45,9 @@
#undef STRICT #undef STRICT
#endif #endif

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

@ -1,7 +1,7 @@
Index: gtk+-2.10.7/gtk/gtkentry.c Index: gtk+2.0-2.10.10/gtk/gtkentry.c
=================================================================== ===================================================================
--- gtk+-2.10.7.orig/gtk/gtkentry.c 2007-01-05 19:32:46.000000000 +0100 --- gtk+2.0-2.10.10.orig/gtk/gtkentry.c 2007-03-12 14:51:19.000000000 +0100
+++ gtk+-2.10.7/gtk/gtkentry.c 2007-01-09 23:21:46.613490000 +0100 +++ gtk+2.0-2.10.10/gtk/gtkentry.c 2007-03-13 14:10:39.000000000 +0100
@@ -526,7 +526,7 @@ @@ -526,7 +526,7 @@
g_param_spec_unichar ("invisible-char", g_param_spec_unichar ("invisible-char",
P_("Invisible character"), P_("Invisible character"),

34
debian/patches/031_cursor-blinking-timeout.patch vendored
View File

@ -23,10 +23,10 @@ seconds.
(gtk_text_view_button_press_event, gtk_text_view_focus_in_event): (gtk_text_view_button_press_event, gtk_text_view_focus_in_event):
Reset the blink timer. Reset the blink timer.
Index: gtk+-2.10.9/gtk/gtkentry.c Index: gtk+2.0-2.10.10/gtk/gtkentry.c
=================================================================== ===================================================================
--- gtk+-2.10.9.orig/gtk/gtkentry.c 2007-03-01 21:45:42.000000000 +0100 --- gtk+2.0-2.10.10.orig/gtk/gtkentry.c 2007-03-13 14:10:39.000000000 +0100
+++ gtk+-2.10.9/gtk/gtkentry.c 2007-03-01 21:45:43.000000000 +0100 +++ gtk+2.0-2.10.10/gtk/gtkentry.c 2007-03-13 14:10:42.000000000 +0100
@@ -82,6 +82,7 @@ @@ -82,6 +82,7 @@
{ {
gfloat xalign; gfloat xalign;
@ -204,10 +204,10 @@ Index: gtk+-2.10.9/gtk/gtkentry.c
/* completion */ /* completion */
static gint static gint
gtk_entry_completion_timeout (gpointer data) gtk_entry_completion_timeout (gpointer data)
Index: gtk+-2.10.9/gtk/gtksettings.c Index: gtk+2.0-2.10.10/gtk/gtksettings.c
=================================================================== ===================================================================
--- gtk+-2.10.9.orig/gtk/gtksettings.c 2007-01-22 16:48:04.000000000 +0100 --- gtk+2.0-2.10.10.orig/gtk/gtksettings.c 2007-03-12 14:50:58.000000000 +0100
+++ gtk+-2.10.9/gtk/gtksettings.c 2007-03-01 21:45:43.000000000 +0100 +++ gtk+2.0-2.10.10/gtk/gtksettings.c 2007-03-13 14:10:42.000000000 +0100
@@ -64,6 +64,7 @@ @@ -64,6 +64,7 @@
PROP_DOUBLE_CLICK_DISTANCE, PROP_DOUBLE_CLICK_DISTANCE,
PROP_CURSOR_BLINK, PROP_CURSOR_BLINK,
@ -265,10 +265,10 @@ Index: gtk+-2.10.9/gtk/gtksettings.c
result = settings_install_property_parser (class, result = settings_install_property_parser (class,
g_param_spec_boolean ("gtk-split-cursor", g_param_spec_boolean ("gtk-split-cursor",
P_("Split Cursor"), P_("Split Cursor"),
Index: gtk+-2.10.9/gtk/gtktextview.c Index: gtk+2.0-2.10.10/gtk/gtktextview.c
=================================================================== ===================================================================
--- gtk+-2.10.9.orig/gtk/gtktextview.c 2007-01-22 16:48:03.000000000 +0100 --- gtk+2.0-2.10.10.orig/gtk/gtktextview.c 2007-03-12 14:50:26.000000000 +0100
+++ gtk+-2.10.9/gtk/gtktextview.c 2007-03-01 21:45:44.000000000 +0100 +++ gtk+2.0-2.10.10/gtk/gtktextview.c 2007-03-13 14:10:42.000000000 +0100
@@ -99,6 +99,16 @@ @@ -99,6 +99,16 @@
#define SPACE_FOR_CURSOR 1 #define SPACE_FOR_CURSOR 1
@ -286,7 +286,7 @@ Index: gtk+-2.10.9/gtk/gtktextview.c
struct _GtkTextPendingScroll struct _GtkTextPendingScroll
{ {
GtkTextMark *mark; GtkTextMark *mark;
@@ -291,6 +301,7 @@ @@ -290,6 +300,7 @@
static void gtk_text_view_check_cursor_blink (GtkTextView *text_view); static void gtk_text_view_check_cursor_blink (GtkTextView *text_view);
static void gtk_text_view_pend_cursor_blink (GtkTextView *text_view); static void gtk_text_view_pend_cursor_blink (GtkTextView *text_view);
static void gtk_text_view_stop_cursor_blink (GtkTextView *text_view); static void gtk_text_view_stop_cursor_blink (GtkTextView *text_view);
@ -294,7 +294,7 @@ Index: gtk+-2.10.9/gtk/gtktextview.c
static void gtk_text_view_value_changed (GtkAdjustment *adj, static void gtk_text_view_value_changed (GtkAdjustment *adj,
GtkTextView *view); GtkTextView *view);
@@ -1008,6 +1019,8 @@ @@ -1007,6 +1018,8 @@
gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK, gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"move_focus", 1, "move_focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD); GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
@ -331,7 +331,7 @@ Index: gtk+-2.10.9/gtk/gtktextview.c
if (text_view->cursor_visible && text_view->layout) if (text_view->cursor_visible && text_view->layout)
{ {
gtk_text_layout_set_cursor_visible (text_view->layout, TRUE); gtk_text_layout_set_cursor_visible (text_view->layout, TRUE);
@@ -4435,9 +4453,10 @@ @@ -4437,9 +4455,10 @@
g_slist_free (copy); g_slist_free (copy);
} }
@ -345,7 +345,7 @@ Index: gtk+-2.10.9/gtk/gtktextview.c
static gboolean static gboolean
cursor_blinks (GtkTextView *text_view) cursor_blinks (GtkTextView *text_view)
@@ -4482,6 +4501,18 @@ @@ -4484,6 +4503,18 @@
return time; return time;
} }
@ -364,7 +364,7 @@ Index: gtk+-2.10.9/gtk/gtktextview.c
/* /*
* Blink! * Blink!
*/ */
@@ -4490,12 +4521,15 @@ @@ -4492,12 +4523,15 @@
blink_cb (gpointer data) blink_cb (gpointer data)
{ {
GtkTextView *text_view; GtkTextView *text_view;
@ -381,7 +381,7 @@ Index: gtk+-2.10.9/gtk/gtktextview.c
if (!GTK_WIDGET_HAS_FOCUS (text_view)) if (!GTK_WIDGET_HAS_FOCUS (text_view))
{ {
g_warning ("GtkTextView - did not receive focus-out-event. If you\n" g_warning ("GtkTextView - did not receive focus-out-event. If you\n"
@@ -4512,14 +4546,25 @@ @@ -4514,14 +4548,25 @@
visible = gtk_text_layout_get_cursor_visible (text_view->layout); visible = gtk_text_layout_get_cursor_visible (text_view->layout);
@ -413,7 +413,7 @@ Index: gtk+-2.10.9/gtk/gtktextview.c
/* Block changed_handler while changing the layout's cursor visibility /* Block changed_handler while changing the layout's cursor visibility
* because it would expose the whole paragraph. Instead, we expose * because it would expose the whole paragraph. Instead, we expose
@@ -4565,7 +4610,7 @@ @@ -4567,7 +4612,7 @@
{ {
gtk_text_layout_set_cursor_visible (text_view->layout, TRUE); gtk_text_layout_set_cursor_visible (text_view->layout, TRUE);
@ -422,7 +422,7 @@ Index: gtk+-2.10.9/gtk/gtktextview.c
blink_cb, blink_cb,
text_view); text_view);
} }
@@ -4594,12 +4639,22 @@ @@ -4596,12 +4641,22 @@
gtk_text_view_stop_cursor_blink (text_view); gtk_text_view_stop_cursor_blink (text_view);
gtk_text_layout_set_cursor_visible (text_view->layout, TRUE); gtk_text_layout_set_cursor_visible (text_view->layout, TRUE);

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

@ -1,8 +1,8 @@
Index: gtk+-2.10.7/gtk/gtkfilechooserdefault.c Index: gtk+2.0-2.10.10/gtk/gtkfilechooserdefault.c
=================================================================== ===================================================================
--- gtk+-2.10.7.orig/gtk/gtkfilechooserdefault.c 2007-02-17 23:40:07.000000000 +0100 --- gtk+2.0-2.10.10.orig/gtk/gtkfilechooserdefault.c 2007-03-12 14:50:39.000000000 +0100
+++ gtk+-2.10.7/gtk/gtkfilechooserdefault.c 2007-02-18 01:50:57.000000000 +0100 +++ gtk+2.0-2.10.10/gtk/gtkfilechooserdefault.c 2007-03-13 14:10:47.000000000 +0100
@@ -3224,8 +3224,22 @@ @@ -3225,8 +3225,22 @@
shortcuts_selection_changed_cb (GtkTreeSelection *selection, shortcuts_selection_changed_cb (GtkTreeSelection *selection,
GtkFileChooserDefault *impl) GtkFileChooserDefault *impl)
{ {
@ -25,7 +25,7 @@ Index: gtk+-2.10.7/gtk/gtkfilechooserdefault.c
} }
static gboolean static gboolean
@@ -7836,10 +7850,13 @@ @@ -7849,10 +7863,13 @@
/* The focus is on a dialog's action area button, *and* the widget that /* The focus is on a dialog's action area button, *and* the widget that
* was focused immediately before it is the shortcuts list. Switch to the * was focused immediately before it is the shortcuts list. Switch to the
* selected shortcut and tell the caller not to respond. * selected shortcut and tell the caller not to respond.
@ -40,7 +40,7 @@ Index: gtk+-2.10.7/gtk/gtkfilechooserdefault.c
{ {
shortcuts_activate_iter (impl, &iter); shortcuts_activate_iter (impl, &iter);
@@ -8178,17 +8195,6 @@ @@ -8191,17 +8208,6 @@
GtkTreeViewColumn *column, GtkTreeViewColumn *column,
GtkFileChooserDefault *impl) GtkFileChooserDefault *impl)
{ {

30291
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,14 +1,12 @@
000_gtk+-2.0.6-exportsymbols.patch 000_gtk+-2.0.6-exportsymbols.patch
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_default_fallback_icon_theme.patch
004_gtk+-ximian-gtk2-filesel-navbutton-5.patch 004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
005_xpmico.patch 005_xpmico.patch
007_implicit_pointer_conversion_gdkdrawable_directfb.patch 007_implicit_pointer_conversion_gdkdrawable_directfb.patch
008_implicit_pointer_conversion_gdkgc_directfb.patch 008_implicit_pointer_conversion_gdkgc_directfb.patch
011_directfb-build-fixes-from-head.patch 011_directfb-build-fixes-from-head.patch
013_gdkproperty-directfb-strdup.patch 013_gdkproperty-directfb-strdup.patch
015_gdkmain-x11_button-mask.patch
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