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

* New patch, 010_fix-stuc-vs-stub-typo, to replace "stuc" with "stub" in

Browse Source 
gtk/Makefile.am; from HEAD, not commited in the gtk-2-10 branch.
* New patch, 011_directfb-build-fixes-from-head, to backport directfb
  build fixes; from HEAD not commited in the gtk-2-10 branch.  Thanks
  Attilio Fiandrotti for pointing me at the actual log entry.
* Refresh 070_mandatory-relibtoolize accordingly.
This commit is contained in:
Loïc Minier
2006-09-24 09:55:05 +00:00
parent 40809d6bfa
commit 867348fd00
5 changed files with 250 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -5,9 +5,14 @@ gtk+2.0 (2.10.4-1) experimental; urgency=low
patching; build-depend on quilt; remove occurrences of $(TOP_SRC_DIR) patching; build-depend on quilt; remove occurrences of $(TOP_SRC_DIR)
and @TOP_SRC_DIR@ which isn't needed anymore. and @TOP_SRC_DIR@ which isn't needed anymore.
- Refresh patch 021_loader-files-d. - Refresh patch 021_loader-files-d.
- New patch, 010_fix-stuc-vs-stub-typo, to replace "stuc" with "stub" in
gtk/Makefile.am; from HEAD, not commited in the gtk-2-10 branch.
- New patch, 011_directfb-build-fixes-from-head, to backport directfb
build fixes; from HEAD not commited in the gtk-2-10 branch. Thanks
Attilio Fiandrotti for pointing me at the actual log entry.
- Relibtoolize: update path 070_mandatory-relibtoolize. - Relibtoolize: update path 070_mandatory-relibtoolize.
-- Loic Minier <lool@dooz.org> Sat, 23 Sep 2006 10:41:17 +0200 -- Loic Minier <lool@dooz.org> Sun, 24 Sep 2006 11:52:59 +0200
gtk+2.0 (2.10.3-3) experimental; urgency=medium gtk+2.0 (2.10.3-3) experimental; urgency=medium

17
debian/patches/010_fix-stuc-vs-stub-typo.patch vendored Normal file
View File

@ -0,0 +1,17 @@
Index: gtk+2.0-2.10.4/gtk/Makefile.am
===================================================================
--- gtk+2.0-2.10.4.orig/gtk/Makefile.am 2006-09-24 11:19:49.000000000 +0200
+++ gtk+2.0-2.10.4/gtk/Makefile.am 2006-09-24 11:19:59.000000000 +0200
@@ -635,10 +635,10 @@
gtksocket-win32.c \
gtkwin32embed.c \
gtkwin32embedwidget.c
-gtk_use_stuc_c_sources = \
+gtk_use_stub_c_sources = \
gtkplug-stub.c \
gtksocket-stub.c
-gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_stuc_c_sources)
+gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_stub_c_sources)
if USE_X11
gtk_private_h_sources += gtkxembed.h gtktrayicon.h xembed.h
gtk_c_sources += $(gtk_use_x11_c_sources)

61
debian/patches/011_directfb-build-fixes-from-head.patch vendored Normal file
View File

@ -0,0 +1,61 @@
Index: gtk+2.0-2.10.4/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.4/gdk/directfb/gdkcolor-directfb.c 2006-09-24 11:33:24.000000000 +0200
@@ -38,12 +38,10 @@
#include <stdlib.h>
#include <string.h>
+#include "gdkcolor.h"
+#include "gdkinternals.h"
#include "gdkdirectfb.h"
#include "gdkprivate-directfb.h"
-
-#include "gdkinternals.h"
-
-#include "gdkcolor.h"
#include "gdkalias.h"
@@ -618,6 +616,5 @@
private->info[255].ref_count++;
}
-
#define __GDK_COLOR_X11_C__
#include "gdkaliasdef.c"
Index: gtk+2.0-2.10.4/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.4/gdk/directfb/gdkwindow-directfb.c 2006-09-24 11:34:19.000000000 +0200
@@ -2990,6 +2990,12 @@
iface->process_updates = gdk_window_impl_directfb_process_updates;
}
+void
+gdk_window_beep (GdkWindow *window)
+{
+ gdk_display_beep (gdk_display_get_default());
+}
+
#define __GDK_WINDOW_X11_C__
#include "gdkaliasdef.c"
Index: gtk+2.0-2.10.4/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.4/gdk/directfb/Makefile.am 2006-09-24 11:34:51.000000000 +0200
@@ -4,12 +4,11 @@
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk-DirectFB\" \
+ -DGDK_COMPILATION \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
-DG_DISABLE_DEPRECATED \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GDK_DEP_CFLAGS@

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

