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

* New upstream bugfix release:

Browse Source 
+ debian/patches/009_gtk-export-filechooser.patch:
    - Updated to apply cleanly again.
  + debian/patches/031_gtksearchenginetracker_fixes.patch,
    debian/patches/061_foreign_colormaps.patch,
    debian/patches/092_implicit-g-fopen.patch:
    - Dropped, merged upstream.
  + debian/patches/070_mandatory-relibtoolize.patch:
    - Regenerated for the new version.
This commit is contained in:
Sebastian Dröge
2008-06-04 07:02:29 +00:00
parent f7e009c0e5
commit 49079bc497
7 changed files with 353 additions and 3072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
debian/changelog vendored
View File

@ -1,3 +1,17 @@
gtk+2.0 (2.12.10-1) unstable; urgency=low
* New upstream bugfix release:
+ debian/patches/009_gtk-export-filechooser.patch:
- Updated to apply cleanly again.
+ debian/patches/031_gtksearchenginetracker_fixes.patch,
debian/patches/061_foreign_colormaps.patch,
debian/patches/092_implicit-g-fopen.patch:
- Dropped, merged upstream.
+ debian/patches/070_mandatory-relibtoolize.patch:
- Regenerated for the new version.
-- Sebastian Dröge <slomo@debian.org> Wed, 04 Jun 2008 08:14:08 +0200
gtk+2.0 (2.12.9-4) unstable; urgency=low
[ Loic Minier ]

7
debian/patches/009_gtk-export-filechooser.patch vendored
View File

@ -45,7 +45,7 @@
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
@@ -339,12 +341,15 @@
@@ -341,12 +343,15 @@
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
gtktextlayout.h \
@ -61,9 +61,9 @@
gtk_private_h_sources = \
- gtkquery.h \
- gtksearchengine.h \
gtksearchenginebeagle.h \
gtksearchenginetracker.h\
gtksearchenginesimple.h \
gtkdndcursors.h \
gtkentryprivate.h \
@@ -354,10 +359,7 @@
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
@ -75,6 +75,7 @@
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
--- a/gtk/gtk.symbols 2008-04-01 11:10:41.000000000 +0200
+++ b/gtk/gtk.symbols 2008-04-01 11:10:48.000000000 +0200
@@ -1416,6 +1416,12 @@

47
debian/patches/031_gtksearchenginetracker_fixes.patch vendored
View File

@ -1,47 +0,0 @@
Index: gtk+-2.12.1/gtk/gtksearchenginetracker.c
===================================================================
--- gtk+-2.12.1.orig/gtk/gtksearchenginetracker.c 2007-10-16 15:20:38.000000000 +0200
+++ gtk+-2.12.1/gtk/gtksearchenginetracker.c 2007-10-31 19:38:20.770226213 +0100
@@ -35,6 +35,7 @@
static TrackerClient * (*tracker_connect) (gboolean enable_warnings) = NULL;
static void (*tracker_disconnect) (TrackerClient *client) = NULL;
+static int (*tracker_get_version) (TrackerClient *client, GError **error) = NULL;
static void (*tracker_cancel_last_call) (TrackerClient *client) = NULL;
static void (*tracker_search_metadata_by_text_async) (TrackerClient *client,
@@ -56,6 +57,7 @@
#define MAP(a) { #a, (gpointer *)&a }
MAP (tracker_connect),
MAP (tracker_disconnect),
+ MAP (tracker_get_version),
MAP (tracker_cancel_last_call),
MAP (tracker_search_metadata_by_text_async),
MAP (tracker_search_metadata_by_text_and_location_async),
@@ -285,6 +287,7 @@
{
GtkSearchEngineTracker *engine;
TrackerClient *tracker_client;
+ GError *err = NULL;
open_libtracker ();
@@ -296,6 +299,18 @@
if (!tracker_client)
return NULL;
+ if (!tracker_get_version)
+ return NULL;
+
+ tracker_get_version (tracker_client, &err);
+
+ if (err != NULL)
+ {
+ g_error_free (err);
+ tracker_disconnect (tracker_client);
+ return NULL;
+ }
+
engine = g_object_new (GTK_TYPE_SEARCH_ENGINE_TRACKER, NULL);
engine->priv->client = tracker_client;

32
debian/patches/061_foreign_colormaps.patch vendored
View File

@ -1,32 +0,0 @@
Debian #477199
Upstream SVN r19969
Index: gtk+-2.12.9/gdk/x11/gdkcolor-x11.c
===================================================================
--- gtk+-2.12.9.orig/gdk/x11/gdkcolor-x11.c 2008-04-26 16:20:24.494968621 +0200
+++ gtk+-2.12.9/gdk/x11/gdkcolor-x11.c 2008-04-26 16:20:48.030968466 +0200
@@ -46,7 +46,7 @@ struct _GdkColormapPrivateX11
GdkColorInfo *info;
time_t last_sync_time;
- guint foreign : 1;
+ gboolean foreign;
};
#define GDK_COLORMAP_PRIVATE_DATA(cmap) ((GdkColormapPrivateX11 *) GDK_COLORMAP (cmap)->windowing_data)
@@ -107,7 +107,7 @@ gdk_colormap_finalize (GObject *object)
gdk_colormap_remove (colormap);
- if (!private->screen->closed)
+ if (!private->screen->closed && !private->foreign)
XFreeColormap (GDK_SCREEN_XDISPLAY (private->screen), private->xcolormap);
if (private->hash)
@@ -1292,6 +1292,7 @@ gdk_x11_colormap_foreign_new (GdkVisual
private->screen = screen;
private->xcolormap = xcolormap;
private->private_val = FALSE;
+ private->foreign = TRUE;
colormap->size = visual->colormap_size;

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

File diff suppressed because it is too large Load Diff

13
debian/patches/092_implicit-g-fopen.patch vendored
View File

@ -1,13 +0,0 @@
Index: modules/printbackends/cups/gtkprintbackendcups.c
===================================================================
--- gtk+/modules/printbackends/cups/gtkprintbackendcups.c (Revision 19784)
+++ gtk+/modules/printbackends/cups/gtkprintbackendcups.c (Arbeitskopie)
@@ -36,6 +36,7 @@
#include <cairo-ps.h>
#include <glib/gi18n-lib.h>
+#include <glib/gstdio.h>
#include <gmodule.h>
#include <gtk/gtkprintoperation.h>

3
debian/patches/series vendored
View File

@ -13,13 +13,10 @@
021_loader-files-d.patch
022_module-files-append-compat-module-files-d.patch
030_gtkentry_password-char-circle.patch
031_gtksearchenginetracker_fixes.patch
#033_treeview_resizing.patch
041_ia32-libs.patch
042_treeview_single-focus.patch
060_ignore-random-icons.patch
061_foreign_colormaps.patch
070_mandatory-relibtoolize.patch
091_workaround_no_gtk_init_incorrect_display.patch
095_gtk-im-module-setting.patch
092_implicit-g-fopen.patch