r29559 - in /desktop/unstable/gtk+2.0/debian: changelog patches/003_gdk.pc_privates.patch patches/006_filechooser_remote.patch patches/009_gtk-export-filechooser.patch patches/066_Revert-gdk-Make-background-changes-queue-a-repaint.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Sep 2 15:17:47 UTC 2011
Author: joss
Date: Fri Sep 2 15:17:47 2011
New Revision: 29559
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29559
Log:
* New upstream release.
+ Contains patch from Michal Suchanek to allow entering non-local
URIs in the file chooser. Closes: #629423.
* 003_gdk.pc_privates.patch: updated for the new version.
* 009_gtk-export-filechooser.patch: refreshed.
* 066_Revert-gdk-Make-background-changes-queue-a-repaint.patch:
dropped, merged upstream.
Removed:
desktop/unstable/gtk+2.0/debian/patches/006_filechooser_remote.patch
desktop/unstable/gtk+2.0/debian/patches/066_Revert-gdk-Make-background-changes-queue-a-repaint.patch
Modified:
desktop/unstable/gtk+2.0/debian/changelog
desktop/unstable/gtk+2.0/debian/patches/003_gdk.pc_privates.patch
desktop/unstable/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
desktop/unstable/gtk+2.0/debian/patches/series
Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=29559&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Fri Sep 2 15:17:47 2011
@@ -1,9 +1,14 @@
-gtk+2.0 (2.24.5-5) UNRELEASED; urgency=low
-
- * 006_filechooser_remote.patch: patch from Michal Suchanek to allow
- entering non-local URIs in the file chooser. Closes: #629423.
-
- -- Josselin Mouette <joss at debian.org> Fri, 19 Aug 2011 20:20:13 +0200
+gtk+2.0 (2.24.6-1) unstable; urgency=low
+
+ * New upstream release.
+ + Contains patch from Michal Suchanek to allow entering non-local
+ URIs in the file chooser. Closes: #629423.
+ * 003_gdk.pc_privates.patch: updated for the new version.
+ * 009_gtk-export-filechooser.patch: refreshed.
+ * 066_Revert-gdk-Make-background-changes-queue-a-repaint.patch:
+ dropped, merged upstream.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 02 Sep 2011 17:17:47 +0200
gtk+2.0 (2.24.5-4) unstable; urgency=low
Modified: desktop/unstable/gtk+2.0/debian/patches/003_gdk.pc_privates.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/003_gdk.pc_privates.patch?rev=29559&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/003_gdk.pc_privates.patch [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/003_gdk.pc_privates.patch [utf-8] Fri Sep 2 15:17:47 2011
@@ -1,8 +1,8 @@
-Index: gtk+2.0-2.22.0/configure.in
+Index: gtk+-2.24.6/configure.in
===================================================================
---- gtk+2.0-2.22.0.orig/configure.in 2010-09-23 20:29:21.069589516 +0200
-+++ gtk+2.0-2.22.0/configure.in 2010-09-23 20:29:25.890579526 +0200
-@@ -1310,23 +1310,27 @@
+--- gtk+-2.24.6.orig/configure.in 2011-09-02 17:04:57.000000000 +0200
++++ gtk+-2.24.6/configure.in 2011-09-02 17:10:00.671871268 +0200
+@@ -1311,23 +1311,27 @@ LDFLAGS="$saved_ldflags"
# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
if test "x$gdktarget" = "xx11"; then
@@ -15,9 +15,9 @@
+ GDK_PRIVATE_PACKAGES="gio-2.0 cairo-$cairo_backend"
fi
--GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
+-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB"
-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
-+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES $GDK_PRIVATE_PACKAGES`"
++GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $MATH_LIB"
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS"
#
# If we aren't writing explicit dependencies, then don't put the extra libraries we need
@@ -35,11 +35,11 @@
AC_SUBST(GDK_EXTRA_LIBS)
AC_SUBST(GDK_EXTRA_CFLAGS)
AC_SUBST(GDK_DEP_LIBS)
-Index: gtk+2.0-2.22.0/gdk-2.0.pc.in
+Index: gtk+-2.24.6/gdk-2.0.pc.in
===================================================================
---- gtk+2.0-2.22.0.orig/gdk-2.0.pc.in 2010-09-23 05:00:35.000000000 +0200
-+++ gtk+2.0-2.22.0/gdk-2.0.pc.in 2010-09-23 20:29:25.890579526 +0200
-@@ -8,5 +8,6 @@
+--- gtk+-2.24.6.orig/gdk-2.0.pc.in 2011-08-16 04:30:51.000000000 +0200
++++ gtk+-2.24.6/gdk-2.0.pc.in 2011-09-02 17:06:04.962718939 +0200
+@@ -8,5 +8,6 @@ Name: GDK
Description: GTK+ Drawing Kit (${target} target)
Version: @VERSION@
Requires: @GDK_PACKAGES@
Modified: desktop/unstable/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/009_gtk-export-filechooser.patch?rev=29559&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch [utf-8] Fri Sep 2 15:17:47 2011
@@ -34,9 +34,11 @@
* tests/autotestfilechooser.c: build with
GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -48,6 +48,8 @@
+Index: gtk+-2.24.6/gtk/Makefile.am
+===================================================================
+--- gtk+-2.24.6.orig/gtk/Makefile.am 2011-08-16 04:30:52.000000000 +0200
++++ gtk+-2.24.6/gtk/Makefile.am 2011-09-02 17:12:09.864502851 +0200
+@@ -48,6 +48,8 @@ INCLUDES = \
-I$(top_builddir)/gtk \
-I$(top_srcdir) -I../gdk \
-I$(top_srcdir)/gdk \
@@ -45,7 +47,7 @@
-DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
-@@ -356,12 +358,16 @@
+@@ -356,12 +358,16 @@ endif
# Installed header files without compatibility guarantees
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
@@ -65,7 +67,7 @@
gtksearchenginesimple.h \
gtkdndcursors.h \
gtkentryprivate.h \
-@@ -370,11 +376,7 @@
+@@ -370,11 +376,7 @@ gtk_private_h_sources = \
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@@ -77,9 +79,11 @@
gtkiconcache.h \
gtkimcontextsimpleseqs.h \
gtkintl.h \
---- a/gtk/gtk.symbols
-+++ b/gtk/gtk.symbols
-@@ -1667,6 +1667,12 @@
+Index: gtk+-2.24.6/gtk/gtk.symbols
+===================================================================
+--- gtk+-2.24.6.orig/gtk/gtk.symbols 2011-08-16 04:30:52.000000000 +0200
++++ gtk+-2.24.6/gtk/gtk.symbols 2011-09-02 17:12:09.868502873 +0200
+@@ -1667,6 +1667,12 @@ gtk_file_chooser_dialog_new_with_backend
#endif
#endif
@@ -92,8 +96,10 @@
#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
---- a/gtk/gtkfilechooserprivate.h
-+++ b/gtk/gtkfilechooserprivate.h
+Index: gtk+-2.24.6/gtk/gtkfilechooserprivate.h
+===================================================================
+--- gtk+-2.24.6.orig/gtk/gtkfilechooserprivate.h 2011-08-16 04:30:52.000000000 +0200
++++ gtk+-2.24.6/gtk/gtkfilechooserprivate.h 2011-09-02 17:12:09.868502873 +0200
@@ -21,6 +21,14 @@
#ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
#define __GTK_FILE_CHOOSER_PRIVATE_H__
@@ -109,9 +115,11 @@
#include "gtkfilechooser.h"
#include "gtkfilesystem.h"
#include "gtkfilesystemmodel.h"
---- a/gtk/gtkfilechooserutils.c
-+++ b/gtk/gtkfilechooserutils.c
-@@ -122,6 +122,22 @@
+Index: gtk+-2.24.6/gtk/gtkfilechooserutils.c
+===================================================================
+--- gtk+-2.24.6.orig/gtk/gtkfilechooserutils.c 2011-08-16 04:30:52.000000000 +0200
++++ gtk+-2.24.6/gtk/gtkfilechooserutils.c 2011-09-02 17:12:09.868502873 +0200
+@@ -122,6 +122,22 @@ _gtk_file_chooser_install_properties (GO
"create-folders");
}
@@ -134,15 +142,17 @@
/**
* _gtk_file_chooser_delegate_iface_init:
* @iface: a #GtkFileChoserIface structure
-@@ -363,3 +379,6 @@
- g_signal_emit_by_name (data, "confirm-overwrite", &conf);
- return conf;
+@@ -419,3 +435,6 @@ _gtk_file_chooser_extract_recent_folders
+
+ return result;
}
+
+#define __GTK_FILE_CHOOSER_UTILS_C__
+#include "gtkaliasdef.c"
---- a/gtk/gtkfilechooserutils.h
-+++ b/gtk/gtkfilechooserutils.h
+Index: gtk+-2.24.6/gtk/gtkfilechooserutils.h
+===================================================================
+--- gtk+-2.24.6.orig/gtk/gtkfilechooserutils.h 2011-08-16 04:30:52.000000000 +0200
++++ gtk+-2.24.6/gtk/gtkfilechooserutils.h 2011-09-02 17:12:09.868502873 +0200
@@ -22,6 +22,14 @@
#ifndef __GTK_FILE_CHOOSER_UTILS_H__
#define __GTK_FILE_CHOOSER_UTILS_H__
@@ -158,7 +168,7 @@
#include "gtkfilechooserprivate.h"
G_BEGIN_DECLS
-@@ -46,6 +54,9 @@
+@@ -46,6 +54,9 @@ typedef enum {
} GtkFileChooserProp;
void _gtk_file_chooser_install_properties (GObjectClass *klass);
@@ -168,8 +178,10 @@
void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver,
---- a/gtk/gtkfilesystemmodel.h
-+++ b/gtk/gtkfilesystemmodel.h
+Index: gtk+-2.24.6/gtk/gtkfilesystemmodel.h
+===================================================================
+--- gtk+-2.24.6.orig/gtk/gtkfilesystemmodel.h 2011-08-16 04:30:49.000000000 +0200
++++ gtk+-2.24.6/gtk/gtkfilesystemmodel.h 2011-09-02 17:12:09.868502873 +0200
@@ -21,6 +21,10 @@
#ifndef __GTK_FILE_SYSTEM_MODEL_H__
#define __GTK_FILE_SYSTEM_MODEL_H__
@@ -181,8 +193,10 @@
#include <gio/gio.h>
#include <gtk/gtkfilefilter.h>
#include <gtk/gtktreemodel.h>
---- a/gtk/gtkquery.h
-+++ b/gtk/gtkquery.h
+Index: gtk+-2.24.6/gtk/gtkquery.h
+===================================================================
+--- gtk+-2.24.6.orig/gtk/gtkquery.h 2011-08-16 04:30:49.000000000 +0200
++++ gtk+-2.24.6/gtk/gtkquery.h 2011-09-02 17:12:09.868502873 +0200
@@ -23,6 +23,14 @@
#ifndef __GTK_QUERY_H__
#define __GTK_QUERY_H__
@@ -198,8 +212,10 @@
#include <glib-object.h>
G_BEGIN_DECLS
---- a/gtk/gtksearchengine.h
-+++ b/gtk/gtksearchengine.h
+Index: gtk+-2.24.6/gtk/gtksearchengine.h
+===================================================================
+--- gtk+-2.24.6.orig/gtk/gtksearchengine.h 2011-08-16 04:30:49.000000000 +0200
++++ gtk+-2.24.6/gtk/gtksearchengine.h 2011-09-02 17:12:09.872502896 +0200
@@ -23,6 +23,14 @@
#ifndef __GTK_SEARCH_ENGINE_H__
#define __GTK_SEARCH_ENGINE_H__
Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=29559&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series [utf-8] Fri Sep 2 15:17:47 2011
@@ -3,7 +3,6 @@
003_gdk.pc_privates.patch
004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
005_support_disabling_x11_extensions.patch
-006_filechooser_remote.patch
009_gtk-export-filechooser.patch
011_immodule-cache-dir.patch
015_default-fallback-icon-theme.patch
@@ -14,5 +13,4 @@
061_use_pdf_as_default_printing_standard.patch
064_gir_build_workaround.patch
065_tracker-0-10.patch
-066_Revert-gdk-Make-background-changes-queue-a-repaint.patch
098_multiarch_module_path.patch
More information about the pkg-gnome-commits
mailing list