Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=3f7fe53e3e9ed98f9ea851ba2a1560101fd1e2fa
commit 3f7fe53e3e9ed98f9ea851ba2a1560101fd1e2fa Author: Devil505 <devil505li...@gmail.com> Date: Wed Feb 23 14:48:07 2011 +0100 gtk+2-2.24.0-3-i686 * added patches diff --git a/source/xlib/gtk+2/043_ubuntu_menu_proxy.patch b/source/xlib/gtk+2/043_ubuntu_menu_proxy.patch index 3c89edb..c484291 100644 --- a/source/xlib/gtk+2/043_ubuntu_menu_proxy.patch +++ b/source/xlib/gtk+2/043_ubuntu_menu_proxy.patch @@ -1,10 +1,10 @@ ## Description: add some description ## Origin/Author: add some origin or author ## Bug: bug URL -Index: gtk+2.0-2.21.6/gtk/Makefile.am +Index: gtk+2.0-2.23.90/gtk/Makefile.am =================================================================== ---- gtk+2.0-2.21.6.orig/gtk/Makefile.am 2010-08-24 17:45:04.000000000 +0200 -+++ gtk+2.0-2.21.6/gtk/Makefile.am 2010-08-24 17:45:04.000000000 +0200 +--- gtk+2.0-2.23.90.orig/gtk/Makefile.am 2011-01-21 09:23:55.728241188 -0500 ++++ gtk+2.0-2.23.90/gtk/Makefile.am 2011-01-21 09:23:58.638179868 -0500 @@ -249,6 +249,8 @@ gtkmenu.h \ gtkmenubar.h \ @@ -14,7 +14,7 @@ Index: gtk+2.0-2.21.6/gtk/Makefile.am gtkmenushell.h \ gtkmenutoolbutton.h \ gtkmessagedialog.h \ -@@ -517,6 +519,8 @@ +@@ -519,6 +521,8 @@ gtkmenu.c \ gtkmenubar.c \ gtkmenuitem.c \ @@ -23,85 +23,10 @@ Index: gtk+2.0-2.21.6/gtk/Makefile.am gtkmenushell.c \ gtkmenutoolbutton.c \ gtkmessagedialog.c \ ---- gtk+-2.22.1/gtk/Makefile.in.orig 2010-11-15 19:49:47.000000000 +0300 -+++ gtk+-2.22.1/gtk/Makefile.in 2010-12-26 15:28:00.000000000 +0300 -@@ -148,7 +148,7 @@ - gtkinfobar.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ - gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ - gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ -- gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ -+ gtkmenu.c gtkmenubar.c gtkmenuitem.c ubuntumenuproxy.c ubuntumenuproxymodule.c gtkmenushell.c \ - gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ - gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ - gtknotebook.c gtkobject.c gtkoffscreenwindow.c gtkorientable.c \ -@@ -234,7 +234,7 @@ - gtkinfobar.lo gtkinputdialog.lo gtkinvisible.lo gtkitem.lo \ - gtkkeyhash.lo gtklabel.lo gtklayout.lo gtklinkbutton.lo \ - gtkliststore.lo gtkmain.lo gtkmarshal.lo gtkmarshalers.lo \ -- gtkmenu.lo gtkmenubar.lo gtkmenuitem.lo gtkmenushell.lo \ -+ gtkmenu.lo gtkmenubar.lo gtkmenuitem.lo ubuntumenuproxy.lo ubuntumenuproxymodule.lo gtkmenushell.lo \ - gtkmenutoolbutton.lo gtkmessagedialog.lo gtkmisc.lo \ - gtkmnemonichash.lo gtkmodules.lo gtkmountoperation.lo \ - gtknotebook.lo gtkobject.lo gtkoffscreenwindow.lo \ -@@ -339,7 +339,7 @@ - gtkinfobar.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ - gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ - gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ -- gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ -+ gtkmenu.c gtkmenubar.c gtkmenuitem.c ubuntumenuproxy.c ubuntumenuproxymodule.c gtkmenushell.c \ - gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ - gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ - gtknotebook.c gtkobject.c gtkoffscreenwindow.c gtkorientable.c \ -@@ -426,7 +426,7 @@ - gtkinfobar.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ - gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ - gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ -- gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ -+ gtkmenu.c gtkmenubar.c gtkmenuitem.c ubuntumenuproxy.c ubuntumenuproxymodule.c gtkmenushell.c \ - gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ - gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ - gtknotebook.c gtkobject.c gtkoffscreenwindow.c gtkorientable.c \ -@@ -513,7 +513,7 @@ - gtkinfobar.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ - gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ - gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ -- gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ -+ gtkmenu.c gtkmenubar.c gtkmenuitem.c ubuntumenuproxy.c ubuntumenuproxymodule.c gtkmenushell.c \ - gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ - gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ - gtknotebook.c gtkobject.c gtkoffscreenwindow.c gtkorientable.c \ -@@ -1030,7 +1030,7 @@ - gtkimmodule.h gtkimmulticontext.h gtkinfobar.h gtkinvisible.h \ - gtkitem.h gtklabel.h gtklayout.h gtklinkbutton.h \ - gtkliststore.h gtkmain.h gtkmenu.h gtkmenubar.h gtkmenuitem.h \ -- gtkmenushell.h gtkmenutoolbutton.h gtkmessagedialog.h \ -+ ubuntumenuproxy.h ubuntumenuproxymodule.h gtkmenushell.h gtkmenutoolbutton.h gtkmessagedialog.h \ - gtkmisc.h gtkmodules.h gtkmountoperation.h gtknotebook.h \ - gtkobject.h gtkoffscreenwindow.h gtkorientable.h \ - gtkpagesetup.h gtkpaned.h gtkpapersize.h gtkplug.h \ -@@ -1131,7 +1131,7 @@ - gtkinfobar.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ - gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ - gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ -- gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ -+ gtkmenu.c gtkmenubar.c gtkmenuitem.c ubuntumenuproxy.c ubuntumenuproxymodule.c gtkmenushell.c \ - gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ - gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ - gtknotebook.c gtkobject.c gtkoffscreenwindow.c gtkorientable.c \ -@@ -1888,6 +1888,8 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkmenu.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkmenubar.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkmenuitem.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ubuntumenuproxy.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ubuntumenuproxymodule.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkmenushell.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkmenutoolbutton.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkmessagedialog.Plo@am__quote@ - -Index: gtk+2.0-2.21.6/gtk/gtk.h +Index: gtk+2.0-2.23.90/gtk/gtk.h =================================================================== ---- gtk+2.0-2.21.6.orig/gtk/gtk.h 2010-08-16 22:57:55.000000000 +0200 -+++ gtk+2.0-2.21.6/gtk/gtk.h 2010-08-24 17:45:04.000000000 +0200 +--- gtk+2.0-2.23.90.orig/gtk/gtk.h 2011-01-06 12:15:12.000000000 -0500 ++++ gtk+2.0-2.23.90/gtk/gtk.h 2011-01-21 09:23:58.638179868 -0500 @@ -65,6 +65,8 @@ #include <gtk/gtkcellview.h> #include <gtk/gtkcheckbutton.h> @@ -111,11 +36,11 @@ Index: gtk+2.0-2.21.6/gtk/gtk.h #include <gtk/gtkclipboard.h> #include <gtk/gtkcolorbutton.h> #include <gtk/gtkcolorsel.h> -Index: gtk+2.0-2.21.6/gtk/gtk.symbols +Index: gtk+2.0-2.23.90/gtk/gtk.symbols =================================================================== ---- gtk+2.0-2.21.6.orig/gtk/gtk.symbols 2010-08-24 17:45:04.000000000 +0200 -+++ gtk+2.0-2.21.6/gtk/gtk.symbols 2010-08-24 17:45:04.000000000 +0200 -@@ -2572,6 +2572,21 @@ +--- gtk+2.0-2.23.90.orig/gtk/gtk.symbols 2011-01-21 09:23:56.498221932 -0500 ++++ gtk+2.0-2.23.90/gtk/gtk.symbols 2011-01-21 09:23:58.638179868 -0500 +@@ -2606,6 +2606,21 @@ #endif #endif @@ -137,7 +62,7 @@ Index: gtk+2.0-2.21.6/gtk/gtk.symbols #if IN_HEADER(__GTK_MENU_SHELL_H__) #if IN_FILE(__GTK_MENU_SHELL_C__) gtk_menu_shell_activate_item -@@ -2586,6 +2601,7 @@ +@@ -2620,6 +2635,7 @@ gtk_menu_shell_select_item gtk_menu_shell_set_take_focus gtk_menu_shell_get_take_focus @@ -145,10 +70,10 @@ Index: gtk+2.0-2.21.6/gtk/gtk.symbols #endif #endif -Index: gtk+2.0-2.21.6/gtk/gtkmenubar.c +Index: gtk+2.0-2.23.90/gtk/gtkmenubar.c =================================================================== ---- gtk+2.0-2.21.6.orig/gtk/gtkmenubar.c 2010-08-16 22:57:55.000000000 +0200 -+++ gtk+2.0-2.21.6/gtk/gtkmenubar.c 2010-08-24 17:45:04.000000000 +0200 +--- gtk+2.0-2.23.90.orig/gtk/gtkmenubar.c 2011-01-06 12:15:13.000000000 -0500 ++++ gtk+2.0-2.23.90/gtk/gtkmenubar.c 2011-01-21 09:23:58.638179868 -0500 @@ -107,7 +107,7 @@ widget_class->size_allocate = gtk_menu_bar_size_allocate; widget_class->expose_event = gtk_menu_bar_expose; @@ -225,10 +150,28 @@ Index: gtk+2.0-2.21.6/gtk/gtkmenubar.c if (gtk_widget_get_visible (widget)) { menu_bar = GTK_MENU_BAR (widget); -Index: gtk+2.0-2.21.6/gtk/gtkmenushell.h +@@ -626,8 +669,15 @@ + GtkMenuShell *menu_shell = GTK_MENU_SHELL (menubars->data); + + _gtk_menu_shell_set_keyboard_mode (menu_shell, TRUE); +- _gtk_menu_shell_activate (menu_shell); +- gtk_menu_shell_select_first (menu_shell, FALSE); ++ if (ubuntu_gtk_menu_shell_activate_first (GTK_MENU_SHELL (menu_shell), FALSE)) ++ { ++ //g_print ("send activate to remote!\n"); ++ } ++ else ++ { ++ _gtk_menu_shell_activate (menu_shell); ++ gtk_menu_shell_select_first (menu_shell, FALSE); ++ } + + g_list_free (menubars); + +Index: gtk+2.0-2.23.90/gtk/gtkmenushell.h =================================================================== ---- gtk+2.0-2.21.6/gtk/gtkmenushell.h.orig 2010-11-15 15:13:10.000000000 +0300 -+++ gtk+2.0-2.21.6/gtk/gtkmenushell.h 2010-12-26 14:53:33.000000000 +0300 +--- gtk+2.0-2.23.90/gtk/gtkmenushell.h.orig 2010-11-15 15:13:10.000000000 +0300 ++++ gtk+2.0-2.23.90/gtk/gtkmenushell.h 2010-12-26 14:53:33.000000000 +0300 @@ -135,6 +135,7 @@ void _gtk_menu_shell_set_keyboard_mode (GtkMenuShell *menu_shell, gboolean keyboard_mode); @@ -237,10 +180,10 @@ Index: gtk+2.0-2.21.6/gtk/gtkmenushell.h G_END_DECLS -Index: gtk+2.0-2.21.6/gtk/gtkmenushell.c +Index: gtk+2.0-2.23.90/gtk/gtkmenushell.c =================================================================== ---- gtk+2.0-2.21.6.orig/gtk/gtkmenushell.c 2010-08-16 22:57:55.000000000 +0200 -+++ gtk+2.0-2.21.6/gtk/gtkmenushell.c 2010-08-24 17:45:11.000000000 +0200 +--- gtk+2.0-2.23.90.orig/gtk/gtkmenushell.c 2011-01-06 12:15:13.000000000 -0500 ++++ gtk+2.0-2.23.90/gtk/gtkmenushell.c 2011-01-21 09:23:58.638179868 -0500 @@ -37,6 +37,7 @@ #include "gtkmenubar.h" #include "gtkmenuitem.h" @@ -401,7 +344,7 @@ Index: gtk+2.0-2.21.6/gtk/gtkmenushell.c } static void -@@ -1815,5 +1883,25 @@ +@@ -1815,5 +1883,52 @@ } } @@ -425,12 +368,39 @@ Index: gtk+2.0-2.21.6/gtk/gtkmenushell.c + return FALSE; +} + ++gboolean ++ubuntu_gtk_menu_shell_activate_first (GtkMenuShell *menu_shell, ++ gboolean search_sensitive) ++{ ++ GtkWidget *to_select = NULL; ++ GList *tmp_list; ++ ++ tmp_list = menu_shell->children; ++ while (tmp_list) ++ { ++ GtkWidget *child = tmp_list->data; ++ ++ if ((!search_sensitive && gtk_widget_get_visible (child)) || ++ _gtk_menu_item_is_selectable (child)) ++ { ++ to_select = child; ++ if (!GTK_IS_TEAROFF_MENU_ITEM (child)) ++ break; ++ } ++ ++ tmp_list = tmp_list->next; ++ } ++ ++ return to_select && ++ ubuntu_gtk_menu_shell_activate_mnemonic(menu_shell, to_select); ++} ++ #define __GTK_MENU_SHELL_C__ #include "gtkaliasdef.c" -Index: gtk+2.0-2.21.6/gtk/tests/Makefile.am +Index: gtk+2.0-2.23.90/gtk/tests/Makefile.am =================================================================== ---- gtk+2.0-2.21.6.orig/gtk/tests/Makefile.am 2010-08-16 22:57:56.000000000 +0200 -+++ gtk+2.0-2.21.6/gtk/tests/Makefile.am 2010-08-24 17:45:04.000000000 +0200 +--- gtk+2.0-2.23.90.orig/gtk/tests/Makefile.am 2011-01-06 12:15:15.000000000 -0500 ++++ gtk+2.0-2.23.90/gtk/tests/Makefile.am 2011-01-21 09:23:58.638179868 -0500 @@ -45,6 +45,10 @@ recentmanager_SOURCES = recentmanager.c recentmanager_LDADD = $(progs_ldadd) @@ -442,10 +412,10 @@ Index: gtk+2.0-2.21.6/gtk/tests/Makefile.am TEST_PROGS += floating floating_SOURCES = floating.c floating_LDADD = $(progs_ldadd) -Index: gtk+2.0-2.21.6/gtk/tests/menuproxy.c +Index: gtk+2.0-2.23.90/gtk/tests/menuproxy.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk+2.0-2.21.6/gtk/tests/menuproxy.c 2010-08-24 17:45:04.000000000 +0200 ++++ gtk+2.0-2.23.90/gtk/tests/menuproxy.c 2011-01-21 09:23:58.648179671 -0500 @@ -0,0 +1,278 @@ +/* + * Copyright (C) 2009 Canonical, Ltd. @@ -725,10 +695,10 @@ Index: gtk+2.0-2.21.6/gtk/tests/menuproxy.c + + return g_test_run(); +} -Index: gtk+2.0-2.21.6/gtk/ubuntumenuproxy.c +Index: gtk+2.0-2.23.90/gtk/ubuntumenuproxy.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk+2.0-2.21.6/gtk/ubuntumenuproxy.c 2010-08-24 17:45:04.000000000 +0200 ++++ gtk+2.0-2.23.90/gtk/ubuntumenuproxy.c 2011-01-21 09:23:58.648179671 -0500 @@ -0,0 +1,249 @@ +/* + * Copyright (C) 2010 Canonical, Ltd. @@ -979,10 +949,10 @@ Index: gtk+2.0-2.21.6/gtk/ubuntumenuproxy.c + +#define __UBUNTU_MENU_PROXY_C__ +#include "gtkaliasdef.c" -Index: gtk+2.0-2.21.6/gtk/ubuntumenuproxy.h +Index: gtk+2.0-2.23.90/gtk/ubuntumenuproxy.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk+2.0-2.21.6/gtk/ubuntumenuproxy.h 2010-08-24 17:45:04.000000000 +0200 ++++ gtk+2.0-2.23.90/gtk/ubuntumenuproxy.h 2011-01-21 09:23:58.648179671 -0500 @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2010 Canonical, Ltd. @@ -1058,10 +1028,10 @@ Index: gtk+2.0-2.21.6/gtk/ubuntumenuproxy.h +G_END_DECLS + +#endif /* __UBUNTU_MENU_PROXY_H__ */ -Index: gtk+2.0-2.21.6/gtk/ubuntumenuproxymodule.c +Index: gtk+2.0-2.23.90/gtk/ubuntumenuproxymodule.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk+2.0-2.21.6/gtk/ubuntumenuproxymodule.c 2010-08-24 17:45:04.000000000 +0200 ++++ gtk+2.0-2.23.90/gtk/ubuntumenuproxymodule.c 2011-01-21 09:24:12.467904054 -0500 @@ -0,0 +1,212 @@ +/* + * Copyright (C) 2010 Canonical, Ltd. @@ -1275,10 +1245,10 @@ Index: gtk+2.0-2.21.6/gtk/ubuntumenuproxymodule.c + +#define __UBUNTU_MENU_PROXY_MODULE_C__ +#include "gtkaliasdef.c" -Index: gtk+2.0-2.21.6/gtk/ubuntumenuproxymodule.h +Index: gtk+2.0-2.23.90/gtk/ubuntumenuproxymodule.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk+2.0-2.21.6/gtk/ubuntumenuproxymodule.h 2010-08-24 17:45:04.000000000 +0200 ++++ gtk+2.0-2.23.90/gtk/ubuntumenuproxymodule.h 2011-01-21 09:23:58.648179671 -0500 @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2010 Canonical, Ltd. @@ -1349,10 +1319,10 @@ Index: gtk+2.0-2.21.6/gtk/ubuntumenuproxymodule.h +G_END_DECLS + +#endif /* __UBUNTU_MENU_PROXY_MODULE_H__ */ -Index: gtk+2.0-2.21.6/gtk/gtkwindow.c +Index: gtk+2.0-2.23.90/gtk/gtkwindow.c =================================================================== ---- gtk+2.0-2.21.6.orig/gtk/gtkwindow.c 2010-08-16 22:57:56.000000000 +0200 -+++ gtk+2.0-2.21.6/gtk/gtkwindow.c 2010-08-24 17:45:04.000000000 +0200 +--- gtk+2.0-2.23.90.orig/gtk/gtkwindow.c 2011-01-21 09:23:52.318364336 -0500 ++++ gtk+2.0-2.23.90/gtk/gtkwindow.c 2011-01-21 09:23:58.648179671 -0500 @@ -94,7 +94,8 @@ PROP_GRAVITY, PROP_TRANSIENT_FOR, @@ -1407,10 +1377,10 @@ Index: gtk+2.0-2.21.6/gtk/gtkwindow.c default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -Index: gtk+2.0-2.21.6/gtk/gtkmenuitem.c +Index: gtk+2.0-2.23.90/gtk/gtkmenuitem.c =================================================================== ---- gtk+2.0-2.21.6.orig/gtk/gtkmenuitem.c 2010-08-16 22:57:55.000000000 +0200 -+++ gtk+2.0-2.21.6/gtk/gtkmenuitem.c 2010-08-24 17:45:04.000000000 +0200 +--- gtk+2.0-2.23.90.orig/gtk/gtkmenuitem.c 2011-01-21 09:23:52.278365796 -0500 ++++ gtk+2.0-2.23.90/gtk/gtkmenuitem.c 2011-01-21 09:23:58.648179671 -0500 @@ -1395,7 +1395,17 @@ widget); } diff --git a/source/xlib/gtk+2/065_gir_set_packages.patch b/source/xlib/gtk+2/065_gir_set_packages.patch new file mode 100644 index 0000000..b30c74a --- /dev/null +++ b/source/xlib/gtk+2/065_gir_set_packages.patch @@ -0,0 +1,74 @@ +=== modified file 'gdk/Makefile.am' +--- old/gdk/Makefile.am 2011-01-21 19:24:12 +0000 ++++ new/gdk/Makefile.am 2011-01-21 19:28:52 +0000 +@@ -3,6 +3,7 @@ + -include $(INTROSPECTION_MAKEFILE) + INTROSPECTION_GIRS = + INTROSPECTION_SCANNER_ARGS = \ ++ --warn-all \ + --add-include-path=../gdk + INTROSPECTION_COMPILER_ARGS = \ + --includedir=$(srcdir) \ +@@ -197,10 +198,11 @@ + gdkenumtypes.h + + Gdk-2.0.gir: $(gdktargetlib) Makefile +-Gdk_2_0_gir_SCANNERFLAGS = --warn-all ++Gdk_2_0_gir_SCANNERFLAGS = --c-include="gdk/gdk.h" + Gdk_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0 + Gdk_2_0_gir_LIBS = $(gdktargetlib) + Gdk_2_0_gir_FILES = $(introspection_files) ++Gdk_2_0_gir_EXPORT_PACKAGES = gdk-2.0 + Gdk_2_0_gir_CFLAGS = $(INCLUDES) + INTROSPECTION_GIRS += Gdk-2.0.gir + +@@ -238,10 +240,12 @@ + x11/gdkx.h + + GdkX11-2.0.gir: $(gdktargetlib) Gdk-2.0.gir Makefile +-GdkX11_2_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk +-GdkX11_2_0_gir_INCLUDES = Gio-2.0 Gdk-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0 ++GdkX11_2_0_gir_SCANNERFLAGS = --identifier-prefix=Gdk --include-uninstalled=Gdk-2.0.gir ++GdkX11_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0 ++ + GdkX11_2_0_gir_LIBS = $(gdktargetlib) + GdkX11_2_0_gir_FILES = $(x11_introspection_files) ++GdkX11_2_0_gir_EXPORT_PACKAGES = gdk-x11-2.0 + GdkX11_2_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk + INTROSPECTION_GIRS += GdkX11-2.0.gir + + +=== modified file 'gtk/Makefile.am' +--- old/gtk/Makefile.am 2011-01-21 19:23:36 +0000 ++++ new/gtk/Makefile.am 2011-01-21 19:31:54 +0000 +@@ -3,6 +3,7 @@ + -include $(INTROSPECTION_MAKEFILE) + INTROSPECTION_GIRS = + INTROSPECTION_SCANNER_ARGS = \ ++ --warn-all \ + --add-include-path=../gdk + INTROSPECTION_COMPILER_ARGS = \ + --includedir=$(srcdir) \ +@@ -998,11 +999,11 @@ + gtktypebuiltins.c + + Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-2.0.gir Makefile +-Gtk_2_0_gir_SCANNERFLAGS = --warn-all --add-include-path=$(top_builddir)/gdk ++Gtk_2_0_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/gdk/Gdk-2.0.gir + if USE_X11 + Gtk_2_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11 + endif +-Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0 ++Gtk_2_0_gir_INCLUDES = Atk-1.0 + Gtk_2_0_gir_CFLAGS = \ + $(INCLUDES) \ + -UGDK_DISABLE_DEPRECATED \ +@@ -1010,6 +1011,7 @@ + -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API + Gtk_2_0_gir_LIBS = $(gtktargetlib) + Gtk_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) ++Gtk_2_0_gir_EXPORT_PACKAGES = gtk+-2.0 + INTROSPECTION_GIRS += Gtk-2.0.gir + + girdir = $(datadir)/gir-1.0 + diff --git a/source/xlib/gtk+2/072_indicator_menu_update.patch b/source/xlib/gtk+2/072_indicator_menu_update.patch new file mode 100644 index 0000000..4874692 --- /dev/null +++ b/source/xlib/gtk+2/072_indicator_menu_update.patch @@ -0,0 +1,110 @@ +## Description: Adding two signals that are needed for Application Indicator to +## keep up-to-date with changed GtkMenu(Item)s. +## Origin/Author: Cody Russell <brats...@gnome.org>, +## Sense Hofstede <se...@ubuntu.com> +## Bug: unknown and https://launchpad.net/bug/608219 +Index: gtk+-2.21.7/gtk/gtkcontainer.c +=================================================================== +--- gtk+-2.21.7.orig/gtk/gtkcontainer.c 2010-08-31 01:09:37.000000000 +1000 ++++ gtk+-2.21.7/gtk/gtkcontainer.c 2010-09-01 12:22:01.612617000 +1000 +@@ -48,6 +48,8 @@ + REMOVE, + CHECK_RESIZE, + SET_FOCUS_CHILD, ++ CHILD_ADDED, ++ CHILD_REMOVED, + LAST_SIGNAL + }; + +@@ -291,6 +293,24 @@ + _gtk_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GTK_TYPE_WIDGET); ++ container_signals[CHILD_ADDED] = ++ g_signal_new (I_("child-added"), ++ G_OBJECT_CLASS_TYPE (object_class), ++ G_SIGNAL_RUN_LAST, ++ 0, ++ NULL, NULL, ++ _gtk_marshal_VOID__OBJECT, ++ G_TYPE_NONE, 1, ++ GTK_TYPE_WIDGET); ++ container_signals[CHILD_REMOVED] = ++ g_signal_new (I_("child-removed"), ++ G_OBJECT_CLASS_TYPE (object_class), ++ G_SIGNAL_RUN_LAST, ++ 0, ++ NULL, NULL, ++ _gtk_marshal_VOID__OBJECT, ++ G_TYPE_NONE, 1, ++ GTK_TYPE_WIDGET); + } + + static void +Index: gtk+-2.21.7/gtk/gtkmenushell.c +=================================================================== +--- gtk+-2.21.7.orig/gtk/gtkmenushell.c 2010-09-01 12:21:11.762617001 +1000 ++++ gtk+-2.21.7/gtk/gtkmenushell.c 2010-09-01 12:22:01.612617000 +1000 +@@ -567,6 +567,8 @@ + GTK_WIDGET (menu_shell), + child, + position); ++ ++ g_signal_emit_by_name (menu_shell, "child-added", child); + } + + static void +Index: gtk+-2.21.7/gtk/gtkmenuitem.c +=================================================================== +--- gtk+-2.21.7.orig/gtk/gtkmenuitem.c 2010-09-01 12:21:09.562617001 +1000 ++++ gtk+-2.21.7/gtk/gtkmenuitem.c 2010-09-01 12:22:01.612617000 +1000 +@@ -52,6 +52,8 @@ + ACTIVATE_ITEM, + TOGGLE_SIZE_REQUEST, + TOGGLE_SIZE_ALLOCATE, ++ SUBMENU_ADDED, ++ SUBMENU_REMOVED, + LAST_SIGNAL + }; + +@@ -244,6 +246,25 @@ + G_TYPE_NONE, 1, + G_TYPE_INT); + ++ menu_item_signals[SUBMENU_ADDED] = ++ g_signal_new (I_("submenu-added"), ++ G_OBJECT_CLASS_TYPE (gobject_class), ++ G_SIGNAL_RUN_FIRST, ++ 0, ++ NULL, NULL, ++ _gtk_marshal_VOID__OBJECT, ++ G_TYPE_NONE, 1, ++ GTK_TYPE_WIDGET); ++ ++ menu_item_signals[SUBMENU_REMOVED] = ++ g_signal_new (I_("submenu-removed"), ++ G_OBJECT_CLASS_TYPE (gobject_class), ++ G_SIGNAL_RUN_FIRST, ++ 0, ++ NULL, NULL, ++ _gtk_marshal_VOID__VOID, ++ G_TYPE_NONE, 0); ++ + /** + * GtkMenuItem:right-justified: + * +@@ -791,6 +812,14 @@ + if (GTK_WIDGET (menu_item)->parent) + gtk_widget_queue_resize (GTK_WIDGET (menu_item)); + ++ if(submenu == NULL) ++ { ++ g_signal_emit_by_name (menu_item, "submenu-removed"); ++ } ++ else ++ { ++ g_signal_emit_by_name (menu_item, "submenu-added", GTK_WIDGET(submenu)); ++ } + g_object_notify (G_OBJECT (menu_item), "submenu"); + } + } diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild index 9e39074..a12dc8e 100644 --- a/source/xlib/gtk+2/FrugalBuild +++ b/source/xlib/gtk+2/FrugalBuild @@ -4,9 +4,9 @@ pkgname=gtk+2 _F_gnome_name=gtk+ pkgver=2.24.0 -pkgrel=2 +pkgrel=3 pkgdesc="The GTK+ Toolkit (2.x series)" -depends=('libxext' 'libxfixes' 'cairo>=1.8.10-2' 'libgcc' 'libjpeg>=8a' 'libtiff' 'libcups>=1.3.11-4' 'gdk-pixbuf2') +depends=('libxext' 'libxfixes' 'cairo>=1.8.10-2' 'libgcc' 'libjpeg>=8a' 'libtiff' 'libcups>=1.3.11-4' 'gdk-pixbuf2>=2.23.0-5') rodepends=('gnome-icon-theme' 'shared-mime-info') groups=('xlib') makedepends=('gtk-doc' 'cups' 'inputproto' 'gobject-introspection' 'gnome-common') @@ -15,14 +15,20 @@ Finclude gnome up2date=$pkgver url="http://www.gtk.org/" _F_cd_path="gtk+-$pkgver" -source=($source 012_ubuntu-set-grab-add.patch \ - gtk2-gir_package.patch \ - 043_ubuntu_menu_proxy.patch \ - 091_bugzilla_tooltip_refresh.patch) +source=($source \ + xid-collision-debug.patch old-icon-symlinks.patch + 012_ubuntu-set-grab-add.patch \ + 043_ubuntu_menu_proxy.patch \ + 065_gir_set_packages.patch \ + 072_indicator_menu_update.patch \ + 091_bugzilla_tooltip_refresh.patch) sha1sums=('17c52460854b3b17410204d5eefe8d783e894add' \ + '75c461740e18696a792739cd1f9a20327dbb23bb' \ + 'a320f04468900b94d7f336368228dfdefc240c6e' \ 'b4a6b53cd07a63f0df59fe80be597910e8db90c5' \ - '7a437bc8ec0dddb5fe0f2398428e89e7520a5878' \ - '952a34623e2ca177dae56b5ca5d16ed643420c13' \ + '907f88cf3ec8c102699f58d714c10fe14f63b3b1' \ + 'b48134a8c2a81e24539904e7ddf780ced75d4d93' \ + '7a6606c8cf3cecba86c5f264208eb9c7cc405072' \ 'd8d23cead06029d8f3bfe59b63a629bb38c3d3c6') subpkgs=("${subpkgs[@]}" "$pkgname-libs") diff --git a/source/xlib/gtk+2/gtk2-gir_package.patch b/source/xlib/gtk+2/gtk2-gir_package.patch deleted file mode 100644 index b050192..0000000 --- a/source/xlib/gtk+2/gtk2-gir_package.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur gtk+-2.24.0//gdk/Makefile.am gtk+-2.24.0.patched//gdk/Makefile.am ---- gtk+-2.24.0//gdk/Makefile.am 2011-01-05 16:51:20.000000000 +0100 -+++ gtk+-2.24.0.patched//gdk/Makefile.am 2011-02-03 23:18:41.000000000 +0100 -@@ -201,6 +201,7 @@ - Gdk_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0 - Gdk_2_0_gir_LIBS = $(gdktargetlib) - Gdk_2_0_gir_FILES = $(introspection_files) -+Gdk_2_0_gir_PACKAGES = gdk-2.0 - Gdk_2_0_gir_CFLAGS = $(INCLUDES) - INTROSPECTION_GIRS += Gdk-2.0.gir - -diff -Naur gtk+-2.24.0//gtk/Makefile.am gtk+-2.24.0.patched//gtk/Makefile.am ---- gtk+-2.24.0//gtk/Makefile.am 2011-01-07 05:41:26.000000000 +0100 -+++ gtk+-2.24.0.patched//gtk/Makefile.am 2011-02-03 23:19:11.000000000 +0100 -@@ -1004,6 +1004,7 @@ - -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API - Gtk_2_0_gir_LIBS = $(gtktargetlib) - Gtk_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) -+Gtk_2_0_gir_PACKAGES = gtk+-2.0 - INTROSPECTION_GIRS += Gtk-2.0.gir - - girdir = $(datadir)/gir-1.0 diff --git a/source/xlib/gtk+2/old-icon-symlinks.patch b/source/xlib/gtk+2/old-icon-symlinks.patch new file mode 100644 index 0000000..046dd4d --- /dev/null +++ b/source/xlib/gtk+2/old-icon-symlinks.patch @@ -0,0 +1,269 @@ +diff -aur gtk+-2.22.0.orig//gtk/Makefile.in gtk+-2.22.0/gtk/Makefile.in +--- gtk+-2.22.0.orig//gtk/Makefile.in 2010-10-15 04:57:50.810006145 +0800 ++++ gtk+-2.22.0/gtk/Makefile.in 2010-10-15 05:13:49.083339478 +0800 +@@ -1598,7 +1598,172 @@ + stock-icons/24/folder-remote.png \ + stock-icons/24/user-home.png \ + stock-icons/24/user-desktop.png \ +- stock-icons/24/text-x-generic.png ++ stock-icons/24/text-x-generic.png \ ++ stock-icons/16/gtk-quit.png \ ++ stock-icons/16/gtk-info.png \ ++ stock-icons/16/gtk-file.png \ ++ stock-icons/16/gtk-open.png \ ++ stock-icons/16/gtk-print-preview.png \ ++ stock-icons/16/gtk-print.png \ ++ stock-icons/16/gtk-properties.png \ ++ stock-icons/16/gtk-revert-to-saved-ltr.png \ ++ stock-icons/16/gtk-revert-to-saved-rtl.png \ ++ stock-icons/16/gtk-save-as.png \ ++ stock-icons/16/gtk-new.png \ ++ stock-icons/16/gtk-harddisk.png \ ++ stock-icons/16/gtk-clear.png \ ++ stock-icons/16/gtk-copy.png \ ++ stock-icons/16/gtk-cut.png \ ++ stock-icons/16/gtk-delete.png \ ++ stock-icons/16/gtk-find-and-replace.png \ ++ stock-icons/16/gtk-find.png \ ++ stock-icons/16/gtk-paste.png \ ++ stock-icons/16/gtk-redo-ltr.png \ ++ stock-icons/16/gtk-redo-rtl.png \ ++ stock-icons/16/gtk-select-all.png \ ++ stock-icons/16/gtk-undo-ltr.png \ ++ stock-icons/16/gtk-undo-rtl.png \ ++ stock-icons/16/gtk-directory.png \ ++ stock-icons/16/gtk-unindent-ltr.png \ ++ stock-icons/16/gtk-unindent-rtl.png \ ++ stock-icons/16/gtk-indent-ltr.png \ ++ stock-icons/16/gtk-indent-rtl.png \ ++ stock-icons/16/gtk-justify-center.png \ ++ stock-icons/16/gtk-justify-fill.png \ ++ stock-icons/16/gtk-justify-left.png \ ++ stock-icons/16/gtk-justify-right.png \ ++ stock-icons/16/gtk-bold.png \ ++ stock-icons/16/gtk-italic.png \ ++ stock-icons/16/gtk-strikethrough.png \ ++ stock-icons/16/gtk-underline.png \ ++ stock-icons/16/gtk-goto-bottom.png \ ++ stock-icons/16/gtk-go-down.png \ ++ stock-icons/16/gtk-goto-first-ltr.png \ ++ stock-icons/16/gtk-home.png \ ++ stock-icons/16/gtk-jump-to-ltr.png \ ++ stock-icons/16/gtk-jump-to-rtl.png \ ++ stock-icons/16/gtk-goto-last-ltr.png \ ++ stock-icons/16/gtk-go-forward-ltr.png \ ++ stock-icons/16/gtk-go-back-ltr.png \ ++ stock-icons/16/gtk-goto-top.png \ ++ stock-icons/16/gtk-go-up.png \ ++ stock-icons/16/gtk-about.png \ ++ stock-icons/16/gtk-help.png \ ++ stock-icons/16/gtk-missing-image.png \ ++ stock-icons/16/gtk-add.png \ ++ stock-icons/16/gtk-remove.png \ ++ stock-icons/16/gtk-floppy.png \ ++ stock-icons/16/gtk-cdrom.png \ ++ stock-icons/16/gtk-media-pause.png \ ++ stock-icons/16/gtk-media-play-ltr.png \ ++ stock-icons/16/gtk-media-play-rtl.png \ ++ stock-icons/16/gtk-media-stop.png \ ++ stock-icons/16/gtk-media-record.png \ ++ stock-icons/16/gtk-media-rewind-ltr.png \ ++ stock-icons/16/gtk-media-forward-ltr.png \ ++ stock-icons/16/gtk-media-previous-ltr.png \ ++ stock-icons/16/gtk-media-next-ltr.png \ ++ stock-icons/16/gtk-network.png \ ++ stock-icons/16/gtk-print-error.png \ ++ stock-icons/16/gtk-print-report.png \ ++ stock-icons/16/gtk-print-paused.png \ ++ stock-icons/16/gtk-print-warning.png \ ++ stock-icons/16/gtk-stop.png \ ++ stock-icons/16/gtk-execute.png \ ++ stock-icons/16/gtk-spell-check.png \ ++ stock-icons/16/gtk-fullscreen.png \ ++ stock-icons/16/gtk-refresh.png \ ++ stock-icons/16/gtk-leave-fullscreen.png \ ++ stock-icons/16/gtk-sort-ascending.png \ ++ stock-icons/16/gtk-sort-descending.png \ ++ stock-icons/16/gtk-close.png \ ++ stock-icons/16/gtk-zoom-fit.png \ ++ stock-icons/16/gtk-zoom-in.png \ ++ stock-icons/16/gtk-zoom-100.png \ ++ stock-icons/16/gtk-zoom-out.png \ ++ stock-icons/24/gtk-quit.png \ ++ stock-icons/24/gtk-info.png \ ++ stock-icons/24/gtk-file.png \ ++ stock-icons/24/gtk-open.png \ ++ stock-icons/24/gtk-print-preview.png \ ++ stock-icons/24/gtk-print.png \ ++ stock-icons/24/gtk-properties.png \ ++ stock-icons/24/gtk-revert-to-saved-ltr.png \ ++ stock-icons/24/gtk-revert-to-saved-rtl.png \ ++ stock-icons/24/gtk-save-as.png \ ++ stock-icons/24/gtk-new.png \ ++ stock-icons/24/gtk-harddisk.png \ ++ stock-icons/24/gtk-clear.png \ ++ stock-icons/24/gtk-copy.png \ ++ stock-icons/24/gtk-cut.png \ ++ stock-icons/24/gtk-delete.png \ ++ stock-icons/24/gtk-find-and-replace.png \ ++ stock-icons/24/gtk-find.png \ ++ stock-icons/24/gtk-paste.png \ ++ stock-icons/24/gtk-redo-ltr.png \ ++ stock-icons/24/gtk-redo-rtl.png \ ++ stock-icons/24/gtk-select-all.png \ ++ stock-icons/24/gtk-undo-ltr.png \ ++ stock-icons/24/gtk-undo-rtl.png \ ++ stock-icons/24/gtk-directory.png \ ++ stock-icons/24/gtk-unindent-ltr.png \ ++ stock-icons/24/gtk-unindent-rtl.png \ ++ stock-icons/24/gtk-indent-ltr.png \ ++ stock-icons/24/gtk-indent-rtl.png \ ++ stock-icons/24/gtk-justify-center.png \ ++ stock-icons/24/gtk-justify-fill.png \ ++ stock-icons/24/gtk-justify-left.png \ ++ stock-icons/24/gtk-justify-right.png \ ++ stock-icons/24/gtk-bold.png \ ++ stock-icons/24/gtk-italic.png \ ++ stock-icons/24/gtk-strikethrough.png \ ++ stock-icons/24/gtk-underline.png \ ++ stock-icons/24/gtk-goto-bottom.png \ ++ stock-icons/24/gtk-go-down.png \ ++ stock-icons/24/gtk-goto-first-ltr.png \ ++ stock-icons/24/gtk-home.png \ ++ stock-icons/24/gtk-jump-to-ltr.png \ ++ stock-icons/24/gtk-jump-to-rtl.png \ ++ stock-icons/24/gtk-goto-last-ltr.png \ ++ stock-icons/24/gtk-go-forward-ltr.png \ ++ stock-icons/24/gtk-go-back-ltr.png \ ++ stock-icons/24/gtk-goto-top.png \ ++ stock-icons/24/gtk-go-up.png \ ++ stock-icons/24/gtk-about.png \ ++ stock-icons/24/gtk-help.png \ ++ stock-icons/24/gtk-missing-image.png \ ++ stock-icons/24/gtk-add.png \ ++ stock-icons/24/gtk-remove.png \ ++ stock-icons/24/gtk-floppy.png \ ++ stock-icons/24/gtk-cdrom.png \ ++ stock-icons/24/gtk-media-pause.png \ ++ stock-icons/24/gtk-media-play-ltr.png \ ++ stock-icons/24/gtk-media-play-rtl.png \ ++ stock-icons/24/gtk-media-stop.png \ ++ stock-icons/24/gtk-media-record.png \ ++ stock-icons/24/gtk-media-rewind-ltr.png \ ++ stock-icons/24/gtk-media-forward-ltr.png \ ++ stock-icons/24/gtk-media-previous-ltr.png \ ++ stock-icons/24/gtk-media-next-ltr.png \ ++ stock-icons/24/gtk-network.png \ ++ stock-icons/24/gtk-print-error.png \ ++ stock-icons/24/gtk-print-report.png \ ++ stock-icons/24/gtk-print-paused.png \ ++ stock-icons/24/gtk-print-warning.png \ ++ stock-icons/24/gtk-stop.png \ ++ stock-icons/24/gtk-execute.png \ ++ stock-icons/24/gtk-spell-check.png \ ++ stock-icons/24/gtk-fullscreen.png \ ++ stock-icons/24/gtk-refresh.png \ ++ stock-icons/24/gtk-leave-fullscreen.png \ ++ stock-icons/24/gtk-sort-ascending.png \ ++ stock-icons/24/gtk-sort-descending.png \ ++ stock-icons/24/gtk-close.png \ ++ stock-icons/24/gtk-zoom-fit.png \ ++ stock-icons/24/gtk-zoom-in.png \ ++ stock-icons/24/gtk-zoom-100.png \ ++ stock-icons/24/gtk-zoom-out.png \ ++ stock-icons/48/gtk-dialog-error.png + + @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ + @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache +@@ -2869,7 +3034,91 @@ + && $(LN_S) folder.png user-desktop.png \ + && $(RM) text-x-generic.png \ + && $(LN_S) document-x-generic.png text-x-generic.png \ ++ && $(LN_S) application-exit.png gtk-quit.png \ ++ && $(LN_S) dialog-information.png gtk-info.png \ ++ && $(LN_S) document-new.png gtk-file.png \ ++ && $(LN_S) document-open.png gtk-open.png \ ++ && $(LN_S) document-print-preview.png gtk-print-preview.png \ ++ && $(LN_S) document-print.png gtk-print.png \ ++ && $(LN_S) document-properties.png gtk-properties.png \ ++ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \ ++ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \ ++ && $(LN_S) document-save-as.png gtk-save-as.png \ ++ && $(LN_S) document-x-generic.png gtk-new.png \ ++ && $(LN_S) drive-harddisk.png gtk-harddisk.png \ ++ && $(LN_S) edit-clear.png gtk-clear.png \ ++ && $(LN_S) edit-copy.png gtk-copy.png \ ++ && $(LN_S) edit-cut.png gtk-cut.png \ ++ && $(LN_S) edit-delete.png gtk-delete.png \ ++ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \ ++ && $(LN_S) edit-find.png gtk-find.png \ ++ && $(LN_S) edit-paste.png gtk-paste.png \ ++ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \ ++ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \ ++ && $(LN_S) edit-select-all.png gtk-select-all.png \ ++ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \ ++ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \ ++ && $(LN_S) folder.png gtk-directory.png \ ++ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \ ++ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \ ++ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \ ++ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \ ++ && $(LN_S) format-justify-center.png gtk-justify-center.png \ ++ && $(LN_S) format-justify-fill.png gtk-justify-fill.png \ ++ && $(LN_S) format-justify-left.png gtk-justify-left.png \ ++ && $(LN_S) format-justify-right.png gtk-justify-right.png \ ++ && $(LN_S) format-text-bold.png gtk-bold.png \ ++ && $(LN_S) format-text-italic.png gtk-italic.png \ ++ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \ ++ && $(LN_S) format-text-underline.png gtk-underline.png \ ++ && $(LN_S) go-bottom.png gtk-goto-bottom.png \ ++ && $(LN_S) go-down.png gtk-go-down.png \ ++ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \ ++ && $(LN_S) go-home.png gtk-home.png \ ++ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \ ++ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \ ++ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \ ++ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \ ++ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \ ++ && $(LN_S) go-top.png gtk-goto-top.png \ ++ && $(LN_S) go-up.png gtk-go-up.png \ ++ && $(LN_S) help-about.png gtk-about.png \ ++ && $(LN_S) help-contents.png gtk-help.png \ ++ && $(LN_S) image-missing.png gtk-missing-image.png \ ++ && $(LN_S) list-add.png gtk-add.png \ ++ && $(LN_S) list-remove.png gtk-remove.png \ ++ && $(LN_S) media-floppy.png gtk-floppy.png \ ++ && $(LN_S) media-optical.png gtk-cdrom.png \ ++ && $(LN_S) media-playback-pause.png gtk-media-pause.png \ ++ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \ ++ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \ ++ && $(LN_S) media-playback-stop.png gtk-media-stop.png \ ++ && $(LN_S) media-record.png gtk-media-record.png \ ++ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \ ++ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \ ++ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \ ++ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \ ++ && $(LN_S) network-idle.png gtk-network.png \ ++ && $(LN_S) printer-error.png gtk-print-error.png \ ++ && $(LN_S) printer-info.png gtk-print-report.png \ ++ && $(LN_S) printer-paused.png gtk-print-paused.png \ ++ && $(LN_S) printer-warning.png gtk-print-warning.png \ ++ && $(LN_S) process-stop.png gtk-stop.png \ ++ && $(LN_S) system-run.png gtk-execute.png \ ++ && $(LN_S) tools-check-spelling.png gtk-spell-check.png \ ++ && $(LN_S) view-fullscreen.png gtk-fullscreen.png \ ++ && $(LN_S) view-refresh.png gtk-refresh.png \ ++ && $(LN_S) view-restore.png gtk-leave-fullscreen.png \ ++ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \ ++ && $(LN_S) view-sort-descending.png gtk-sort-descending.png \ ++ && $(LN_S) window-close.png gtk-close.png \ ++ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \ ++ && $(LN_S) zoom-in.png gtk-zoom-in.png \ ++ && $(LN_S) zoom-original.png gtk-zoom-100.png \ ++ && $(LN_S) zoom-out.png gtk-zoom-out.png \ + ) done \ ++ && (cd stock-icons/48 \ ++ && $(LN_S) dialog-error.png gtk-dialog-error.png) \ + && touch stamp-icons + + gtkbuiltincache.h: @REBUILD@ stamp-icons diff --git a/source/xlib/gtk+2/xid-collision-debug.patch b/source/xlib/gtk+2/xid-collision-debug.patch new file mode 100644 index 0000000..d61238c --- /dev/null +++ b/source/xlib/gtk+2/xid-collision-debug.patch @@ -0,0 +1,15 @@ +--- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200 ++++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200 +@@ -56,10 +56,10 @@ + if (!display_x11->xid_ht) + display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, + (GEqualFunc) gdk_xid_equal); +- ++/* + if (g_hash_table_lookup (display_x11->xid_ht, xid)) + g_warning ("XID collision, trouble ahead"); +- ++*/ + g_hash_table_insert (display_x11->xid_ht, xid, data); + } + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git