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

* New upstream stable release; no API change; bug fixes and translation

Browse Source 
updates.
  - Drop patches 031_gtksearchenginetracker_fixes,
    080_from_bugzilla_workaround_eclipse_crash, 081_icon-cache-validate
    fixed upstream.
  - Refresh patches 033_treeview_resizing, 040_filechooser_single-click to
    apply cleanly.
  - Drop patches 060_opening-display-by-env-error-message,
    065_gtk-filechooser-locale-time merged upstream.
  - Update relibtoolizing patch, 070_mandatory-relibtoolize.
This commit is contained in:
Loïc Minier
2007-10-18 14:48:57 +00:00
parent da0affc1ea
commit aa4ea23ee2
10 changed files with 707 additions and 8646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
debian/changelog vendored
View File

@ -1,3 +1,18 @@
gtk+2.0 (2.12.1-1) UNRELEASED; urgency=low
* New upstream stable release; no API change; bug fixes and translation
updates.
- Drop patches 031_gtksearchenginetracker_fixes,
080_from_bugzilla_workaround_eclipse_crash, 081_icon-cache-validate
fixed upstream.
- Refresh patches 033_treeview_resizing, 040_filechooser_single-click to
apply cleanly.
- Drop patches 060_opening-display-by-env-error-message,
065_gtk-filechooser-locale-time merged upstream.
- Update relibtoolizing patch, 070_mandatory-relibtoolize.
-- Loic Minier <lool@dooz.org> Thu, 18 Oct 2007 16:40:27 +0200
gtk+2.0 (2.12.0-3) unstable; urgency=low
[ Josselin Mouette ]

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

@ -1,56 +0,0 @@
Index: gtk+-2.12.0/gtk/gtksearchenginetracker.c
===================================================================
--- gtk+-2.12.0.orig/gtk/gtksearchenginetracker.c 2007-09-13 22:35:40.000000000 +0200
+++ gtk+-2.12.0/gtk/gtksearchenginetracker.c 2007-09-22 18:31:11.153264053 +0200
@@ -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),
@@ -74,7 +76,7 @@
done = TRUE;
- tracker = g_module_open ("libtracker.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+ tracker = g_module_open ("libtrackerclient.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
if (!tracker)
return;
@@ -279,6 +281,7 @@
{
GtkSearchEngineTracker *engine;
TrackerClient *tracker_client;
+ GError *err = NULL;
open_libtracker ();
@@ -290,6 +293,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;

14
debian/patches/033_treeview_resizing.patch vendored
View File

@ -1,5 +1,5 @@
--- gtk+2.0-2.12.0.orig/gtk/gtktreeviewcolumn.c 2007-09-13 22:35:40.000000000 +0200
+++ gtk+2.0-2.12.0/gtk/gtktreeviewcolumn.c 2007-09-16 18:24:32.000000000 +0200
--- gtk+2.0-2.12.1.orig/gtk/gtktreeviewcolumn.c 2007-10-16 15:20:39.000000000 +0200
+++ gtk+2.0-2.12.1/gtk/gtktreeviewcolumn.c 2007-10-18 16:30:17.000000000 +0200
@@ -2142,6 +2142,7 @@
tree_column->tree_view != NULL &&
GTK_WIDGET_REALIZED (tree_column->tree_view))
@ -8,8 +8,8 @@
gtk_widget_queue_resize (tree_column->tree_view);
}
--- gtk+2.0-2.12.0.orig/gtk/gtktreeview.c 2007-09-14 00:43:35.000000000 +0200
+++ gtk+2.0-2.12.0/gtk/gtktreeview.c 2007-09-16 18:24:32.000000000 +0200
--- gtk+2.0-2.12.1.orig/gtk/gtktreeview.c 2007-10-16 15:20:39.000000000 +0200
+++ gtk+2.0-2.12.1/gtk/gtktreeview.c 2007-10-18 16:30:17.000000000 +0200
@@ -2159,18 +2159,20 @@
/* GtkWidget::size_allocate helper */
@ -128,7 +128,7 @@
gtk_widget_queue_resize (widget);
}
@@ -11472,7 +11506,7 @@
@@ -11479,7 +11513,7 @@
if (GTK_WIDGET_REALIZED (tree_view))
{
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@ -137,8 +137,8 @@
}
g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
--- gtk+2.0-2.12.0.orig/gtk/gtktreeprivate.h 2007-09-13 22:35:41.000000000 +0200
+++ gtk+2.0-2.12.0/gtk/gtktreeprivate.h 2007-09-16 18:24:32.000000000 +0200
--- gtk+2.0-2.12.1.orig/gtk/gtktreeprivate.h 2007-10-16 15:20:39.000000000 +0200
+++ gtk+2.0-2.12.1/gtk/gtktreeprivate.h 2007-10-18 16:30:17.000000000 +0200
@@ -265,6 +265,10 @@
gboolean tree_lines_enabled;
GdkGC *tree_line_gc;

8
debian/patches/040_filechooser_single-click.patch vendored
View File

