This commit is contained in:
parent
8720e5bf3f
commit
805cccef04
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5bd9bf1fb331259f0c25056380cad405063df9ad655d5e07a679ee9f098d0ec8
|
||||
size 16027448
|
3
gtk+-2.13.3.tar.bz2
Normal file
3
gtk+-2.13.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5edc7a60e069bfbdeec7b9f101d5c6934ed702ceec3e21b1e02a2c14fca72cb6
|
||||
size 16711986
|
@ -1,7 +1,7 @@
|
||||
Index: gtk+-2.11.5/demos/gtk-demo/changedisplay.c
|
||||
Index: gtk+-2.13.2/demos/gtk-demo/changedisplay.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/demos/gtk-demo/changedisplay.c
|
||||
+++ gtk+-2.11.5/demos/gtk-demo/changedisplay.c
|
||||
--- gtk+-2.13.2.orig/demos/gtk-demo/changedisplay.c
|
||||
+++ gtk+-2.13.2/demos/gtk-demo/changedisplay.c
|
||||
@@ -73,7 +73,7 @@ static GtkWidget *
|
||||
find_toplevel_at_pointer (GdkDisplay *display)
|
||||
{
|
||||
@ -20,10 +20,10 @@ Index: gtk+-2.11.5/demos/gtk-demo/changedisplay.c
|
||||
|
||||
return widget ? gtk_widget_get_toplevel (widget) : NULL;
|
||||
}
|
||||
Index: gtk+-2.11.5/demos/gtk-demo/textview.c
|
||||
Index: gtk+-2.13.2/demos/gtk-demo/textview.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/demos/gtk-demo/textview.c
|
||||
+++ gtk+-2.11.5/demos/gtk-demo/textview.c
|
||||
--- gtk+-2.13.2.orig/demos/gtk-demo/textview.c
|
||||
+++ gtk+-2.13.2/demos/gtk-demo/textview.c
|
||||
@@ -548,7 +548,7 @@ static void
|
||||
easter_egg_callback (GtkWidget *button,
|
||||
gpointer data)
|
||||
@ -42,10 +42,10 @@ Index: gtk+-2.11.5/demos/gtk-demo/textview.c
|
||||
|
||||
gtk_window_set_default_size (GTK_WINDOW (window), 300, 400);
|
||||
|
||||
Index: gtk+-2.11.5/gdk-pixbuf/queryloaders.c
|
||||
Index: gtk+-2.13.2/gdk-pixbuf/queryloaders.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/gdk-pixbuf/queryloaders.c
|
||||
+++ gtk+-2.11.5/gdk-pixbuf/queryloaders.c
|
||||
--- gtk+-2.13.2.orig/gdk-pixbuf/queryloaders.c
|
||||
+++ gtk+-2.13.2/gdk-pixbuf/queryloaders.c
|
||||
@@ -153,6 +153,7 @@ query_module (const char *dir, const cha
|
||||
GModule *module;
|
||||
void (*fill_info) (GdkPixbufFormat *info);
|
||||
@ -75,10 +75,10 @@ Index: gtk+-2.11.5/gdk-pixbuf/queryloaders.c
|
||||
(*fill_info) (info);
|
||||
(*fill_vtable) (vtable);
|
||||
|
||||
Index: gtk+-2.11.5/gdk/x11/gdkdnd-x11.c
|
||||
Index: gtk+-2.13.2/gdk/x11/gdkdnd-x11.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/gdk/x11/gdkdnd-x11.c
|
||||
+++ gtk+-2.11.5/gdk/x11/gdkdnd-x11.c
|
||||
--- gtk+-2.13.2.orig/gdk/x11/gdkdnd-x11.c
|
||||
+++ gtk+-2.13.2/gdk/x11/gdkdnd-x11.c
|
||||
@@ -905,6 +905,7 @@ motif_read_target_table (GdkDisplay *dis
|
||||
{
|
||||
guchar *data;
|
||||
@ -113,11 +113,11 @@ Index: gtk+-2.11.5/gdk/x11/gdkdnd-x11.c
|
||||
Window proxy;
|
||||
Atom xdnd_proxy_atom = gdk_x11_get_xatom_by_name_for_display (display, "XdndProxy");
|
||||
Atom xdnd_aware_atom = gdk_x11_get_xatom_by_name_for_display (display, "XdndAware");
|
||||
Index: gtk+-2.11.5/gdk/x11/gdkevents-x11.c
|
||||
Index: gtk+-2.13.2/gdk/x11/gdkevents-x11.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/gdk/x11/gdkevents-x11.c
|
||||
+++ gtk+-2.11.5/gdk/x11/gdkevents-x11.c
|
||||
@@ -514,6 +514,7 @@ gdk_check_wm_state_changed (GdkWindow *w
|
||||
--- gtk+-2.13.2.orig/gdk/x11/gdkevents-x11.c
|
||||
+++ gtk+-2.13.2/gdk/x11/gdkevents-x11.c
|
||||
@@ -519,6 +519,7 @@ gdk_check_wm_state_changed (GdkWindow *w
|
||||
gulong bytes_after;
|
||||
guchar *data;
|
||||
Atom *atoms = NULL;
|
||||
@ -125,7 +125,7 @@ Index: gtk+-2.11.5/gdk/x11/gdkevents-x11.c
|
||||
gulong i;
|
||||
|
||||
gboolean had_sticky = toplevel->have_sticky;
|
||||
@@ -2598,6 +2599,7 @@ fetch_net_wm_check_window (GdkScreen *sc
|
||||
@@ -2614,6 +2615,7 @@ fetch_net_wm_check_window (GdkScreen *sc
|
||||
gulong bytes_after;
|
||||
guchar *data;
|
||||
Window *xwindow;
|
||||
@ -133,10 +133,10 @@ Index: gtk+-2.11.5/gdk/x11/gdkevents-x11.c
|
||||
|
||||
/* This function is very slow on every call if you are not running a
|
||||
* spec-supporting WM. For now not optimized, because it isn't in
|
||||
Index: gtk+-2.11.5/gdk/x11/gdkim-x11.c
|
||||
Index: gtk+-2.13.2/gdk/x11/gdkim-x11.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/gdk/x11/gdkim-x11.c
|
||||
+++ gtk+-2.11.5/gdk/x11/gdkim-x11.c
|
||||
--- gtk+-2.13.2.orig/gdk/x11/gdkim-x11.c
|
||||
+++ gtk+-2.13.2/gdk/x11/gdkim-x11.c
|
||||
@@ -130,6 +130,7 @@ find_a_display (void)
|
||||
gchar *
|
||||
gdk_wcstombs (const GdkWChar *src)
|
||||
@ -145,11 +145,11 @@ Index: gtk+-2.11.5/gdk/x11/gdkim-x11.c
|
||||
gchar *mbstr;
|
||||
|
||||
if (gdk_use_mb)
|
||||
Index: gtk+-2.11.5/gdk/x11/gdkwindow-x11.c
|
||||
Index: gtk+-2.13.2/gdk/x11/gdkwindow-x11.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/gdk/x11/gdkwindow-x11.c
|
||||
+++ gtk+-2.11.5/gdk/x11/gdkwindow-x11.c
|
||||
@@ -5046,6 +5046,7 @@ gdk_window_set_mwm_hints (GdkWindow *win
|
||||
--- gtk+-2.13.2.orig/gdk/x11/gdkwindow-x11.c
|
||||
+++ gtk+-2.13.2/gdk/x11/gdkwindow-x11.c
|
||||
@@ -5064,6 +5064,7 @@ gdk_window_set_mwm_hints (GdkWindow *win
|
||||
Atom hints_atom = None;
|
||||
guchar *data;
|
||||
MotifWmHints *hints;
|
||||
@ -157,11 +157,11 @@ Index: gtk+-2.11.5/gdk/x11/gdkwindow-x11.c
|
||||
Atom type;
|
||||
gint format;
|
||||
gulong nitems;
|
||||
Index: gtk+-2.11.5/gtk/gtkmain.c
|
||||
Index: gtk+-2.13.2/gtk/gtkmain.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/gtk/gtkmain.c
|
||||
+++ gtk+-2.11.5/gtk/gtkmain.c
|
||||
@@ -1329,7 +1329,8 @@ static GdkEvent *
|
||||
--- gtk+-2.13.2.orig/gtk/gtkmain.c
|
||||
+++ gtk+-2.13.2/gtk/gtkmain.c
|
||||
@@ -1346,7 +1346,8 @@ static GdkEvent *
|
||||
rewrite_event_for_grabs (GdkEvent *event)
|
||||
{
|
||||
GdkWindow *grab_window;
|
||||
@ -171,7 +171,7 @@ Index: gtk+-2.11.5/gtk/gtkmain.c
|
||||
gboolean owner_events;
|
||||
GdkDisplay *display;
|
||||
|
||||
@@ -2197,12 +2198,12 @@ gtk_get_current_event_state (GdkModifier
|
||||
@@ -2215,12 +2216,12 @@ gtk_get_current_event_state (GdkModifier
|
||||
GtkWidget*
|
||||
gtk_get_event_widget (GdkEvent *event)
|
||||
{
|
||||
@ -186,11 +186,11 @@ Index: gtk+-2.11.5/gtk/gtkmain.c
|
||||
|
||||
return widget;
|
||||
}
|
||||
Index: gtk+-2.11.5/gtk/gtkmodules.c
|
||||
Index: gtk+-2.13.2/gtk/gtkmodules.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/gtk/gtkmodules.c
|
||||
+++ gtk+-2.11.5/gtk/gtkmodules.c
|
||||
@@ -254,7 +254,7 @@ static GSList *
|
||||
--- gtk+-2.13.2.orig/gtk/gtkmodules.c
|
||||
+++ gtk+-2.13.2/gtk/gtkmodules.c
|
||||
@@ -253,7 +253,7 @@ static GSList *
|
||||
load_module (GSList *module_list,
|
||||
const gchar *name)
|
||||
{
|
||||
@ -199,7 +199,7 @@ Index: gtk+-2.11.5/gtk/gtkmodules.c
|
||||
GtkModuleInfo *info = NULL;
|
||||
GModule *module = NULL;
|
||||
GSList *l;
|
||||
@@ -280,7 +280,7 @@ load_module (GSList *module_list,
|
||||
@@ -279,7 +279,7 @@ load_module (GSList *module_list,
|
||||
|
||||
if (module)
|
||||
{
|
||||
@ -208,11 +208,11 @@ Index: gtk+-2.11.5/gtk/gtkmodules.c
|
||||
!modinit_func)
|
||||
g_module_close (module);
|
||||
else
|
||||
Index: gtk+-2.11.5/gtk/gtkselection.c
|
||||
Index: gtk+-2.13.2/gtk/gtkselection.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/gtk/gtkselection.c
|
||||
+++ gtk+-2.11.5/gtk/gtkselection.c
|
||||
@@ -1055,7 +1055,7 @@ gtk_selection_convert (GtkWidget *widget
|
||||
--- gtk+-2.13.2.orig/gtk/gtkselection.c
|
||||
+++ gtk+-2.13.2/gtk/gtkselection.c
|
||||
@@ -1066,7 +1066,7 @@ gtk_selection_convert (GtkWidget *widget
|
||||
|
||||
if (owner_window != NULL)
|
||||
{
|
||||
@ -221,7 +221,7 @@ Index: gtk+-2.11.5/gtk/gtkselection.c
|
||||
GtkSelectionData selection_data;
|
||||
|
||||
selection_data.selection = selection;
|
||||
@@ -1064,7 +1064,7 @@ gtk_selection_convert (GtkWidget *widget
|
||||
@@ -1075,7 +1075,7 @@ gtk_selection_convert (GtkWidget *widget
|
||||
selection_data.length = -1;
|
||||
selection_data.display = display;
|
||||
|
||||
@ -230,11 +230,11 @@ Index: gtk+-2.11.5/gtk/gtkselection.c
|
||||
|
||||
if (owner_widget != NULL)
|
||||
{
|
||||
Index: gtk+-2.11.5/gtk/gtktipsquery.c
|
||||
Index: gtk+-2.13.2/gtk/gtktipsquery.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/gtk/gtktipsquery.c
|
||||
+++ gtk+-2.11.5/gtk/gtktipsquery.c
|
||||
@@ -445,7 +445,7 @@ gtk_tips_query_event (GtkWidget *
|
||||
--- gtk+-2.13.2.orig/gtk/gtktipsquery.c
|
||||
+++ gtk+-2.13.2/gtk/gtktipsquery.c
|
||||
@@ -441,7 +441,7 @@ gtk_tips_query_event (GtkWidget *
|
||||
GdkEvent *event)
|
||||
{
|
||||
GtkTipsQuery *tips_query;
|
||||
@ -243,7 +243,7 @@ Index: gtk+-2.11.5/gtk/gtktipsquery.c
|
||||
gboolean event_handled;
|
||||
|
||||
g_return_val_if_fail (GTK_IS_TIPS_QUERY (widget), FALSE);
|
||||
@@ -468,12 +468,12 @@ gtk_tips_query_event (GtkWidget *
|
||||
@@ -464,12 +464,12 @@ gtk_tips_query_event (GtkWidget *
|
||||
|
||||
case GDK_LEAVE_NOTIFY:
|
||||
if (event_widget)
|
||||
@ -258,44 +258,11 @@ Index: gtk+-2.11.5/gtk/gtktipsquery.c
|
||||
gtk_tips_query_emit_widget_entered (tips_query, event_widget);
|
||||
event_handled = TRUE;
|
||||
break;
|
||||
Index: gtk+-2.11.5/gtk/gtkwidget.c
|
||||
Index: gtk+-2.13.2/gtk/queryimmodules.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/gtk/gtkwidget.c
|
||||
+++ gtk+-2.11.5/gtk/gtkwidget.c
|
||||
@@ -4352,12 +4352,12 @@ gtk_widget_reparent_subwindows (GtkWidge
|
||||
|
||||
for (tmp_list = children; tmp_list; tmp_list = tmp_list->next)
|
||||
{
|
||||
- GtkWidget *child;
|
||||
+ gpointer child;
|
||||
GdkWindow *window = tmp_list->data;
|
||||
|
||||
- gdk_window_get_user_data (window, (void **)&child);
|
||||
+ gdk_window_get_user_data (window, &child);
|
||||
while (child && child != widget)
|
||||
- child = child->parent;
|
||||
+ child = ((GtkWidget*)child)->parent;
|
||||
|
||||
if (child)
|
||||
gdk_window_reparent (window, new_window, 0, 0);
|
||||
@@ -4380,10 +4380,10 @@ gtk_widget_reparent_subwindows (GtkWidge
|
||||
|
||||
for (tmp_list = children; tmp_list; tmp_list = tmp_list->next)
|
||||
{
|
||||
- GtkWidget *child;
|
||||
+ gpointer child;
|
||||
GdkWindow *window = tmp_list->data;
|
||||
|
||||
- gdk_window_get_user_data (window, (void **)&child);
|
||||
+ gdk_window_get_user_data (window, &child);
|
||||
if (child == widget)
|
||||
gdk_window_reparent (window, new_window, 0, 0);
|
||||
}
|
||||
Index: gtk+-2.11.5/gtk/queryimmodules.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/gtk/queryimmodules.c
|
||||
+++ gtk+-2.11.5/gtk/queryimmodules.c
|
||||
@@ -89,11 +89,10 @@ print_escaped (const char *str)
|
||||
--- gtk+-2.13.2.orig/gtk/queryimmodules.c
|
||||
+++ gtk+-2.13.2/gtk/queryimmodules.c
|
||||
@@ -88,11 +88,10 @@ print_escaped (const char *str)
|
||||
static gboolean
|
||||
query_module (const char *dir, const char *name)
|
||||
{
|
||||
@ -311,7 +278,7 @@ Index: gtk+-2.11.5/gtk/queryimmodules.c
|
||||
|
||||
GModule *module;
|
||||
gchar *path;
|
||||
@@ -113,10 +112,10 @@ query_module (const char *dir, const cha
|
||||
@@ -112,10 +111,10 @@ query_module (const char *dir, const cha
|
||||
}
|
||||
|
||||
if (module &&
|
||||
@ -326,7 +293,7 @@ Index: gtk+-2.11.5/gtk/queryimmodules.c
|
||||
{
|
||||
const GtkIMContextInfo **contexts;
|
||||
guint n_contexts;
|
||||
@@ -125,7 +124,7 @@ query_module (const char *dir, const cha
|
||||
@@ -124,7 +123,7 @@ query_module (const char *dir, const cha
|
||||
print_escaped (path);
|
||||
fputs ("\n", stdout);
|
||||
|
||||
@ -335,10 +302,10 @@ Index: gtk+-2.11.5/gtk/queryimmodules.c
|
||||
|
||||
for (i=0; i<n_contexts; i++)
|
||||
{
|
||||
Index: gtk+-2.11.5/tests/testcalendar.c
|
||||
Index: gtk+-2.13.2/tests/testcalendar.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/tests/testcalendar.c
|
||||
+++ gtk+-2.11.5/tests/testcalendar.c
|
||||
--- gtk+-2.13.2.orig/tests/testcalendar.c
|
||||
+++ gtk+-2.13.2/tests/testcalendar.c
|
||||
@@ -18,6 +18,8 @@
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
@ -348,10 +315,10 @@ Index: gtk+-2.11.5/tests/testcalendar.c
|
||||
#include <config.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
Index: gtk+-2.11.5/tests/testgtk.c
|
||||
Index: gtk+-2.13.2/tests/testgtk.c
|
||||
===================================================================
|
||||
--- gtk+-2.11.5.orig/tests/testgtk.c
|
||||
+++ gtk+-2.11.5/tests/testgtk.c
|
||||
--- gtk+-2.13.2.orig/tests/testgtk.c
|
||||
+++ gtk+-2.13.2/tests/testgtk.c
|
||||
@@ -2400,7 +2400,7 @@ gridded_geometry_response (GtkDialog *di
|
||||
static void
|
||||
create_gridded_geometry (GtkWidget *widget)
|
||||
@ -370,7 +337,7 @@ Index: gtk+-2.11.5/tests/testgtk.c
|
||||
|
||||
if (!window)
|
||||
{
|
||||
@@ -12041,7 +12041,7 @@ find_widget (GtkWidget *widget, FindWidg
|
||||
@@ -12020,7 +12020,7 @@ find_widget (GtkWidget *widget, FindWidg
|
||||
static GtkWidget *
|
||||
find_widget_at_pointer (GdkDisplay *display)
|
||||
{
|
||||
@ -379,7 +346,7 @@ Index: gtk+-2.11.5/tests/testgtk.c
|
||||
GdkWindow *pointer_window;
|
||||
gint x, y;
|
||||
FindWidgetData data;
|
||||
@@ -12049,12 +12049,12 @@ find_widget_at_pointer (GdkDisplay *disp
|
||||
@@ -12028,12 +12028,12 @@ find_widget_at_pointer (GdkDisplay *disp
|
||||
pointer_window = gdk_display_get_window_at_pointer (display, NULL, NULL);
|
||||
|
||||
if (pointer_window)
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,21 +0,0 @@
|
||||
2008-06-03 Federico Mena Quintero <federico@novell.com>
|
||||
|
||||
* gtk/gtkfilechooserentry.c (install_completion_feedback_timer):
|
||||
If the user presses Tab while the completion feedback window is
|
||||
active, then we'll assert. Remove the assertion and just re-set
|
||||
the timer. Fixes https://bugzilla.novell.com/show_bug.cgi?id=355225
|
||||
|
||||
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
|
||||
index aef6d31..a98041a 100644
|
||||
--- a/gtk/gtkfilechooserentry.c
|
||||
+++ b/gtk/gtkfilechooserentry.c
|
||||
@@ -939,7 +939,8 @@ completion_feedback_timeout_cb (gpointer data)
|
||||
static void
|
||||
install_completion_feedback_timer (GtkFileChooserEntry *chooser_entry)
|
||||
{
|
||||
- g_assert (chooser_entry->completion_feedback_timeout_id == 0);
|
||||
+ if (chooser_entry->completion_feedback_timeout_id != 0)
|
||||
+ g_source_remove (chooser_entry->completion_feedback_timeout_id);
|
||||
|
||||
chooser_entry->completion_feedback_timeout_id = gdk_threads_add_timeout (COMPLETION_FEEDBACK_TIMEOUT_MS,
|
||||
completion_feedback_timeout_cb,
|
@ -2,7 +2,7 @@ Index: gtk/updateiconcache.c
|
||||
===================================================================
|
||||
--- gtk/updateiconcache.c.orig
|
||||
+++ gtk/updateiconcache.c
|
||||
@@ -47,6 +47,7 @@ static gboolean quiet = FALSE;
|
||||
@@ -49,6 +49,7 @@ static gboolean quiet = FALSE;
|
||||
static gboolean index_only = FALSE;
|
||||
static gboolean validate = FALSE;
|
||||
static gchar *var_name = "-";
|
||||
@ -10,7 +10,7 @@ Index: gtk/updateiconcache.c
|
||||
|
||||
/* Quite ugly - if we just add the c file to the
|
||||
* list of sources in Makefile.am, libtool complains.
|
||||
@@ -1452,12 +1453,17 @@ build_cache (const gchar *path)
|
||||
@@ -1470,6 +1471,8 @@ build_cache (const gchar *path)
|
||||
|
||||
directories = scan_directory (path, NULL, files, NULL, 0);
|
||||
|
||||
@ -19,16 +19,17 @@ Index: gtk/updateiconcache.c
|
||||
if (g_hash_table_size (files) == 0)
|
||||
{
|
||||
/* Empty table, just close and remove the file */
|
||||
|
||||
@@ -1477,6 +1480,9 @@ build_cache (const gchar *path)
|
||||
fclose (cache);
|
||||
close (fd);
|
||||
g_unlink (tmp_cache_path);
|
||||
+ if (remove_empty_cache)
|
||||
+ g_unlink (cache_path);
|
||||
+ g_unlink (cache_path);
|
||||
+ g_free (cache_path);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
@@ -1471,6 +1477,7 @@ build_cache (const gchar *path)
|
||||
@@ -1491,6 +1497,7 @@ build_cache (const gchar *path)
|
||||
if (!retval)
|
||||
{
|
||||
g_unlink (tmp_cache_path);
|
||||
@ -36,7 +37,7 @@ Index: gtk/updateiconcache.c
|
||||
exit (1);
|
||||
}
|
||||
|
||||
@@ -1481,8 +1488,6 @@ build_cache (const gchar *path)
|
||||
@@ -1501,8 +1508,6 @@ build_cache (const gchar *path)
|
||||
exit (1);
|
||||
}
|
||||
|
||||
@ -45,7 +46,7 @@ Index: gtk/updateiconcache.c
|
||||
#ifdef G_OS_WIN32
|
||||
if (g_file_test (cache_path, G_FILE_TEST_EXISTS))
|
||||
{
|
||||
@@ -1495,6 +1500,7 @@ build_cache (const gchar *path)
|
||||
@@ -1515,6 +1520,7 @@ build_cache (const gchar *path)
|
||||
g_strerror (errno),
|
||||
cache_path);
|
||||
g_unlink (cache_path);
|
||||
@ -53,7 +54,7 @@ Index: gtk/updateiconcache.c
|
||||
bak_cache_path = NULL;
|
||||
}
|
||||
}
|
||||
@@ -1506,6 +1512,7 @@ build_cache (const gchar *path)
|
||||
@@ -1526,6 +1532,7 @@ build_cache (const gchar *path)
|
||||
tmp_cache_path, cache_path,
|
||||
g_strerror (errno));
|
||||
g_unlink (tmp_cache_path);
|
||||
@ -61,7 +62,7 @@ Index: gtk/updateiconcache.c
|
||||
#ifdef G_OS_WIN32
|
||||
if (bak_cache_path != NULL)
|
||||
if (g_rename (bak_cache_path, cache_path) == -1)
|
||||
@@ -1524,12 +1531,17 @@ build_cache (const gchar *path)
|
||||
@@ -1544,7 +1551,10 @@ build_cache (const gchar *path)
|
||||
/* FIXME: What do do if an error occurs here? */
|
||||
if (g_stat (path, &path_stat) < 0 ||
|
||||
g_stat (cache_path, &cache_stat))
|
||||
@ -73,14 +74,16 @@ Index: gtk/updateiconcache.c
|
||||
|
||||
utime_buf.actime = path_stat.st_atime;
|
||||
utime_buf.modtime = cache_stat.st_mtime;
|
||||
@@ -1554,6 +1564,8 @@ build_cache (const gchar *path)
|
||||
utime (path, &utime_buf);
|
||||
|
||||
#endif
|
||||
|
||||
+ g_free (cache_path);
|
||||
+
|
||||
if (!quiet)
|
||||
g_printerr (_("Cache file created successfully.\n"));
|
||||
}
|
||||
@@ -1573,6 +1585,7 @@ static GOptionEntry args[] = {
|
||||
@@ -1597,6 +1609,7 @@ static GOptionEntry args[] = {
|
||||
{ "force", 'f', 0, G_OPTION_ARG_NONE, &force_update, N_("Overwrite an existing cache, even if up to date"), NULL },
|
||||
{ "ignore-theme-index", 't', 0, G_OPTION_ARG_NONE, &ignore_theme_index, N_("Don't check for the existence of index.theme"), NULL },
|
||||
{ "index-only", 'i', 0, G_OPTION_ARG_NONE, &index_only, N_("Don't include image data in the cache"), NULL },
|
||||
|
@ -1,49 +0,0 @@
|
||||
--- gtk/gtkcolorsel.c
|
||||
+++ gtk/gtkcolorsel.c
|
||||
@@ -795,6 +795,7 @@
|
||||
gdk_color.red = UNSCALE (color[0]);
|
||||
gdk_color.green = UNSCALE (color[1]);
|
||||
gdk_color.blue = UNSCALE (color[2]);
|
||||
+ gdk_color.pixel = 0; /* Quiet GCC */
|
||||
|
||||
x = 0;
|
||||
y = 0; /* Quiet GCC */
|
||||
--- tests/testgtk.c
|
||||
+++ tests/testgtk.c
|
||||
@@ -6548,9 +6548,12 @@
|
||||
col1.red = 0;
|
||||
col1.green = 56000;
|
||||
col1.blue = 0;
|
||||
+ col1.pixel = 0; /* Quiet GCC */
|
||||
+
|
||||
col2.red = 32000;
|
||||
col2.green = 0;
|
||||
col2.blue = 56000;
|
||||
+ col2.pixel = 0; /* Quiet GCC */
|
||||
|
||||
style1 = gtk_style_copy (GTK_WIDGET (data)->style);
|
||||
style1->base[GTK_STATE_NORMAL] = col1;
|
||||
@@ -6803,9 +6806,11 @@
|
||||
col1.red = 56000;
|
||||
col1.green = 0;
|
||||
col1.blue = 0;
|
||||
+ col1.pixel = 0; /* Quiet GCC */
|
||||
col2.red = 0;
|
||||
col2.green = 56000;
|
||||
col2.blue = 32000;
|
||||
+ col2.pixel = 0; /* Quiet GCC */
|
||||
|
||||
style = gtk_style_new ();
|
||||
style->fg[GTK_STATE_NORMAL] = col1;
|
||||
@@ -7002,9 +7007,11 @@
|
||||
col1.red = 0;
|
||||
col1.green = 56000;
|
||||
col1.blue = 0;
|
||||
+ col1.pixel = 0; /* Quiet GCC */
|
||||
col2.red = 32000;
|
||||
col2.green = 0;
|
||||
col2.blue = 56000;
|
||||
+ col2.pixel = 0; /* Quiet GCC */
|
||||
|
||||
style1 = gtk_style_new ();
|
||||
style1->base[GTK_STATE_NORMAL] = col1;
|
61
gtk2.changes
61
gtk2.changes
@ -1,3 +1,64 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 18 22:20:44 CEST 2008 - maw@suse.de
|
||||
|
||||
- Update to version 2.13.3:
|
||||
+ Support runtime font configuration changes
|
||||
+ Use GIO for mime information
|
||||
+ Use GIO directly for the file chooser, do not load filesystem
|
||||
implementation modules
|
||||
+ GTK+ no longer uses translations when the application is not
|
||||
translated to the current locale
|
||||
+ Bugs fixed: bgo#520874, bgo#536185, bgo#536757, bgo#536990,
|
||||
bgo#535608, bgo#488119, bgo#536730, bgo#131920, bgo#526987,
|
||||
bgo#536765, bgo#503071, bgo#517706, bgo#519092, bgo#524222,
|
||||
bgo#537985, bgo#531960, bgo#408154, bgo#506853, bgo#536430, and
|
||||
bgo#537685
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 16 23:34:39 CEST 2008 - maw@suse.de
|
||||
|
||||
- Provide and obsolete gail-devel in gtk2-devel.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 6 21:51:09 CEST 2008 - maw@suse.de
|
||||
|
||||
- Update to version 2.13.2:
|
||||
+ gdk-pixbuf:
|
||||
* Support loading the OS X icns format
|
||||
* Support loading of JPEG2000 images
|
||||
* Support loading from and saving to GIO streams
|
||||
+ GDK:
|
||||
* Add GdkAppLaunchContext, to provide startup notification
|
||||
with g_app_info_launch()
|
||||
* Use RandR 1.2 instead of Xinerama when available, and expose
|
||||
more monitor information
|
||||
+ Accessibility:
|
||||
* The gail module is now shipped as part of GTK+
|
||||
* GtkStatusIcon supports keyboard navigation
|
||||
+ GtkCalendar:
|
||||
* Support displaying details for each day
|
||||
+ GtkBuilder:
|
||||
* gtk-builder-convert has been improved
|
||||
* Translation-domain works properly
|
||||
* Support accessibility
|
||||
+ Testing support:
|
||||
* Add utilities for testing GTK+ applications
|
||||
* Add some unit tests for GTK+
|
||||
+ New settings:
|
||||
* for disabling display of accelerators and mnemonics
|
||||
* for position of vertical scrollbars in scrolled windows
|
||||
* for the default input method
|
||||
+ GtkToolShell: new interface for containers of GtkToolItems
|
||||
+ Many bugfixes
|
||||
+ Updated translations
|
||||
- Respin the following patches: gtk+-strict-aliasing.patch and
|
||||
gtk2-remove-empty-cache.patch
|
||||
- Remove the following upstreamed patches:
|
||||
gtk2-bnc171077-bgo314873-filechooser-tab-in-the-middle-of-entry.diff
|
||||
and gtk2-bnc355225-filechooser-tab-completion-crash.diff
|
||||
- Provide and obsolete gail.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 3 22:46:27 CEST 2008 - federico@novell.com
|
||||
|
||||
|
86
gtk2.spec
86
gtk2.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package gtk2 (Version 2.12.9)
|
||||
# spec file for package gtk2 (Version 2.13.3)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -14,7 +14,7 @@ Name: gtk2
|
||||
%define _name gtk+
|
||||
# If you enable DirectFB support here, you have to enable it in cairo, too:
|
||||
%define DIRECTFB_SUPPORT 0
|
||||
BuildRequires: atk-devel cairo-devel cups-devel gcc-c++ gnome-patch-translation gtk-doc libtiff-devel pango-devel
|
||||
BuildRequires: atk-devel cairo-devel cups-devel gcc-c++ gnome-patch-translation gtk-doc libjasper-devel libtiff-devel pango-devel
|
||||
%if %DIRECTFB_SUPPORT
|
||||
BuildRequires: DirectFB-devel
|
||||
%endif
|
||||
@ -27,15 +27,14 @@ License: LGPL v2.1 or later
|
||||
Group: System/Libraries
|
||||
AutoReqProv: on
|
||||
PreReq: /usr/bin/touch /bin/rm /bin/rmdir
|
||||
Version: 2.12.9
|
||||
Release: 36
|
||||
Version: 2.13.3
|
||||
Release: 1
|
||||
Summary: Library for Creation of Graphical User Interfaces (version 2)
|
||||
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2
|
||||
Source1: SuSEconfig.gtk2
|
||||
Source2: README.SuSE
|
||||
Source3: gtkrc
|
||||
Patch: gtk+-strict-aliasing.patch
|
||||
Patch1: gtk2-uninitialized.patch
|
||||
Patch2: gtk-warn.patch
|
||||
Patch4: gtk2-filesel-navbuttons.patch
|
||||
Patch6: gtk+-mac_ctree.patch
|
||||
@ -58,16 +57,12 @@ Patch36: gtk2-libtool.patch
|
||||
# be sufficient.
|
||||
# FIXME: this section is incomplete, and that some of the patches listed earlier should
|
||||
# be here instead.
|
||||
# PATCH-FIX-UPSTREAM gtk2-bnc343858-buggy-intel-xinerama.patch bnc343858 bgo523408 vuntz@novell.com -- Some Intel cards misreports a connected output and this leads applications to use a lower screen resolution than the real one
|
||||
# PATCH-NEEDS-REBASE gtk2-bnc343858-buggy-intel-xinerama.patch bnc343858 bgo523408 vuntz@novell.com -- Some Intel cards misreports a connected output and this leads applications to use a lower screen resolution than the real one (was PATCH-FIX-UPSTREAM)
|
||||
Patch51: gtk2-bnc343858-buggy-intel-xinerama.patch
|
||||
# PATCH-FIX-UPSTREAM gtk2-bnc171077-bgo314873-filechooser-tab-in-the-middle-of-entry.diff bnc171077 bgo314873 federico@novell.com -- Tab-completion rewrite for the file chooser
|
||||
Patch52: gtk2-bnc171077-bgo314873-filechooser-tab-in-the-middle-of-entry.diff
|
||||
# PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bgo369696
|
||||
Patch53: gtk-path-local.patch
|
||||
# PATCH-FIX-UPSTREAM gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff bnc310710 bgo524166 federico@novell.com - Fix positioning of GtkLabels with too-small allocations
|
||||
Patch54: gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff
|
||||
# PATCH-FIX-UPSTREAM gtk2-bnc355225-filechooser-tab-completion-crash.diff bnc355225 federico@novell.com - Fix crash when doing furious Tab completion
|
||||
Patch55: gtk2-bnc355225-filechooser-tab-completion-crash.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: cairo >= 0.9.2 hicolor-icon-theme
|
||||
%if %suse_version > 1020
|
||||
@ -77,6 +72,9 @@ Requires: %{name}-lang = %{version}
|
||||
# gtk2 can exist without branding. Built in defaults will be used then.
|
||||
Recommends: %{name}-branding
|
||||
Recommends: gvfs
|
||||
# gail is part of gtk+ as of 2.13.x
|
||||
Provides: gail = 1.22.1
|
||||
Obsoletes: gail <= 1.22.1
|
||||
|
||||
%description
|
||||
This fast and versatile library is used all over the world for all
|
||||
@ -171,6 +169,9 @@ Summary: Development environment for the Gtk2 GUI library
|
||||
Group: Development/Libraries/X11
|
||||
AutoReqProv: on
|
||||
Requires: %{name} = %{version} atk-devel cairo-devel glibc-devel glib2-devel pango-devel %(rpm -q --whatprovides XFree86-devel --queryformat '%{NAME}')
|
||||
# gail is part of gtk+ as of 2.13.x
|
||||
Provides: gail-devel = 1.22.1
|
||||
Obsoletes: gail-devel <= 1.22.1
|
||||
|
||||
%description devel
|
||||
This package contains all necessary include files, libraries,
|
||||
@ -256,9 +257,9 @@ Authors:
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q -n %{_name}-%{version}
|
||||
gnome-patch-translation-prepare
|
||||
# This breaks due to bugs in a Makefile.am;
|
||||
# gnome-patch-translation-prepare
|
||||
%patch -p1
|
||||
%patch1
|
||||
%patch2
|
||||
%patch4 -p1
|
||||
%patch6 -p1
|
||||
@ -279,12 +280,10 @@ cp -a %{S:2} .
|
||||
%patch32 -p1
|
||||
%patch35
|
||||
%patch36
|
||||
%patch51 -p1
|
||||
%patch52 -p1
|
||||
# %patch51 -p1
|
||||
%patch53
|
||||
%patch54 -p1
|
||||
%patch55 -p1
|
||||
gnome-patch-translation-update
|
||||
# gnome-patch-translation-update
|
||||
|
||||
%build
|
||||
ACLOCAL="aclocal -I m4macros" autoreconf -f -i
|
||||
@ -336,6 +335,7 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders\
|
||||
$RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gdk-pixbuf64.loaders
|
||||
%endif
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2*/*/*.la
|
||||
rm $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/modules/*.la
|
||||
%fdupes $RPM_BUILD_ROOT
|
||||
|
||||
%clean
|
||||
@ -372,6 +372,7 @@ fi
|
||||
%{_libdir}/lib*.so.*
|
||||
%dir %{_libdir}/gtk-2.0
|
||||
%dir %{_libdir}/gtk-2.0/[2me]*
|
||||
%{_libdir}/gtk-2.0/modules/*.so
|
||||
%dir %{_libdir}/gtk-2.0/immodules
|
||||
%dir %{_libdir}/gtk-2.0/2*/*
|
||||
%{_libdir}/gtk-2.0/2*/*/*.so
|
||||
@ -401,6 +402,7 @@ fi
|
||||
%{_bindir}/*-csource
|
||||
%{_datadir}/gtk-2.0
|
||||
%{_datadir}/aclocal/*.m4
|
||||
%{_includedir}/gail-1.0
|
||||
%{_includedir}/gtk-2.0
|
||||
%{_includedir}/gtk-unix-print-2.0
|
||||
%{_libdir}/lib*.so
|
||||
@ -415,6 +417,58 @@ fi
|
||||
%{_datadir}/gtk-doc/html/*
|
||||
|
||||
%changelog
|
||||
* Thu Jun 19 2008 maw@suse.de
|
||||
- Update to version 2.13.3:
|
||||
+ Support runtime font configuration changes
|
||||
+ Use GIO for mime information
|
||||
+ Use GIO directly for the file chooser, do not load filesystem
|
||||
implementation modules
|
||||
+ GTK+ no longer uses translations when the application is not
|
||||
translated to the current locale
|
||||
+ Bugs fixed: bgo#520874, bgo#536185, bgo#536757, bgo#536990,
|
||||
bgo#535608, bgo#488119, bgo#536730, bgo#131920, bgo#526987,
|
||||
bgo#536765, bgo#503071, bgo#517706, bgo#519092, bgo#524222,
|
||||
bgo#537985, bgo#531960, bgo#408154, bgo#506853, bgo#536430, and
|
||||
bgo#537685
|
||||
+ Updated translations.
|
||||
* Tue Jun 17 2008 maw@suse.de
|
||||
- Provide and obsolete gail-devel in gtk2-devel.
|
||||
* Fri Jun 06 2008 maw@suse.de
|
||||
- Update to version 2.13.2:
|
||||
+ gdk-pixbuf:
|
||||
* Support loading the OS X icns format
|
||||
* Support loading of JPEG2000 images
|
||||
* Support loading from and saving to GIO streams
|
||||
+ GDK:
|
||||
* Add GdkAppLaunchContext, to provide startup notification
|
||||
with g_app_info_launch()
|
||||
* Use RandR 1.2 instead of Xinerama when available, and expose
|
||||
more monitor information
|
||||
+ Accessibility:
|
||||
* The gail module is now shipped as part of GTK+
|
||||
* GtkStatusIcon supports keyboard navigation
|
||||
+ GtkCalendar:
|
||||
* Support displaying details for each day
|
||||
+ GtkBuilder:
|
||||
* gtk-builder-convert has been improved
|
||||
* Translation-domain works properly
|
||||
* Support accessibility
|
||||
+ Testing support:
|
||||
* Add utilities for testing GTK+ applications
|
||||
* Add some unit tests for GTK+
|
||||
+ New settings:
|
||||
* for disabling display of accelerators and mnemonics
|
||||
* for position of vertical scrollbars in scrolled windows
|
||||
* for the default input method
|
||||
+ GtkToolShell: new interface for containers of GtkToolItems
|
||||
+ Many bugfixes
|
||||
+ Updated translations
|
||||
- Respin the following patches: gtk+-strict-aliasing.patch and
|
||||
gtk2-remove-empty-cache.patch
|
||||
- Remove the following upstreamed patches:
|
||||
gtk2-bnc171077-bgo314873-filechooser-tab-in-the-middle-of-entry.diff
|
||||
and gtk2-bnc355225-filechooser-tab-completion-crash.diff
|
||||
- Provide and obsolete gail.
|
||||
* Wed Jun 04 2008 federico@novell.com
|
||||
- Added gtk2-bnc355225-filechooser-tab-completion-crash.diff to fix
|
||||
the crash in https://bugzilla.novell.com/show_bug.cgi?id=355225 -
|
||||
|
Loading…
Reference in New Issue
Block a user