[arch-commits] CVS update of extra/lib/gtk2 (9 files)
Jan de Groot
jgc at archlinux.org
Wed Oct 17 17:51:38 UTC 2007
Date: Wednesday, October 17, 2007 @ 13:51:38
Author: jgc
Path: /home/cvs-extra/extra/lib/gtk2
Modified: PKGBUILD (1.101 -> 1.102)
Removed: double-free.patch (1.1) gdkscreen-check.patch (1.1)
gtkiconcache-disable-debug.patch (1.1)
gtksearchenginetracker-update-modulename.patch (1.1)
gtkselection-dontcrash-on-null.patch (1.1)
scale-button-grab.patch (1.1) simple-search-crash.patch (1.1)
swt-tooltips.patch (1.1)
upgpkg: gtk2 2.12.1-1
Remove old patches, update to 2.12.1
------------------------------------------------+
PKGBUILD | 33 +--------
double-free.patch | 11 ---
gdkscreen-check.patch | 11 ---
gtkiconcache-disable-debug.patch | 27 -------
gtksearchenginetracker-update-modulename.patch | 21 -----
gtkselection-dontcrash-on-null.patch | 43 -----------
scale-button-grab.patch | 42 -----------
simple-search-crash.patch | 84 -----------------------
swt-tooltips.patch | 13 ---
9 files changed, 7 insertions(+), 278 deletions(-)
Index: extra/lib/gtk2/PKGBUILD
diff -u extra/lib/gtk2/PKGBUILD:1.101 extra/lib/gtk2/PKGBUILD:1.102
--- extra/lib/gtk2/PKGBUILD:1.101 Sat Oct 13 13:55:06 2007
+++ extra/lib/gtk2/PKGBUILD Wed Oct 17 13:51:37 2007
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD,v 1.101 2007/10/13 17:55:06 jgc Exp $
+# $Id: PKGBUILD,v 1.102 2007/10/17 17:51:37 jgc Exp $
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gtk2
-pkgver=2.12.0
-pkgrel=2
+pkgver=2.12.1
+pkgrel=1
pkgdesc="The GTK+ Toolkit (v2)"
arch=(i686 x86_64)
url="http://www.gtk.org/"
install=gtk2.install
-depends=('atk>=1.20.0' 'pango>=1.18.2' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups' 'libxcomposite' 'libxdamage')
+depends=('atk>=1.20.0' 'pango>=1.18.3' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.3' 'libxcomposite' 'libxdamage')
makedepends=('pkgconfig')
replaces=('gtkprint-cups')
conflicts=('gtkprint-cups')
@@ -17,34 +17,15 @@
license=('LGPL')
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.12/gtk+-${pkgver}.tar.bz2
gtkclipboard-check.patch
- gtkiconcache-disable-debug.patch
- gtksearchenginetracker-update-modulename.patch
- gtkselection-dontcrash-on-null.patch
- swt-tooltips.patch
- simple-search-crash.patch
- scale-button-grab.patch
- double-free.patch
071_fix_gdk_window_null_crasher.patch)
-md5sums=('e9c280afec29b11772af5a7c807abf41'
+md5sums=('c46f34addc2fe3ea6756055d59fb8856'
'4025d3c15d6c6f73a032f403ffd4ff1c'
- 'ae9397c9adc43f902e4491c8276504cf'
- '823450839e4e0cc714b65c0be5b5d8d5'
- '2d821b18b973a281849cd775bb926457')
+ '7ee249f879a20384d53c6ff4e091e102')
build() {
cd ${startdir}/src/gtk+-${pkgver}
# Workaround patch for flash
patch -Np1 -i ${startdir}/src/gtkclipboard-check.patch || return 1
-
- #Upstream SVN patches
- patch -Np1 -i ${startdir}/src/gtkiconcache-disable-debug.patch || return 1
- patch -Np1 -i ${startdir}/src/gtksearchenginetracker-update-modulename.patch || return 1
- patch -Np1 -i ${startdir}/src/gtkselection-dontcrash-on-null.patch || return 1
-
- patch -Np1 -i ${startdir}/src/swt-tooltips.patch || return 1
- patch -Np0 -i ${startdir}/src/simple-search-crash.patch || return 1
- patch -Np0 -i ${startdir}/src/scale-button-grab.patch || return 1
- patch -Np1 -i ${startdir}/src/double-free.patch || return 1
#Patch from Ubuntu
patch -Np1 -i ${startdir}/src/071_fix_gdk_window_null_crasher.patch || return 1
@@ -55,5 +36,5 @@
make || return 1
make DESTDIR=${startdir}/pkg install
- echo 'gtk-fallback-icon-theme = "gnome"' > ${startdir}/pkg/etc/gtk-2.0/gtkrc
+ echo 'gtk-fallback-icon-theme = "hicolor"' > ${startdir}/pkg/etc/gtk-2.0/gtkrc
}
Index: extra/lib/gtk2/double-free.patch
diff -u extra/lib/gtk2/double-free.patch:1.1 extra/lib/gtk2/double-free.patch:removed
--- extra/lib/gtk2/double-free.patch:1.1 Sat Oct 13 13:55:06 2007
+++ extra/lib/gtk2/double-free.patch Wed Oct 17 13:51:38 2007
@@ -1,11 +0,0 @@
-diff -up gtk+-2.12.0/gtk/updateiconcache.c.double-free gtk+-2.12.0/gtk/updateiconcache.c
---- gtk+-2.12.0/gtk/updateiconcache.c.double-free 2007-10-11 15:33:11.000000000 -0400
-+++ gtk+-2.12.0/gtk/updateiconcache.c 2007-10-11 15:33:38.000000000 -0400
-@@ -219,7 +219,6 @@ foreach_remove_func (gpointer key, gpoin
- {
- /* just a .icon file, throw away */
- g_free (key);
-- free_icon_data (image->icon_data);
- g_free (image);
-
- return TRUE;
Index: extra/lib/gtk2/gdkscreen-check.patch
diff -u extra/lib/gtk2/gdkscreen-check.patch:1.1 extra/lib/gtk2/gdkscreen-check.patch:removed
--- extra/lib/gtk2/gdkscreen-check.patch:1.1 Sun Aug 19 06:43:11 2007
+++ extra/lib/gtk2/gdkscreen-check.patch Wed Oct 17 13:51:38 2007
@@ -1,11 +0,0 @@
---- gtk+-2.11.6/gdk/gdkscreen.c.orig 2007-08-19 12:26:37.000000000 +0200
-+++ gtk+-2.11.6/gdk/gdkscreen.c 2007-08-19 12:27:08.000000000 +0200
-@@ -417,6 +417,8 @@
- const cairo_font_options_t *
- gdk_screen_get_font_options (GdkScreen *screen)
- {
-+ if (screen == NULL)
-+ return NULL;
- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
- return screen->font_options;
Index: extra/lib/gtk2/gtkiconcache-disable-debug.patch
diff -u extra/lib/gtk2/gtkiconcache-disable-debug.patch:1.1 extra/lib/gtk2/gtkiconcache-disable-debug.patch:removed
--- extra/lib/gtk2/gtkiconcache-disable-debug.patch:1.1 Thu Sep 20 13:06:57 2007
+++ extra/lib/gtk2/gtkiconcache-disable-debug.patch Wed Oct 17 13:51:38 2007
@@ -1,27 +0,0 @@
---- trunk/gtk/gtkiconcache.c 2007/05/23 15:06:03 17898
-+++ 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);
Index: extra/lib/gtk2/gtksearchenginetracker-update-modulename.patch
diff -u extra/lib/gtk2/gtksearchenginetracker-update-modulename.patch:1.1 extra/lib/gtk2/gtksearchenginetracker-update-modulename.patch:removed
--- extra/lib/gtk2/gtksearchenginetracker-update-modulename.patch:1.1 Thu Sep 20 13:06:57 2007
+++ extra/lib/gtk2/gtksearchenginetracker-update-modulename.patch Wed Oct 17 13:51:38 2007
@@ -1,21 +0,0 @@
---- trunk/gtk/gtksearchenginetracker.c 2007/06/22 14:32:22 18219
-+++ trunk/gtk/gtksearchenginetracker.c 2007/09/18 21:48:01 18846
-@@ -71,10 +71,16 @@
- {
- int i;
- GModule *tracker;
-+ GModuleFlags flags;
-
- done = TRUE;
--
-- tracker = g_module_open ("libtracker.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
-+ flags = G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL;
-+
-+ tracker = g_module_open ("libtrackerclient.so.0", flags);
-+
-+ if (!tracker)
-+ tracker = g_module_open ("libtracker.so.0", flags);
-+
- if (!tracker)
- return;
-
Index: extra/lib/gtk2/gtkselection-dontcrash-on-null.patch
diff -u extra/lib/gtk2/gtkselection-dontcrash-on-null.patch:1.1 extra/lib/gtk2/gtkselection-dontcrash-on-null.patch:removed
--- extra/lib/gtk2/gtkselection-dontcrash-on-null.patch:1.1 Thu Sep 20 13:06:57 2007
+++ extra/lib/gtk2/gtkselection-dontcrash-on-null.patch Wed Oct 17 13:51:38 2007
@@ -1,43 +0,0 @@
---- trunk/gtk/gtkselection.c 2007/07/09 20:24:26 18423
-+++ trunk/gtk/gtkselection.c 2007/09/17 19:53:54 18842
-@@ -530,10 +530,11 @@
- * gtk_target_list_find:
- * @list: a #GtkTargetList
- * @target: an interned atom representing the target to search for
-- * @info: a pointer to the location to store application info for target
-- *
-+ * @info: a pointer to the location to store application info for target,
-+ * or %NULL
-+ *
- * Looks up a given target in a #GtkTargetList.
-- *
-+ *
- * Return value: %TRUE if the target was found, otherwise %FALSE
- **/
- gboolean
-@@ -541,16 +542,23 @@
- GdkAtom target,
- guint *info)
- {
-- GList *tmp_list = list->list;
-+ GList *tmp_list;
-+
-+ g_return_val_if_fail (list != NULL, FALSE);
-+
-+ tmp_list = list->list;
- while (tmp_list)
- {
- GtkTargetPair *pair = tmp_list->data;
-
- if (pair->target == target)
- {
-- *info = pair->info;
-+ if (info)
-+ *info = pair->info;
-+
- return TRUE;
- }
-+
- tmp_list = tmp_list->next;
- }
-
Index: extra/lib/gtk2/scale-button-grab.patch
diff -u extra/lib/gtk2/scale-button-grab.patch:1.1 extra/lib/gtk2/scale-button-grab.patch:removed
--- extra/lib/gtk2/scale-button-grab.patch:1.1 Sat Oct 13 13:55:06 2007
+++ extra/lib/gtk2/scale-button-grab.patch Wed Oct 17 13:51:38 2007
@@ -1,42 +0,0 @@
-Index: gtk/gtkscalebutton.c
-===================================================================
---- gtk/gtkscalebutton.c (revision 18880)
-+++ gtk/gtkscalebutton.c (revision 18881)
-@@ -877,6 +877,9 @@
-
- priv = button->priv;
-
-+ if (!GTK_WIDGET_HAS_GRAB (priv->dock))
-+ return;
-+
- if (gtk_widget_is_ancestor (gtk_grab_get_current (), priv->dock))
- return;
-
-Index: tests/testvolumebutton.c
-===================================================================
---- tests/testvolumebutton.c (revision 18880)
-+++ tests/testvolumebutton.c (revision 18881)
-@@ -60,15 +60,22 @@
- {
- GtkWidget *window;
- GtkWidget *button;
-+ GtkWidget *button2;
-+ GtkWidget *box;
-
- gtk_init (&argc, &argv);
-
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- button = gtk_volume_button_new ();
-+ button2 = gtk_volume_button_new ();
-+ box = gtk_hbox_new (FALSE, 0);
-+
- g_signal_connect (G_OBJECT (button),
- "value-changed",
- G_CALLBACK (value_changed), NULL);
-- gtk_container_add (GTK_CONTAINER (window), button);
-+ gtk_container_add (GTK_CONTAINER (window), box);
-+ gtk_container_add (GTK_CONTAINER (box), button);
-+ gtk_container_add (GTK_CONTAINER (box), button2);
-
- gtk_widget_show_all (window);
- gtk_button_clicked (GTK_BUTTON (button));
Index: extra/lib/gtk2/simple-search-crash.patch
diff -u extra/lib/gtk2/simple-search-crash.patch:1.1 extra/lib/gtk2/simple-search-crash.patch:removed
--- extra/lib/gtk2/simple-search-crash.patch:1.1 Sat Oct 13 13:55:06 2007
+++ extra/lib/gtk2/simple-search-crash.patch Wed Oct 17 13:51:38 2007
@@ -1,84 +0,0 @@
-Index: gtk/gtksearchenginesimple.c
-===================================================================
---- gtk/gtksearchenginesimple.c (revision 18864)
-+++ gtk/gtksearchenginesimple.c (working copy)
-@@ -72,19 +72,27 @@ struct _GtkSearchEngineSimplePrivate
- G_DEFINE_TYPE (GtkSearchEngineSimple, _gtk_search_engine_simple, GTK_TYPE_SEARCH_ENGINE);
-
- static void
--finalize (GObject *object)
-+gtk_search_engine_simple_dispose (GObject *object)
- {
- GtkSearchEngineSimple *simple;
-+ GtkSearchEngineSimplePrivate *priv;
-
- simple = GTK_SEARCH_ENGINE_SIMPLE (object);
-+ priv = simple->priv;
-
-- if (simple->priv->query)
-+ if (priv->query)
-+ {
-+ g_object_unref (priv->query);
-+ priv->query = NULL;
-+ }
-+
-+ if (priv->active_search)
- {
-- g_object_unref (simple->priv->query);
-- simple->priv->query = NULL;
-+ priv->active_search->cancelled = TRUE;
-+ priv->active_search = NULL;
- }
-
-- G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->finalize (object);
-+ G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->dispose (object);
- }
-
- static SearchThreadData *
-@@ -131,12 +139,10 @@ search_thread_done_idle (gpointer user_d
-
- data = user_data;
-
-- if (!data->cancelled)
-- {
-- _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
-- data->engine->priv->active_search = NULL;
-- }
--
-+ if (!data->cancelled)
-+ _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
-+
-+ data->engine->priv->active_search = NULL;
- search_thread_data_free (data);
-
- return FALSE;
-@@ -181,6 +187,7 @@ send_batch (SearchThreadData *data)
- hits = g_new (SearchHits, 1);
- hits->uris = data->uri_hits;
- hits->thread_data = data;
-+
- gdk_threads_add_idle (search_thread_add_hits_idle, hits);
- }
- data->uri_hits = NULL;
-@@ -349,7 +356,7 @@ _gtk_search_engine_simple_class_init (Gt
- GtkSearchEngineClass *engine_class;
-
- gobject_class = G_OBJECT_CLASS (class);
-- gobject_class->finalize = finalize;
-+ gobject_class->dispose = gtk_search_engine_simple_dispose;
-
- engine_class = GTK_SEARCH_ENGINE_CLASS (class);
- engine_class->set_query = gtk_search_engine_simple_set_query;
-Index: gtk/gtkfilechooserdefault.c
-===================================================================
---- gtk/gtkfilechooserdefault.c (revision 18864)
-+++ gtk/gtkfilechooserdefault.c (working copy)
-@@ -8994,6 +8994,8 @@ search_stop_searching (GtkFileChooserDef
-
- if (impl->search_engine)
- {
-+ _gtk_search_engine_stop (impl->search_engine);
-+
- g_object_unref (impl->search_engine);
- impl->search_engine = NULL;
- }
Index: extra/lib/gtk2/swt-tooltips.patch
diff -u extra/lib/gtk2/swt-tooltips.patch:1.1 extra/lib/gtk2/swt-tooltips.patch:removed
--- extra/lib/gtk2/swt-tooltips.patch:1.1 Sat Oct 13 13:55:06 2007
+++ extra/lib/gtk2/swt-tooltips.patch Wed Oct 17 13:51:38 2007
@@ -1,13 +0,0 @@
-diff -up gtk+-2.12.0/gtk/gtktooltips.c.swt-tooltips gtk+-2.12.0/gtk/gtktooltips.c
---- gtk+-2.12.0/gtk/gtktooltips.c.swt-tooltips 2007-09-20 15:47:54.000000000 -0400
-+++ gtk+-2.12.0/gtk/gtktooltips.c 2007-09-20 15:48:22.000000000 -0400
-@@ -229,7 +229,8 @@ gtk_tooltips_set_tip (GtkTooltips *toolt
- return;
- }
-
-- if (tooltips->active_tips_data
-+ if (tooltipsdata
-+ && tooltips->active_tips_data
- && tooltips->active_tips_data->widget == widget
- && GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget))
- {
More information about the arch-commits
mailing list