r11333 - in /desktop/experimental/gtk+2.0/debian: changelog patches/009_gtk-export-filechooser.patch patches/032_filechooser-sizing.patch patches/series rules
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Wed Jun 6 21:47:47 UTC 2007
Author: lool
Date: Wed Jun 6 21:47:47 2007
New Revision: 11333
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11333
Log:
* New patch, 009_gtk-export-filechooser, exports some filechooser API for
use in maemo / Hildon; from Nokia, taken from the Ubuntu package; update
patch 032_filechooser-sizing to apply cleanly; bump shlibs to 2.10.12-3.
Added:
desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/patches/032_filechooser-sizing.patch
desktop/experimental/gtk+2.0/debian/patches/series
desktop/experimental/gtk+2.0/debian/rules
Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=11333&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Wed Jun 6 21:47:47 2007
@@ -4,8 +4,11 @@
files in complex_doit() calls as dash's echo will always honor escape
sequences.
* Conflict with gtk2-engines-ubuntulooks (<= 0.9.11-1).
-
- -- Loic Minier <lool at dooz.org> Wed, 06 Jun 2007 23:32:19 +0200
+ * New patch, 009_gtk-export-filechooser, exports some filechooser API for
+ use in maemo / Hildon; from Nokia, taken from the Ubuntu package; update
+ patch 032_filechooser-sizing to apply cleanly; bump shlibs to 2.10.12-3.
+
+ -- Loic Minier <lool at dooz.org> Wed, 06 Jun 2007 23:46:42 +0200
gtk+2.0 (2.10.12-2) unstable; urgency=low
Added: desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/009_gtk-export-filechooser.patch?rev=11333&op=file
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch (added)
+++ desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch Wed Jun 6 21:47:47 2007
@@ -1,0 +1,190 @@
+2007-02-07 Kristian Rietveld <kris at imendio.com>
+
+ * gtk/gtkfilechooserutils.[ch]
+ (hildon_gtk_file_chooser_install_properties): conditionalize with
+ MAEMO_CHANGES, port over doc comment.
+
+2006-12-04 Tommi Komulainen <tommi.komulainen at nokia.com>
+
+ 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+2.0-2.10.12/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.10.12/gtk/Makefile.am 2007-05-30 15:24:54.000000000 +0200
+@@ -33,6 +33,8 @@
+ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED \
+ -DGDK_DISABLE_DEPRECATED \
++ -DMAEMO_CHANGES \
++ -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \
+ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
+ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
+ $(GTK_DEBUG_FLAGS) \
+@@ -329,7 +331,10 @@
+ # that are not included in gtk/gtk.h
+ gtk_semi_private_h_sources = \
+ gtktextlayout.h \
+- gtkfilesystem.h
++ gtkfilesystem.h \
++ gtkfilesystemmodel.h \
++ gtkfilechooserprivate.h \
++ gtkfilechooserutils.h
+
+ # GTK+ header files that don't get installed
+ gtk_private_h_sources = \
+@@ -338,10 +343,7 @@
+ gtkfilechooserdefault.h \
+ gtkfilechooserembed.h \
+ gtkfilechooserentry.h \
+- gtkfilechooserprivate.h \
+ gtkfilechoosersettings.h \
+- gtkfilechooserutils.h \
+- gtkfilesystemmodel.h \
+ gtkfilesystemunix.h \
+ gtkhsv.h \
+ gtkiconcache.h \
+Index: gtk+2.0-2.10.12/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.10.12/gtk/gtk.symbols 2007-05-30 15:24:16.000000000 +0200
+@@ -1363,6 +1363,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+2.0-2.10.12/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.10.12/gtk/gtkfilechooserprivate.h 2007-05-30 15:24:16.000000000 +0200
+@@ -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+2.0-2.10.12/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.10.12/gtk/gtkfilechooserutils.c 2007-05-30 15:24:16.000000000 +0200
+@@ -119,6 +119,22 @@
+ "do-overwrite-confirmation");
+ }
+
++#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,6 @@
+ g_signal_emit_by_name (data, "confirm-overwrite", &conf);
+ return conf;
+ }
++
++#define __GTK_FILE_CHOOSER_UTILS_C__
++#include "gtkaliasdef.c"
+Index: gtk+2.0-2.10.12/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.10.12/gtk/gtkfilechooserutils.h 2007-05-30 15:24:16.000000000 +0200
+@@ -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+2.0-2.10.12/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.10.12/gtk/gtkfilesystemmodel.h 2007-05-30 15:24:16.000000000 +0200
+@@ -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 <glib-object.h>
+ #include "gtkfilesystem.h"
+ #include <gtk/gtktreemodel.h>
+Index: gtk+2.0-2.10.12/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.10.12/tests/autotestfilechooser.c 2007-05-30 15:24:16.000000000 +0200
+@@ -30,6 +30,7 @@
+ */
+
+ #define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
++#define GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
+
+ #include <config.h>
+ #include <string.h>
Modified: desktop/experimental/gtk+2.0/debian/patches/032_filechooser-sizing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/032_filechooser-sizing.patch?rev=11333&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/032_filechooser-sizing.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/032_filechooser-sizing.patch Wed Jun 6 21:47:47 2007
@@ -1,7 +1,7 @@
-Index: gtk+-2.10.12/gtk/gtkfilechooserembed.c
+Index: gtk+2.0-2.10.12/gtk/gtkfilechooserembed.c
===================================================================
---- gtk+-2.10.12.orig/gtk/gtkfilechooserembed.c 2007-05-18 18:32:18.820860750 +0200
-+++ gtk+-2.10.12/gtk/gtkfilechooserembed.c 2007-05-18 18:33:08.707978500 +0200
+--- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserembed.c 2007-05-02 18:26:58.000000000 +0200
++++ gtk+2.0-2.10.12/gtk/gtkfilechooserembed.c 2007-06-06 23:41:40.000000000 +0200
@@ -28,9 +28,7 @@
static void delegate_get_default_size (GtkFileChooserEmbed *chooser_embed,
gint *default_width,
@@ -59,10 +59,10 @@
- GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_resizable_hints (chooser_embed, resize_horizontally, resize_vertically);
+ return GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_resizable (chooser_embed);
}
-Index: gtk+-2.10.12/gtk/gtkfilechooserembed.h
+Index: gtk+2.0-2.10.12/gtk/gtkfilechooserembed.h
===================================================================
---- gtk+-2.10.12.orig/gtk/gtkfilechooserembed.h 2007-05-18 18:32:18.800859500 +0200
-+++ gtk+-2.10.12/gtk/gtkfilechooserembed.h 2007-05-18 18:33:08.707978500 +0200
+--- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserembed.h 2007-05-02 18:26:58.000000000 +0200
++++ gtk+2.0-2.10.12/gtk/gtkfilechooserembed.h 2007-06-06 23:41:40.000000000 +0200
@@ -43,9 +43,7 @@
void (*get_default_size) (GtkFileChooserEmbed *chooser_embed,
gint *default_width,
@@ -86,10 +86,10 @@
gboolean _gtk_file_chooser_embed_should_respond (GtkFileChooserEmbed *chooser_embed);
void _gtk_file_chooser_embed_initial_focus (GtkFileChooserEmbed *chooser_embed);
-Index: gtk+-2.10.12/gtk/gtkfilechooserdialog.c
+Index: gtk+2.0-2.10.12/gtk/gtkfilechooserdialog.c
===================================================================
---- gtk+-2.10.12.orig/gtk/gtkfilechooserdialog.c 2007-05-18 18:32:18.740855750 +0200
-+++ gtk+-2.10.12/gtk/gtkfilechooserdialog.c 2007-05-18 18:33:08.707978500 +0200
+--- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserdialog.c 2007-05-02 18:26:58.000000000 +0200
++++ gtk+2.0-2.10.12/gtk/gtkfilechooserdialog.c 2007-06-06 23:41:40.000000000 +0200
@@ -87,10 +87,6 @@
GTK_TYPE_FILE_CHOOSER_DIALOG,
GtkFileChooserDialogPrivate);
@@ -299,10 +299,10 @@
_gtk_file_chooser_embed_initial_focus (GTK_FILE_CHOOSER_EMBED (priv->widget));
GTK_WIDGET_CLASS (gtk_file_chooser_dialog_parent_class)->map (widget);
-Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c
+Index: gtk+2.0-2.10.12/gtk/gtkfilechooserdefault.c
===================================================================
---- gtk+-2.10.12.orig/gtk/gtkfilechooserdefault.c 2007-05-18 18:32:18.724854750 +0200
-+++ gtk+-2.10.12/gtk/gtkfilechooserdefault.c 2007-05-18 18:33:08.711978750 +0200
+--- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserdefault.c 2007-05-02 18:26:59.000000000 +0200
++++ gtk+2.0-2.10.12/gtk/gtkfilechooserdefault.c 2007-06-06 23:42:03.000000000 +0200
@@ -272,6 +272,8 @@
GtkStyle *previous_style);
static void gtk_file_chooser_default_screen_changed (GtkWidget *widget,
@@ -519,11 +519,11 @@
}
struct switch_folder_closure {
-Index: gtk+-2.10.12/gtk/gtkfilechooserprivate.h
+Index: gtk+2.0-2.10.12/gtk/gtkfilechooserprivate.h
===================================================================
---- gtk+-2.10.12.orig/gtk/gtkfilechooserprivate.h 2007-05-18 18:32:18.664851000 +0200
-+++ gtk+-2.10.12/gtk/gtkfilechooserprivate.h 2007-05-18 18:33:08.715979000 +0200
-@@ -109,10 +109,6 @@
+--- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserprivate.h 2007-06-06 23:41:40.000000000 +0200
++++ gtk+2.0-2.10.12/gtk/gtkfilechooserprivate.h 2007-06-06 23:41:40.000000000 +0200
+@@ -117,10 +117,6 @@
char *file_system;
/* for use with GtkFileChooserEmbed */
@@ -534,7 +534,7 @@
gboolean response_requested;
};
-@@ -254,6 +250,9 @@
+@@ -262,6 +258,9 @@
GSource *shortcuts_drag_outside_idle;
#endif
Modified: desktop/experimental/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/series?rev=11333&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/series (original)
+++ desktop/experimental/gtk+2.0/debian/patches/series Wed Jun 6 21:47:47 2007
@@ -4,6 +4,7 @@
005_xpmico.patch
007_implicit_pointer_conversion_gdkdrawable_directfb.patch
008_implicit_pointer_conversion_gdkgc_directfb.patch
+009_gtk-export-filechooser.patch
011_directfb-build-fixes-from-head.patch
013_gdkproperty-directfb-strdup.patch
015_default-fallback-icon-theme.patch
Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=11333&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Wed Jun 6 21:47:47 2007
@@ -40,7 +40,7 @@
VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
APIVER := 2.0
SONAME := 0
-SHVER := 2.10.3
+SHVER := 2.10.12-3
# earliest version that this release has backwards binary compatibility for
GTK_BINARY_VERSION := 2.10.0
More information about the pkg-gnome-commits
mailing list