Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=68d6dfd054448d080746c2b0701874f8e420d90d
commit 68d6dfd054448d080746c2b0701874f8e420d90d
Author: crazy <[EMAIL PROTECTED]>
Date: Wed Jun 4 12:12:50 2008 +0200
gtk+2-2.12.10-1-x86_64
* Version bump
diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild
index 9902a77..4d38bfa 100644
--- a/source/xlib/gtk+2/FrugalBuild
+++ b/source/xlib/gtk+2/FrugalBuild
@@ -3,11 +3,11 @@
pkgname=gtk+2
_F_gnome_name=gtk+
-pkgver=2.12.9
-pkgrel=2
+pkgver=2.12.10
+pkgrel=1
pkgdesc="The GTK+ Toolkit (2.x series)"
depends=('libtiff' 'atk>=1.22.0' 'libxi' 'libxinerama' 'fontconfig' 'libjpeg' \
- 'pango>=1.20.2' 'cairo>=1.6.4' 'libxcursor' 'libxrandr' 'libsm'
'glib2>=2.16.3' \
+ 'pango>=1.20.3' 'cairo>=1.6.4' 'libxcursor' 'libxrandr' 'libsm'
'glib2>=2.16.3' \
'libcups' 'libx11' 'libtiff' 'libpng')
rodepends=('gnome-icon-theme')
groups=('xlib')
@@ -18,8 +18,7 @@ url="http://www.gtk.org/";
_F_cd_path="gtk+-$pkgver"
source=($source \
gtk+-2.12.0-flash-workaround.patch \
- gtk+-2.12.0-openoffice-freeze-workaround.patch \
- gtk+-2.12.0-fix-tracker-issues.patch)
+ gtk+-2.12.0-openoffice-freeze-workaround.patch)
subpkgs=("$pkgname-docs")
subdescs=("GTK+2 Documentation")
@@ -29,7 +28,7 @@ subarchs=('i686 x86_64')
build() {
- export CFLAGS="$CFLAGS -fno-strict-aliasing"
+
Fbuild \
--with-xinput=yes \
--enable-gtk-doc \
@@ -42,8 +41,7 @@ build() {
Fsplit $pkgname-docs usr/share/gtk-doc
}
-sha1sums=('95e375f8478940a5b096845a9bff76004f265eba' \
+sha1sums=('03ba66925d3ef8509c2aa227cdb7b11c194055ee' \
'7db980e782a5b04d27bffb55e3dc0190ad22e118' \
- '783920d179ba0755ccab9186b6bff9f293828a96' \
- '3fb0332becafa55ce2daa14e4c15c3eb6c8ddc44')
+ '783920d179ba0755ccab9186b6bff9f293828a96')
# optimization OK
diff --git a/source/xlib/gtk+2/gtk+-2.12.0-fix-tracker-issues.patch
b/source/xlib/gtk+2/gtk+-2.12.0-fix-tracker-issues.patch
deleted file mode 100644
index c3c5065..0000000
--- a/source/xlib/gtk+2/gtk+-2.12.0-fix-tracker-issues.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- gtk/gtksearchenginetracker.c.orig 2007-09-22 09:48:10.580987152 +0200
-+++ gtk/gtksearchenginetracker.c 2007-09-22 18:32:27.693625839 +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),
-@@ -285,6 +287,7 @@
- {
- GtkSearchEngineTracker *engine;
- TrackerClient *tracker_client;
-+ GError *err = NULL;
-
- open_libtracker ();
-
-@@ -296,6 +299,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;
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