@ -1,7 +1,7 @@
Index: gtk+2.0-2.10.4/Makefile.in Index: gtk+2.0-2.10.4/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/Makefile.in 2006-09-22 20:52:17.000000000 +0200 --- gtk+2.0-2.10.4.orig/Makefile.in 2006-09-22 20:52:17.000000000 +0200
+++ gtk+2.0-2.10.4/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/Makefile.in 2006-09-24 11:47:47.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -109,7 +109,7 @@ Index: gtk+2.0-2.10.4/Makefile.in
Index: gtk+2.0-2.10.4/aclocal.m4 Index: gtk+2.0-2.10.4/aclocal.m4
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/aclocal.m4 2006-09-22 20:52:11.000000000 +0200 --- gtk+2.0-2.10.4.orig/aclocal.m4 2006-09-22 20:52:11.000000000 +0200
+++ gtk+2.0-2.10.4/aclocal.m4 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/aclocal.m4 2006-09-24 11:47:37.000000000 +0200
@@ -941,7 +941,7 @@ @@ -941,7 +941,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@ -2312,7 +2312,7 @@ Index: gtk+2.0-2.10.4/aclocal.m4
Index: gtk+2.0-2.10.4/configure Index: gtk+2.0-2.10.4/configure
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/configure 2006-09-22 20:52:19.000000000 +0200 --- gtk+2.0-2.10.4.orig/configure 2006-09-22 20:52:19.000000000 +0200
+++ gtk+2.0-2.10.4/configure 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/configure 2006-09-24 11:47:42.000000000 +0200
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
@ -34721,7 +34721,7 @@ Index: gtk+2.0-2.10.4/configure
Index: gtk+2.0-2.10.4/contrib/Makefile.in Index: gtk+2.0-2.10.4/contrib/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/contrib/Makefile.in 2006-09-22 21:02:44.000000000 +0200 --- gtk+2.0-2.10.4.orig/contrib/Makefile.in 2006-09-22 21:02:44.000000000 +0200
+++ gtk+2.0-2.10.4/contrib/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/contrib/Makefile.in 2006-09-24 11:47:47.000000000 +0200
@@ -90,6 +90,8 @@ @@ -90,6 +90,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -34800,7 +34800,7 @@ Index: gtk+2.0-2.10.4/contrib/Makefile.in
Index: gtk+2.0-2.10.4/contrib/gdk-pixbuf-xlib/Makefile.in Index: gtk+2.0-2.10.4/contrib/gdk-pixbuf-xlib/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2006-09-22 21:02:46.000000000 +0200 --- gtk+2.0-2.10.4.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2006-09-22 21:02:46.000000000 +0200
+++ gtk+2.0-2.10.4/contrib/gdk-pixbuf-xlib/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/contrib/gdk-pixbuf-xlib/Makefile.in 2006-09-24 11:47:47.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -34879,7 +34879,7 @@ Index: gtk+2.0-2.10.4/contrib/gdk-pixbuf-xlib/Makefile.in
Index: gtk+2.0-2.10.4/demos/Makefile.in Index: gtk+2.0-2.10.4/demos/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/demos/Makefile.in 2006-09-22 21:00:29.000000000 +0200 --- gtk+2.0-2.10.4.orig/demos/Makefile.in 2006-09-22 21:00:29.000000000 +0200
+++ gtk+2.0-2.10.4/demos/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/demos/Makefile.in 2006-09-24 11:47:47.000000000 +0200
@@ -90,6 +90,8 @@ @@ -90,6 +90,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -34958,7 +34958,7 @@ Index: gtk+2.0-2.10.4/demos/Makefile.in
Index: gtk+2.0-2.10.4/demos/gtk-demo/Makefile.in Index: gtk+2.0-2.10.4/demos/gtk-demo/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/demos/gtk-demo/Makefile.in 2006-09-22 21:00:31.000000000 +0200 --- gtk+2.0-2.10.4.orig/demos/gtk-demo/Makefile.in 2006-09-22 21:00:31.000000000 +0200
+++ gtk+2.0-2.10.4/demos/gtk-demo/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/demos/gtk-demo/Makefile.in 2006-09-24 11:47:47.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -35037,7 +35037,7 @@ Index: gtk+2.0-2.10.4/demos/gtk-demo/Makefile.in
Index: gtk+2.0-2.10.4/docs/Makefile.in Index: gtk+2.0-2.10.4/docs/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/docs/Makefile.in 2006-09-22 21:02:51.000000000 +0200 --- gtk+2.0-2.10.4.orig/docs/Makefile.in 2006-09-22 21:02:51.000000000 +0200
+++ gtk+2.0-2.10.4/docs/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/docs/Makefile.in 2006-09-24 11:47:47.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -35116,7 +35116,7 @@ Index: gtk+2.0-2.10.4/docs/Makefile.in
Index: gtk+2.0-2.10.4/docs/faq/Makefile.in Index: gtk+2.0-2.10.4/docs/faq/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/docs/faq/Makefile.in 2006-09-22 21:02:54.000000000 +0200 --- gtk+2.0-2.10.4.orig/docs/faq/Makefile.in 2006-09-22 21:02:54.000000000 +0200
+++ gtk+2.0-2.10.4/docs/faq/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/docs/faq/Makefile.in 2006-09-24 11:47:47.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -35195,7 +35195,7 @@ Index: gtk+2.0-2.10.4/docs/faq/Makefile.in
Index: gtk+2.0-2.10.4/docs/reference/Makefile.in Index: gtk+2.0-2.10.4/docs/reference/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/docs/reference/Makefile.in 2006-09-22 21:02:56.000000000 +0200 --- gtk+2.0-2.10.4.orig/docs/reference/Makefile.in 2006-09-22 21:02:56.000000000 +0200
+++ gtk+2.0-2.10.4/docs/reference/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/docs/reference/Makefile.in 2006-09-24 11:47:47.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -35274,7 +35274,7 @@ Index: gtk+2.0-2.10.4/docs/reference/Makefile.in
Index: gtk+2.0-2.10.4/docs/reference/gdk/Makefile.in Index: gtk+2.0-2.10.4/docs/reference/gdk/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/docs/reference/gdk/Makefile.in 2006-09-22 21:03:15.000000000 +0200 --- gtk+2.0-2.10.4.orig/docs/reference/gdk/Makefile.in 2006-09-22 21:03:15.000000000 +0200
+++ gtk+2.0-2.10.4/docs/reference/gdk/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/docs/reference/gdk/Makefile.in 2006-09-24 11:47:48.000000000 +0200
@@ -95,6 +95,8 @@ @@ -95,6 +95,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -35353,7 +35353,7 @@ Index: gtk+2.0-2.10.4/docs/reference/gdk/Makefile.in
Index: gtk+2.0-2.10.4/docs/reference/gdk-pixbuf/Makefile.in Index: gtk+2.0-2.10.4/docs/reference/gdk-pixbuf/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/docs/reference/gdk-pixbuf/Makefile.in 2006-09-22 21:02:58.000000000 +0200 --- gtk+2.0-2.10.4.orig/docs/reference/gdk-pixbuf/Makefile.in 2006-09-22 21:02:58.000000000 +0200
+++ gtk+2.0-2.10.4/docs/reference/gdk-pixbuf/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/docs/reference/gdk-pixbuf/Makefile.in 2006-09-24 11:47:48.000000000 +0200
@@ -95,6 +95,8 @@ @@ -95,6 +95,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -35432,7 +35432,7 @@ Index: gtk+2.0-2.10.4/docs/reference/gdk-pixbuf/Makefile.in
Index: gtk+2.0-2.10.4/docs/reference/gtk/Makefile.in Index: gtk+2.0-2.10.4/docs/reference/gtk/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/docs/reference/gtk/Makefile.in 2006-09-22 21:04:22.000000000 +0200 --- gtk+2.0-2.10.4.orig/docs/reference/gtk/Makefile.in 2006-09-22 21:04:22.000000000 +0200
+++ gtk+2.0-2.10.4/docs/reference/gtk/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/docs/reference/gtk/Makefile.in 2006-09-24 11:47:48.000000000 +0200
@@ -95,6 +95,8 @@ @@ -95,6 +95,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -35511,7 +35511,7 @@ Index: gtk+2.0-2.10.4/docs/reference/gtk/Makefile.in
Index: gtk+2.0-2.10.4/docs/tools/Makefile.in Index: gtk+2.0-2.10.4/docs/tools/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/docs/tools/Makefile.in 2006-09-22 21:23:11.000000000 +0200 --- gtk+2.0-2.10.4.orig/docs/tools/Makefile.in 2006-09-22 21:23:11.000000000 +0200
+++ gtk+2.0-2.10.4/docs/tools/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/docs/tools/Makefile.in 2006-09-24 11:47:48.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -35590,7 +35590,7 @@ Index: gtk+2.0-2.10.4/docs/tools/Makefile.in
Index: gtk+2.0-2.10.4/docs/tutorial/Makefile.in Index: gtk+2.0-2.10.4/docs/tutorial/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/docs/tutorial/Makefile.in 2006-09-22 21:02:53.000000000 +0200 --- gtk+2.0-2.10.4.orig/docs/tutorial/Makefile.in 2006-09-22 21:02:53.000000000 +0200
+++ gtk+2.0-2.10.4/docs/tutorial/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/docs/tutorial/Makefile.in 2006-09-24 11:47:48.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -35669,7 +35669,7 @@ Index: gtk+2.0-2.10.4/docs/tutorial/Makefile.in
Index: gtk+2.0-2.10.4/gdk/Makefile.in Index: gtk+2.0-2.10.4/gdk/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gdk/Makefile.in 2006-09-23 05:42:07.000000000 +0200 --- gtk+2.0-2.10.4.orig/gdk/Makefile.in 2006-09-23 05:42:07.000000000 +0200
+++ gtk+2.0-2.10.4/gdk/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/gdk/Makefile.in 2006-09-24 11:47:49.000000000 +0200
@@ -91,6 +91,8 @@ @@ -91,6 +91,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -35748,7 +35748,7 @@ Index: gtk+2.0-2.10.4/gdk/Makefile.in
Index: gtk+2.0-2.10.4/gdk/directfb/Makefile.in Index: gtk+2.0-2.10.4/gdk/directfb/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gdk/directfb/Makefile.in 2006-09-23 04:54:59.000000000 +0200 --- gtk+2.0-2.10.4.orig/gdk/directfb/Makefile.in 2006-09-23 04:54:59.000000000 +0200
+++ gtk+2.0-2.10.4/gdk/directfb/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/gdk/directfb/Makefile.in 2006-09-24 11:47:49.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -35824,10 +35824,24 @@ Index: gtk+2.0-2.10.4/gdk/directfb/Makefile.in
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
@@ -296,12 +299,11 @@
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk-DirectFB\" \
+ -DGDK_COMPILATION \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
-DG_DISABLE_DEPRECATED \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GDK_DEP_CFLAGS@
Index: gtk+2.0-2.10.4/gdk/linux-fb/Makefile.in Index: gtk+2.0-2.10.4/gdk/linux-fb/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gdk/linux-fb/Makefile.in 2006-09-23 04:54:43.000000000 +0200 --- gtk+2.0-2.10.4.orig/gdk/linux-fb/Makefile.in 2006-09-23 04:54:43.000000000 +0200
+++ gtk+2.0-2.10.4/gdk/linux-fb/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/gdk/linux-fb/Makefile.in 2006-09-24 11:47:49.000000000 +0200
@@ -90,6 +90,8 @@ @@ -90,6 +90,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -35906,7 +35920,7 @@ Index: gtk+2.0-2.10.4/gdk/linux-fb/Makefile.in
Index: gtk+2.0-2.10.4/gdk/quartz/Makefile.in Index: gtk+2.0-2.10.4/gdk/quartz/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gdk/quartz/Makefile.in 2006-09-23 04:54:54.000000000 +0200 --- gtk+2.0-2.10.4.orig/gdk/quartz/Makefile.in 2006-09-23 04:54:54.000000000 +0200
+++ gtk+2.0-2.10.4/gdk/quartz/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/gdk/quartz/Makefile.in 2006-09-24 11:47:49.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -35985,7 +35999,7 @@ Index: gtk+2.0-2.10.4/gdk/quartz/Makefile.in
Index: gtk+2.0-2.10.4/gdk/win32/Makefile.in Index: gtk+2.0-2.10.4/gdk/win32/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gdk/win32/Makefile.in 2006-09-23 04:54:47.000000000 +0200 --- gtk+2.0-2.10.4.orig/gdk/win32/Makefile.in 2006-09-23 04:54:47.000000000 +0200
+++ gtk+2.0-2.10.4/gdk/win32/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/gdk/win32/Makefile.in 2006-09-24 11:47:49.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -36064,7 +36078,7 @@ Index: gtk+2.0-2.10.4/gdk/win32/Makefile.in
Index: gtk+2.0-2.10.4/gdk/win32/rc/Makefile.in Index: gtk+2.0-2.10.4/gdk/win32/rc/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gdk/win32/rc/Makefile.in 2006-09-23 04:54:50.000000000 +0200 --- gtk+2.0-2.10.4.orig/gdk/win32/rc/Makefile.in 2006-09-23 04:54:50.000000000 +0200
+++ gtk+2.0-2.10.4/gdk/win32/rc/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/gdk/win32/rc/Makefile.in 2006-09-24 11:47:49.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -36143,7 +36157,7 @@ Index: gtk+2.0-2.10.4/gdk/win32/rc/Makefile.in
Index: gtk+2.0-2.10.4/gdk/x11/Makefile.in Index: gtk+2.0-2.10.4/gdk/x11/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gdk/x11/Makefile.in 2006-09-22 20:53:12.000000000 +0200 --- gtk+2.0-2.10.4.orig/gdk/x11/Makefile.in 2006-09-22 20:53:12.000000000 +0200
+++ gtk+2.0-2.10.4/gdk/x11/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/gdk/x11/Makefile.in 2006-09-24 11:47:49.000000000 +0200
@@ -91,6 +91,8 @@ @@ -91,6 +91,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -36222,7 +36236,7 @@ Index: gtk+2.0-2.10.4/gdk/x11/Makefile.in
Index: gtk+2.0-2.10.4/gdk-pixbuf/Makefile.in Index: gtk+2.0-2.10.4/gdk-pixbuf/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gdk-pixbuf/Makefile.in 2006-09-23 05:42:01.000000000 +0200 --- gtk+2.0-2.10.4.orig/gdk-pixbuf/Makefile.in 2006-09-23 05:42:01.000000000 +0200
+++ gtk+2.0-2.10.4/gdk-pixbuf/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/gdk-pixbuf/Makefile.in 2006-09-24 11:47:48.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -36301,7 +36315,7 @@ Index: gtk+2.0-2.10.4/gdk-pixbuf/Makefile.in
Index: gtk+2.0-2.10.4/gdk-pixbuf/pixops/Makefile.in Index: gtk+2.0-2.10.4/gdk-pixbuf/pixops/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gdk-pixbuf/pixops/Makefile.in 2006-09-22 20:52:54.000000000 +0200 --- gtk+2.0-2.10.4.orig/gdk-pixbuf/pixops/Makefile.in 2006-09-22 20:52:54.000000000 +0200
+++ gtk+2.0-2.10.4/gdk-pixbuf/pixops/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/gdk-pixbuf/pixops/Makefile.in 2006-09-24 11:47:48.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -36380,7 +36394,7 @@ Index: gtk+2.0-2.10.4/gdk-pixbuf/pixops/Makefile.in
Index: gtk+2.0-2.10.4/gtk/Makefile.in Index: gtk+2.0-2.10.4/gtk/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gtk/Makefile.in 2006-09-23 06:27:45.000000000 +0200 --- gtk+2.0-2.10.4.orig/gtk/Makefile.in 2006-09-23 06:27:45.000000000 +0200
+++ gtk+2.0-2.10.4/gtk/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/gtk/Makefile.in 2006-09-24 11:47:50.000000000 +0200
@@ -110,6 +110,8 @@ @@ -110,6 +110,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -36456,10 +36470,118 @@ Index: gtk+2.0-2.10.4/gtk/Makefile.in
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
@@ -853,7 +856,7 @@
$(gtk_clipboard_dnd_c_sources)
gtk_c_sources = $(gtk_base_c_sources) $(am__append_5) $(am__append_7) $(am__append_9) $(am__append_11) $(am__append_12)
-gtk_all_c_sources = $(gtk_base_c_sources) $(gtk_os_unix_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_stuc_c_sources)
+gtk_all_c_sources = $(gtk_base_c_sources) $(gtk_os_unix_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_stub_c_sources)
gtk_os_unix_c_sources = \
gtkfilesystemunix.c \
@@ -886,7 +889,7 @@
gtkwin32embed.c \
gtkwin32embedwidget.c
-gtk_use_stuc_c_sources = \
+gtk_use_stub_c_sources = \
gtkplug-stub.c \
gtksocket-stub.c
@@ -1343,7 +1346,8 @@
gtkprintunixdialog.c gtkprintbackend.c gtkfilesystemwin32.c \
gtkprint-win32.c gtkprintoperation-win32.c gtkplug-x11.c \
gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \
- gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c
+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \
+ gtkplug-stub.c gtksocket-stub.c
@USE_QUARTZ_TRUE@am__objects_1 = gtkclipboard-quartz.lo gtkdnd-quartz.lo \
@USE_QUARTZ_TRUE@ gtkquartz.lo
@USE_QUARTZ_FALSE@am__objects_1 = gtkclipboard.lo gtkdnd.lo
@@ -1428,6 +1432,7 @@
am__objects_9 = gtkplug-win32.lo gtksocket-win32.lo gtkwin32embed.lo \
gtkwin32embedwidget.lo
@USE_WIN32_TRUE@@USE_X11_FALSE@am__objects_10 = $(am__objects_9)
+am__objects_11 = gtkplug-stub.lo gtksocket-stub.lo
@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_12 = $(am__objects_11)
am__objects_13 = $(am__objects_2) $(am__objects_4) $(am__objects_6) \
$(am__objects_8) $(am__objects_10) $(am__objects_12)
@@ -1509,7 +1514,8 @@
gtkprintunixdialog.c gtkprintbackend.c gtkfilesystemwin32.c \
gtkprint-win32.c gtkprintoperation-win32.c gtkplug-x11.c \
gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \
- gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c
+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \
+ gtkplug-stub.c gtksocket-stub.c
am_libgtk_linux_fb_2_0_la_OBJECTS = $(am__objects_13)
libgtk_linux_fb_2_0_la_OBJECTS = $(am_libgtk_linux_fb_2_0_la_OBJECTS)
@OS_UNIX_TRUE@libgtk_quartz_2_0_la_DEPENDENCIES = \
@@ -1588,7 +1594,8 @@
gtkprintunixdialog.c gtkprintbackend.c gtkfilesystemwin32.c \
gtkprint-win32.c gtkprintoperation-win32.c gtkplug-x11.c \
gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \
- gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c
+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \
+ gtkplug-stub.c gtksocket-stub.c
am_libgtk_quartz_2_0_la_OBJECTS = $(am__objects_13)
libgtk_quartz_2_0_la_OBJECTS = $(am_libgtk_quartz_2_0_la_OBJECTS)
am__libgtk_win32_2_0_la_SOURCES_DIST = fnmatch.c gtkaboutdialog.c \
@@ -1660,7 +1667,8 @@
gtkprintunixdialog.c gtkprintbackend.c gtkfilesystemwin32.c \
gtkprint-win32.c gtkprintoperation-win32.c gtkplug-x11.c \
gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \
- gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c
+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \
+ gtkplug-stub.c gtksocket-stub.c
am_libgtk_win32_2_0_la_OBJECTS = $(am__objects_13)
libgtk_win32_2_0_la_OBJECTS = $(am_libgtk_win32_2_0_la_OBJECTS)
@OS_UNIX_TRUE@libgtk_x11_2_0_la_DEPENDENCIES = \
@@ -1739,7 +1747,8 @@
gtkprintunixdialog.c gtkprintbackend.c gtkfilesystemwin32.c \
gtkprint-win32.c gtkprintoperation-win32.c gtkplug-x11.c \
gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \
- gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c
+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \
+ gtkplug-stub.c gtksocket-stub.c
am_libgtk_x11_2_0_la_OBJECTS = $(am__objects_13)
libgtk_x11_2_0_la_OBJECTS = $(am_libgtk_x11_2_0_la_OBJECTS)
bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \
@@ -1872,6 +1881,7 @@
@AMDEP_TRUE@ ./$(DEPDIR)/gtkpapersize.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/gtkpathbar.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/gtkpixmap.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/gtkplug-stub.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/gtkplug-win32.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/gtkplug-x11.Plo ./$(DEPDIR)/gtkplug.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/gtkpreview.Plo \
@@ -1918,6 +1928,7 @@
@AMDEP_TRUE@ ./$(DEPDIR)/gtksettings.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/gtksignal.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/gtksizegroup.Plo \
+@AMDEP_TRUE@ ./$(DEPDIR)/gtksocket-stub.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/gtksocket-win32.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/gtksocket-x11.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/gtksocket.Plo \
@@ -2232,6 +2243,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkpapersize.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkpathbar.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkpixmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkplug-stub.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkplug-win32.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkplug-x11.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkplug.Plo@am__quote@
@@ -2281,6 +2293,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtksettings.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtksignal.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtksizegroup.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtksocket-stub.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtksocket-win32.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtksocket-x11.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtksocket.Plo@am__quote@
Index: gtk+2.0-2.10.4/gtk/theme-bits/Makefile.in Index: gtk+2.0-2.10.4/gtk/theme-bits/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gtk/theme-bits/Makefile.in 2006-09-22 20:54:13.000000000 +0200 --- gtk+2.0-2.10.4.orig/gtk/theme-bits/Makefile.in 2006-09-22 20:54:13.000000000 +0200
+++ gtk+2.0-2.10.4/gtk/theme-bits/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/gtk/theme-bits/Makefile.in 2006-09-24 11:47:50.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -36538,7 +36660,7 @@ Index: gtk+2.0-2.10.4/gtk/theme-bits/Makefile.in
Index: gtk+2.0-2.10.4/gtk/xdgmime/Makefile.in Index: gtk+2.0-2.10.4/gtk/xdgmime/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/gtk/xdgmime/Makefile.in 2006-09-22 20:54:16.000000000 +0200 --- gtk+2.0-2.10.4.orig/gtk/xdgmime/Makefile.in 2006-09-22 20:54:16.000000000 +0200
+++ gtk+2.0-2.10.4/gtk/xdgmime/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/gtk/xdgmime/Makefile.in 2006-09-24 11:47:50.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -36617,7 +36739,7 @@ Index: gtk+2.0-2.10.4/gtk/xdgmime/Makefile.in
Index: gtk+2.0-2.10.4/ltmain.sh Index: gtk+2.0-2.10.4/ltmain.sh
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/ltmain.sh 2006-03-21 19:11:53.000000000 +0100 --- gtk+2.0-2.10.4.orig/ltmain.sh 2006-03-21 19:11:53.000000000 +0100
+++ gtk+2.0-2.10.4/ltmain.sh 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
@@ -43,8 +43,8 @@ @@ -43,8 +43,8 @@
PROGRAM=ltmain.sh PROGRAM=ltmain.sh
@ -38164,7 +38286,7 @@ Index: gtk+2.0-2.10.4/ltmain.sh
Index: gtk+2.0-2.10.4/m4macros/Makefile.in Index: gtk+2.0-2.10.4/m4macros/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/m4macros/Makefile.in 2006-09-22 21:23:17.000000000 +0200 --- gtk+2.0-2.10.4.orig/m4macros/Makefile.in 2006-09-22 21:23:17.000000000 +0200
+++ gtk+2.0-2.10.4/m4macros/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/m4macros/Makefile.in 2006-09-24 11:47:50.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -38243,7 +38365,7 @@ Index: gtk+2.0-2.10.4/m4macros/Makefile.in
Index: gtk+2.0-2.10.4/modules/Makefile.in Index: gtk+2.0-2.10.4/modules/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/modules/Makefile.in 2006-09-22 20:59:34.000000000 +0200 --- gtk+2.0-2.10.4.orig/modules/Makefile.in 2006-09-22 20:59:34.000000000 +0200
+++ gtk+2.0-2.10.4/modules/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/modules/Makefile.in 2006-09-24 11:47:50.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -38322,7 +38444,7 @@ Index: gtk+2.0-2.10.4/modules/Makefile.in
Index: gtk+2.0-2.10.4/modules/engines/Makefile.in Index: gtk+2.0-2.10.4/modules/engines/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/modules/engines/Makefile.in 2006-09-22 21:00:04.000000000 +0200 --- gtk+2.0-2.10.4.orig/modules/engines/Makefile.in 2006-09-22 21:00:04.000000000 +0200
+++ gtk+2.0-2.10.4/modules/engines/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/modules/engines/Makefile.in 2006-09-24 11:47:50.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -38401,7 +38523,7 @@ Index: gtk+2.0-2.10.4/modules/engines/Makefile.in
Index: gtk+2.0-2.10.4/modules/engines/ms-windows/Makefile.in Index: gtk+2.0-2.10.4/modules/engines/ms-windows/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/modules/engines/ms-windows/Makefile.in 2006-09-23 04:56:10.000000000 +0200 --- gtk+2.0-2.10.4.orig/modules/engines/ms-windows/Makefile.in 2006-09-23 04:56:10.000000000 +0200
+++ gtk+2.0-2.10.4/modules/engines/ms-windows/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/modules/engines/ms-windows/Makefile.in 2006-09-24 11:47:51.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -38480,7 +38602,7 @@ Index: gtk+2.0-2.10.4/modules/engines/ms-windows/Makefile.in
Index: gtk+2.0-2.10.4/modules/engines/ms-windows/Theme/Makefile.in Index: gtk+2.0-2.10.4/modules/engines/ms-windows/Theme/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/modules/engines/ms-windows/Theme/Makefile.in 2006-09-23 04:56:17.000000000 +0200 --- gtk+2.0-2.10.4.orig/modules/engines/ms-windows/Theme/Makefile.in 2006-09-23 04:56:17.000000000 +0200
+++ gtk+2.0-2.10.4/modules/engines/ms-windows/Theme/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/modules/engines/ms-windows/Theme/Makefile.in 2006-09-24 11:47:51.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -38559,7 +38681,7 @@ Index: gtk+2.0-2.10.4/modules/engines/ms-windows/Theme/Makefile.in
Index: gtk+2.0-2.10.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in Index: gtk+2.0-2.10.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2006-09-23 04:56:24.000000000 +0200 --- gtk+2.0-2.10.4.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2006-09-23 04:56:24.000000000 +0200
+++ gtk+2.0-2.10.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2006-09-24 11:47:51.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -38638,7 +38760,7 @@ Index: gtk+2.0-2.10.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
Index: gtk+2.0-2.10.4/modules/engines/pixbuf/Makefile.in Index: gtk+2.0-2.10.4/modules/engines/pixbuf/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/modules/engines/pixbuf/Makefile.in 2006-09-22 21:00:06.000000000 +0200 --- gtk+2.0-2.10.4.orig/modules/engines/pixbuf/Makefile.in 2006-09-22 21:00:06.000000000 +0200
+++ gtk+2.0-2.10.4/modules/engines/pixbuf/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/modules/engines/pixbuf/Makefile.in 2006-09-24 11:47:51.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -38717,7 +38839,7 @@ Index: gtk+2.0-2.10.4/modules/engines/pixbuf/Makefile.in
Index: gtk+2.0-2.10.4/modules/input/Makefile.in Index: gtk+2.0-2.10.4/modules/input/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/modules/input/Makefile.in 2006-09-22 20:59:36.000000000 +0200 --- gtk+2.0-2.10.4.orig/modules/input/Makefile.in 2006-09-22 20:59:36.000000000 +0200
+++ gtk+2.0-2.10.4/modules/input/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/modules/input/Makefile.in 2006-09-24 11:47:51.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -38828,7 +38950,7 @@ Index: gtk+2.0-2.10.4/modules/input/Makefile.in
Index: gtk+2.0-2.10.4/modules/printbackends/Makefile.in Index: gtk+2.0-2.10.4/modules/printbackends/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/modules/printbackends/Makefile.in 2006-09-22 21:00:14.000000000 +0200 --- gtk+2.0-2.10.4.orig/modules/printbackends/Makefile.in 2006-09-22 21:00:14.000000000 +0200
+++ gtk+2.0-2.10.4/modules/printbackends/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/modules/printbackends/Makefile.in 2006-09-24 11:47:51.000000000 +0200
@@ -90,6 +90,8 @@ @@ -90,6 +90,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -38907,7 +39029,7 @@ Index: gtk+2.0-2.10.4/modules/printbackends/Makefile.in
Index: gtk+2.0-2.10.4/modules/printbackends/cups/Makefile.in Index: gtk+2.0-2.10.4/modules/printbackends/cups/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/modules/printbackends/cups/Makefile.in 2006-09-22 21:00:24.000000000 +0200 --- gtk+2.0-2.10.4.orig/modules/printbackends/cups/Makefile.in 2006-09-22 21:00:24.000000000 +0200
+++ gtk+2.0-2.10.4/modules/printbackends/cups/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/modules/printbackends/cups/Makefile.in 2006-09-24 11:47:51.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -38986,7 +39108,7 @@ Index: gtk+2.0-2.10.4/modules/printbackends/cups/Makefile.in
Index: gtk+2.0-2.10.4/modules/printbackends/file/Makefile.in Index: gtk+2.0-2.10.4/modules/printbackends/file/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/modules/printbackends/file/Makefile.in 2006-09-22 21:00:16.000000000 +0200 --- gtk+2.0-2.10.4.orig/modules/printbackends/file/Makefile.in 2006-09-22 21:00:16.000000000 +0200
+++ gtk+2.0-2.10.4/modules/printbackends/file/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/modules/printbackends/file/Makefile.in 2006-09-24 11:47:51.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -39065,7 +39187,7 @@ Index: gtk+2.0-2.10.4/modules/printbackends/file/Makefile.in
Index: gtk+2.0-2.10.4/modules/printbackends/lpr/Makefile.in Index: gtk+2.0-2.10.4/modules/printbackends/lpr/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/modules/printbackends/lpr/Makefile.in 2006-09-22 21:00:20.000000000 +0200 --- gtk+2.0-2.10.4.orig/modules/printbackends/lpr/Makefile.in 2006-09-22 21:00:20.000000000 +0200
+++ gtk+2.0-2.10.4/modules/printbackends/lpr/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/modules/printbackends/lpr/Makefile.in 2006-09-24 11:47:51.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -39144,7 +39266,7 @@ Index: gtk+2.0-2.10.4/modules/printbackends/lpr/Makefile.in
Index: gtk+2.0-2.10.4/perf/Makefile.in Index: gtk+2.0-2.10.4/perf/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/perf/Makefile.in 2006-09-22 21:02:39.000000000 +0200 --- gtk+2.0-2.10.4.orig/perf/Makefile.in 2006-09-22 21:02:39.000000000 +0200
+++ gtk+2.0-2.10.4/perf/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/perf/Makefile.in 2006-09-24 11:47:52.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@ -39223,7 +39345,7 @@ Index: gtk+2.0-2.10.4/perf/Makefile.in
Index: gtk+2.0-2.10.4/tests/Makefile.in Index: gtk+2.0-2.10.4/tests/Makefile.in
=================================================================== ===================================================================
--- gtk+2.0-2.10.4.orig/tests/Makefile.in 2006-09-22 21:01:00.000000000 +0200 --- gtk+2.0-2.10.4.orig/tests/Makefile.in 2006-09-22 21:01:00.000000000 +0200
+++ gtk+2.0-2.10.4/tests/Makefile.in 2006-09-23 10:27:33.000000000 +0200 +++ gtk+2.0-2.10.4/tests/Makefile.in 2006-09-24 11:47:52.000000000 +0200
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@

2
debian/patches/series vendored
View File

@ -6,6 +6,8 @@
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
010_fix-stuc-vs-stub-typo.patch
011_directfb-build-fixes-from-head.patch
020_immodules-files-d.patch 020_immodules-files-d.patch
021_loader-files-d.patch 021_loader-files-d.patch
070_mandatory-relibtoolize.patch 070_mandatory-relibtoolize.patch