[arch-commits] CVS update of extra/lib/gtk2 (4 files)
Jan de Groot
jgc at archlinux.org
Thu Sep 20 17:06:58 UTC 2007
Date: Thursday, September 20, 2007 @ 13:06:58
Author: jgc
Path: /home/cvs-extra/extra/lib/gtk2
Added: gtkiconcache-disable-debug.patch (1.1)
gtksearchenginetracker-update-modulename.patch (1.1)
gtkselection-dontcrash-on-null.patch (1.1)
Modified: PKGBUILD (1.99 -> 1.100)
upgpkg: gtk2 2.12.0-1
Add some SVN trunk patches, delete patch to fix openoffice, openoffice has been fixed
------------------------------------------------+
PKGBUILD | 29 +++++++++------
gtkiconcache-disable-debug.patch | 27 ++++++++++++++
gtksearchenginetracker-update-modulename.patch | 21 +++++++++++
gtkselection-dontcrash-on-null.patch | 43 +++++++++++++++++++++++
4 files changed, 108 insertions(+), 12 deletions(-)
Index: extra/lib/gtk2/PKGBUILD
diff -u extra/lib/gtk2/PKGBUILD:1.99 extra/lib/gtk2/PKGBUILD:1.100
--- extra/lib/gtk2/PKGBUILD:1.99 Sun Aug 19 06:43:11 2007
+++ extra/lib/gtk2/PKGBUILD Thu Sep 20 13:06:57 2007
@@ -1,37 +1,42 @@
-# $Id: PKGBUILD,v 1.99 2007/08/19 10:43:11 jgc Exp $
+# $Id: PKGBUILD,v 1.100 2007/09/20 17:06:57 jgc Exp $
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gtk2
-pkgver=2.10.14
-pkgrel=3
+pkgver=2.12.0
+pkgrel=1
pkgdesc="The GTK+ Toolkit (v2)"
arch=(i686 x86_64)
url="http://www.gtk.org/"
install=gtk2.install
-depends=('atk>=1.18.0-2' 'pango>=1.16.5' 'glib2>=2.14.0-3' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups')
+depends=('atk>=1.20.0' 'pango>=1.18.2' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups' 'libxcomposite' 'libxdamage')
makedepends=('pkgconfig')
replaces=('gtkprint-cups')
conflicts=('gtkprint-cups')
options=('!libtool')
backup=(etc/gtk-2.0/gtkrc)
license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-${pkgver}.tar.bz2
- gdkscreen-check.patch
- gtkclipboard-check.patch)
-md5sums=('018d7dd0fa7de01cfdb77c7c55e7ba26'
- 'e223e58ffde3706b0d82641aaf1db273'
- '4025d3c15d6c6f73a032f403ffd4ff1c')
+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)
+md5sums=('e9c280afec29b11772af5a7c807abf41'
+ '4025d3c15d6c6f73a032f403ffd4ff1c'
+ 'ae9397c9adc43f902e4491c8276504cf'
+ '823450839e4e0cc714b65c0be5b5d8d5'
+ '2d821b18b973a281849cd775bb926457')
build() {
cd ${startdir}/src/gtk+-${pkgver}
- patch -Np1 -i ${startdir}/src/gdkscreen-check.patch || return 1
patch -Np1 -i ${startdir}/src/gtkclipboard-check.patch || return 1
+ 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
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --with-xinput=xfree \
--with-included-loaders=png
make || return 1
make DESTDIR=${startdir}/pkg install
- mkdir -p ${startdir}/pkg/etc/gtk-2.0
echo 'gtk-fallback-icon-theme = "gnome"' > ${startdir}/pkg/etc/gtk-2.0/gtkrc
}
Index: extra/lib/gtk2/gtkiconcache-disable-debug.patch
diff -u /dev/null extra/lib/gtk2/gtkiconcache-disable-debug.patch:1.1
--- /dev/null Thu Sep 20 13:06:57 2007
+++ extra/lib/gtk2/gtkiconcache-disable-debug.patch Thu Sep 20 13:06:57 2007
@@ -0,0 +1,27 @@
+--- 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 /dev/null extra/lib/gtk2/gtksearchenginetracker-update-modulename.patch:1.1
--- /dev/null Thu Sep 20 13:06:57 2007
+++ extra/lib/gtk2/gtksearchenginetracker-update-modulename.patch Thu Sep 20 13:06:57 2007
@@ -0,0 +1,21 @@
+--- 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 /dev/null extra/lib/gtk2/gtkselection-dontcrash-on-null.patch:1.1
--- /dev/null Thu Sep 20 13:06:57 2007
+++ extra/lib/gtk2/gtkselection-dontcrash-on-null.patch Thu Sep 20 13:06:57 2007
@@ -0,0 +1,43 @@
+--- 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;
+ }
+
More information about the arch-commits
mailing list