From 8eae80c33eb22a06962dbf79ebb5b34dddfcc6ba Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sat, 9 Oct 2010 18:35:31 +0000 Subject: [PATCH] * debian/patches/009_gtk-export-filechooser.patch: + Removed. Doesn't apply anymore and was only needed for hildon --- debian/changelog | 4 +- .../patches/009_gtk-export-filechooser.patch | 231 ------------------ debian/patches/series | 1 - 3 files changed, 3 insertions(+), 233 deletions(-) delete mode 100644 debian/patches/009_gtk-export-filechooser.patch diff --git a/debian/changelog b/debian/changelog index 5dd7ced9a5..68d032c00f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ gtk+3.0 (2.91.0-1) experimental; urgency=low [ Sjoerd Simons ] * New upstream release (2.91.0) + * debian/patches/009_gtk-export-filechooser.patch: + + Removed. Doesn't apply anymore and was only needed for hildon - -- Sjoerd Simons Sat, 09 Oct 2010 19:29:49 +0100 + -- Sjoerd Simons Sat, 09 Oct 2010 19:34:37 +0100 gtk+2.0 (2.21.5-1) experimental; urgency=low diff --git a/debian/patches/009_gtk-export-filechooser.patch b/debian/patches/009_gtk-export-filechooser.patch deleted file mode 100644 index 28a5ec62b4..0000000000 --- a/debian/patches/009_gtk-export-filechooser.patch +++ /dev/null @@ -1,231 +0,0 @@ -2007-06-24 Loic Minier - - * gtk/Makefile.am (gtk_private_h_sources, gtk_semi_private_h_sources): - export gtkquery.h and gtksearchengine.h as semi-private - * gtk/gtkquery.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef guard - * gtk/gtksearchengine.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef - guard - -2007-02-07 Kristian Rietveld - - * gtk/gtkfilechooserutils.[ch] - (hildon_gtk_file_chooser_install_properties): conditionalize with - MAEMO_CHANGES, port over doc comment. - -2006-12-04 Tommi Komulainen - - Export enough symbols for implementing GtkFileChooser interface - outside gtk. - - * gtk/gtk.symbols: add hildon_gtk_file_chooser_install_properties - * gtk/Makefile.am (INCLUDES): add -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED - (gtk_private_h_sources, gtk_semi_private_h_sources): export - gtkfilesystemmodel.h, gtkfilechooserprivate.h, and - gtkfilechooserutils.h as semi-private - * gtk/gtkfilechooserutils.c - (hildon_gtk_file_chooser_install_properties): add exported version of - _gtk_file_chooser_install_properties - * gtk/gtkfilesystemmodel.h: add GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED - #ifdef guard - * gtk/gtkfilechooserprivate.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED - #ifdef guard - * gtk/gtkfilechooserutils.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED - #ifdef guard, declare hildon_gtk_file_chooser_install_properties - - * tests/autotestfilechooser.c: build with - GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED -Index: gtk+3.0-2.90.6/gtk/Makefile.am -=================================================================== ---- gtk+3.0-2.90.6.orig/gtk/Makefile.am -+++ gtk+3.0-2.90.6/gtk/Makefile.am -@@ -49,6 +49,8 @@ - -I$(top_srcdir) -I../gdk \ - -I$(top_srcdir)/gdk \ - -DGDK_DISABLE_DEPRECATED \ -+ -DMAEMO_CHANGES \ -+ -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \ - -DGTK_DISABLE_DEPRECATED \ - -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ - -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ -@@ -348,12 +350,16 @@ - # Installed header files without compatibility guarantees - # that are not included in gtk/gtk.h - gtk_semi_private_h_sources = \ -- gtktextlayout.h -+ gtktextlayout.h \ -+ gtkfilesystem.h \ -+ gtkfilesystemmodel.h \ -+ gtkfilechooserprivate.h \ -+ gtkfilechooserutils.h \ -+ gtkquery.h \ -+ gtksearchengine.h - - # GTK+ header files that don't get installed - gtk_private_h_sources = \ -- gtkquery.h \ -- gtksearchengine.h \ - gtksearchenginesimple.h \ - gtkdndcursors.h \ - gtkentryprivate.h \ -@@ -362,11 +368,7 @@ - gtkfilechooserdefault.h \ - gtkfilechooserembed.h \ - gtkfilechooserentry.h \ -- gtkfilechooserprivate.h \ - gtkfilechoosersettings.h \ -- gtkfilechooserutils.h \ -- gtkfilesystem.h \ -- gtkfilesystemmodel.h \ - gtkiconcache.h \ - gtkintl.h \ - gtkkeyhash.h \ -Index: gtk+3.0-2.90.6/gtk/gtk.symbols -=================================================================== ---- gtk+3.0-2.90.6.orig/gtk/gtk.symbols -+++ gtk+3.0-2.90.6/gtk/gtk.symbols -@@ -1353,6 +1353,12 @@ - #endif - #endif - -+#if IN_HEADER(__GTK_FILE_CHOOSER_UTILS_H__) -+#if IN_FILE(__GTK_FILE_CHOOSER_UTILS_C__) -+hildon_gtk_file_chooser_install_properties -+#endif -+#endif -+ - #if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__) - #if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__) - gtk_file_chooser_widget_get_type G_GNUC_CONST -Index: gtk+3.0-2.90.6/gtk/gtkfilechooserprivate.h -=================================================================== ---- gtk+3.0-2.90.6.orig/gtk/gtkfilechooserprivate.h -+++ gtk+3.0-2.90.6/gtk/gtkfilechooserprivate.h -@@ -21,6 +21,14 @@ - #ifndef __GTK_FILE_CHOOSER_PRIVATE_H__ - #define __GTK_FILE_CHOOSER_PRIVATE_H__ - -+/* This is a "semi-private" header; it is meant only for -+ * alternate GtkFileChooser implementations; no stability guarantees -+ * are made at this point -+ */ -+#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED -+#error "gtkfilechooserprivate.h is not supported API for general use" -+#endif -+ - #include "gtkfilechooser.h" - #include "gtkfilesystem.h" - #include "gtkfilesystemmodel.h" -Index: gtk+3.0-2.90.6/gtk/gtkfilechooserutils.c -=================================================================== ---- gtk+3.0-2.90.6.orig/gtk/gtkfilechooserutils.c -+++ gtk+3.0-2.90.6/gtk/gtkfilechooserutils.c -@@ -119,6 +119,22 @@ - "create-folders"); - } - -+#ifdef MAEMO_CHANGES -+/** -+ * hildon_gtk_file_chooser_install_properties: -+ * -+ * Exactly the same as the private _gtk_file_chooser_install_properties() -+ * but exported for hildon-fm. -+ * -+ * Since: maemo 2.0 -+ */ -+void -+hildon_gtk_file_chooser_install_properties (GObjectClass *klass) -+{ -+ _gtk_file_chooser_install_properties (klass); -+} -+#endif /* MAEMO_CHANGES */ -+ - /** - * _gtk_file_chooser_delegate_iface_init: - * @iface: a #GtkFileChoserIface structure -@@ -360,3 +376,4 @@ - g_signal_emit_by_name (data, "confirm-overwrite", &conf); - return conf; - } -+ -Index: gtk+3.0-2.90.6/gtk/gtkfilechooserutils.h -=================================================================== ---- gtk+3.0-2.90.6.orig/gtk/gtkfilechooserutils.h -+++ gtk+3.0-2.90.6/gtk/gtkfilechooserutils.h -@@ -22,6 +22,14 @@ - #ifndef __GTK_FILE_CHOOSER_UTILS_H__ - #define __GTK_FILE_CHOOSER_UTILS_H__ - -+/* This is a "semi-private" header; it is meant only for -+ * alternate GtkFileChooser implementations; no stability guarantees -+ * are made at this point -+ */ -+#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED -+#error "gtkfilechooserutils.h is not supported API for general use" -+#endif -+ - #include "gtkfilechooserprivate.h" - - G_BEGIN_DECLS -@@ -45,6 +53,9 @@ - } GtkFileChooserProp; - - void _gtk_file_chooser_install_properties (GObjectClass *klass); -+#ifdef MAEMO_CHANGES -+void hildon_gtk_file_chooser_install_properties (GObjectClass *klass); -+#endif /* MAEMO_CHANGES */ - - void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface); - void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver, -Index: gtk+3.0-2.90.6/gtk/gtkfilesystemmodel.h -=================================================================== ---- gtk+3.0-2.90.6.orig/gtk/gtkfilesystemmodel.h -+++ gtk+3.0-2.90.6/gtk/gtkfilesystemmodel.h -@@ -21,6 +21,10 @@ - #ifndef __GTK_FILE_SYSTEM_MODEL_H__ - #define __GTK_FILE_SYSTEM_MODEL_H__ - -+#ifndef GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED -+#error "GtkFileSystemModel is not supported API for general use" -+#endif -+ - #include - #include - #include -Index: gtk+3.0-2.90.6/gtk/gtkquery.h -=================================================================== ---- gtk+3.0-2.90.6.orig/gtk/gtkquery.h -+++ gtk+3.0-2.90.6/gtk/gtkquery.h -@@ -23,6 +23,14 @@ - #ifndef __GTK_QUERY_H__ - #define __GTK_QUERY_H__ - -+/* This is a "semi-private" header; it is meant only for -+ * alternate GtkFileChooser implementations; no stability guarantees -+ * are made at this point -+ */ -+#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED -+#error "gtkfilechooserprivate.h is not supported API for general use" -+#endif -+ - #include - - G_BEGIN_DECLS -Index: gtk+3.0-2.90.6/gtk/gtksearchengine.h -=================================================================== ---- gtk+3.0-2.90.6.orig/gtk/gtksearchengine.h -+++ gtk+3.0-2.90.6/gtk/gtksearchengine.h -@@ -23,6 +23,14 @@ - #ifndef __GTK_SEARCH_ENGINE_H__ - #define __GTK_SEARCH_ENGINE_H__ - -+/* This is a "semi-private" header; it is meant only for -+ * alternate GtkFileChooser implementations; no stability guarantees -+ * are made at this point -+ */ -+#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED -+#error "gtkfilechooserprivate.h is not supported API for general use" -+#endif -+ - #include "gtkquery.h" - - G_BEGIN_DECLS diff --git a/debian/patches/series b/debian/patches/series index 044e8eb917..0a674c8e2e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,6 @@ 002_static-linking-dont-build-perf.patch 003_gdk.pc_privates.patch 005_support_disabling_x11_extensions.patch -009_gtk-export-filechooser.patch 015_default-fallback-icon-theme.patch 022_disable-viqr-im-for-vi-locale.patch 041_ia32-libs.patch