@ -1,8 +1,8 @@
Debian #405296; GNOME #148828; permit single click in filechooser instead of
requiring double-click.
--- gtk+2.0-2.12.0.orig/gtk/gtkfilechooserdefault.c 2007-09-13 22:35:40.000000000 +0200
+++ gtk+2.0-2.12.0/gtk/gtkfilechooserdefault.c 2007-09-16 18:24:40.000000000 +0200
--- gtk+2.0-2.12.1.orig/gtk/gtkfilechooserdefault.c 2007-10-16 15:20:39.000000000 +0200
+++ gtk+2.0-2.12.1/gtk/gtkfilechooserdefault.c 2007-10-18 16:30:37.000000000 +0200
@@ -390,10 +390,6 @@
static void filter_combo_changed (GtkComboBox *combo_box,
@ -47,7 +47,7 @@ requiring double-click.
g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
G_CALLBACK (shortcuts_key_press_event_cb), impl);
@@ -8593,25 +8600,6 @@
@@ -8604,25 +8611,6 @@
gtk_file_path_free (path);
return retval;
}
@ -73,7 +73,7 @@ requiring double-click.
else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
{
/* The focus is on a dialog's action area button, *and* the widget that
@@ -10469,25 +10457,6 @@
@@ -10482,25 +10470,6 @@
}
}

14
debian/patches/060_opening-display-by-env-error-message.patch vendored
View File

@ -1,14 +0,0 @@
GNOME #486636; Debian #283076; fixes error message on opening of display to
include the display when it was set via the DISPLAY env var
--- gtk+2.0-2.12.0.orig/gtk/gtkmain.c 2007-09-13 22:35:41.000000000 +0200
+++ gtk+2.0-2.12.0/gtk/gtkmain.c 2007-10-14 19:55:34.000000000 +0200
@@ -933,6 +933,8 @@
if (!gtk_init_check (argc, argv))
{
const char *display_name_arg = gdk_get_display_arg_name ();
+ if (display_name_arg == NULL)
+ display_name_arg = getenv("DISPLAY");
g_warning ("cannot open display: %s", display_name_arg ? display_name_arg : " ");
exit (1);
}

14
debian/patches/065_gtk-filechooser-locale-time.patch vendored
View File

@ -1,14 +0,0 @@
GNOME #482504; Debian #444927; Fix warnings and display of modified date / time
in filechooser for some locales as it was missing a locale to UTF-8 conversion
--- gtk/gtkfilechooserdefault.c.orig 2007-10-14 20:36:47.000000000 +0200
+++ gtk/gtkfilechooserdefault.c 2007-10-14 20:38:04.000000000 +0200
@@ -11100,7 +11100,7 @@
}
if (strftime (buf, sizeof (buf), format, &tm_mtime) != 0)
- date_str = g_strdup (buf);
+ date_str = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL);
else
date_str = g_strdup (_("Unknown"));
}

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

File diff suppressed because it is too large Load Diff

13
debian/patches/080_from_bugzilla_workaround_eclipse_crash.patch vendored
View File

@ -1,13 +0,0 @@
GNOME #410194; Debian #445613; LP #128232; fix crash when displaying tooltips
in SWT apps such as Eclipse
--- gtk+2.0-2.12.0.orig/gtk/gtktooltips.c 2007-09-13 22:35:41.000000000 +0200
+++ gtk+2.0-2.12.0/gtk/gtktooltips.c 2007-10-14 19:47:54.000000000 +0200
@@ -230,6 +230,7 @@
}
if (tooltips->active_tips_data
+ && tooltipsdata
&& tooltips->active_tips_data->widget == widget
&& GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget))
{

30
debian/patches/081_icon-cache-validate.patch vendored
View File

@ -1,30 +0,0 @@
# See: http://bugzilla.gnome.org/show_bug.cgi?id=476342
--- trunk/gtk/gtkiconcache.c 2007/09/14 01:01:59 18822
+++ trunk/gtk/gtkiconcache.c 2007/09/14 02:11:01 18823
@@ -127,14 +127,19 @@
info.n_directories = 0;
info.flags = CHECK_OFFSETS|CHECK_STRINGS;
- if (!_gtk_icon_cache_validate (&info))
+#ifdef G_ENABLE_DEBUG
+ if (gtk_debug_flags & GTK_DEBUG_ICONTHEME)
{
- g_mapped_file_free (map);
- g_warning ("Icon cache '%s' is invalid\n", cache_filename);
+ if (!_gtk_icon_cache_validate (&info))
+ {
+ g_mapped_file_free (map);
+ g_warning ("Icon cache '%s' is invalid\n", cache_filename);
- goto done;
+ goto done;
+ }
}
-
+#endif
+
GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path));
cache = g_new0 (GtkIconCache, 1);

5
debian/patches/series vendored
View File

@ -10,14 +10,9 @@
020_immodules-files-d.patch
021_loader-files-d.patch
030_gtkentry_password-char-circle.patch
031_gtksearchenginetracker_fixes.patch
033_treeview_resizing.patch
040_filechooser_single-click.patch
041_ia32-libs.patch
060_opening-display-by-env-error-message.patch
065_gtk-filechooser-locale-time.patch -p0
070_mandatory-relibtoolize.patch
071_fix_gdk_window_null_crasher.patch
080_from_bugzilla_workaround_eclipse_crash.patch
081_icon-cache-validate.patch
091_workaround_no_gtk_init_incorrect_display.patch