From eb79b1526119bd06df20eb8c9e460e69eb40aa0c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 15 Oct 2012 16:48:35 +0200 Subject: [PATCH] tracker: rebuild against giflib-5.0. --- srcpkgs/tracker/libtracker.rshlibs | 3 --- srcpkgs/tracker/patches/giflib-5.0.patch | 23 +++++++++++++++++++++++ srcpkgs/tracker/template | 14 +++++++------- srcpkgs/tracker/tracker-devel.template | 2 +- srcpkgs/tracker/tracker.rshlibs | 13 +------------ 5 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 srcpkgs/tracker/patches/giflib-5.0.patch diff --git a/srcpkgs/tracker/libtracker.rshlibs b/srcpkgs/tracker/libtracker.rshlibs index 268a4881e98..35e3be0bcbe 100644 --- a/srcpkgs/tracker/libtracker.rshlibs +++ b/srcpkgs/tracker/libtracker.rshlibs @@ -1,4 +1,3 @@ -libz.so.1 libsqlite3.so.0 libicuuc.so.49 libicui18n.so.49 @@ -16,6 +15,4 @@ libc.so.6 libgcc_s.so.1 libgnome-keyring.so.0 libnm-glib.so.4 -libdbus-glib-1.so.2 -libdbus-1.so.3 libexif.so.12 diff --git a/srcpkgs/tracker/patches/giflib-5.0.patch b/srcpkgs/tracker/patches/giflib-5.0.patch new file mode 100644 index 00000000000..fcc5b92da06 --- /dev/null +++ b/srcpkgs/tracker/patches/giflib-5.0.patch @@ -0,0 +1,23 @@ +Adapt DGifOpenFileHandle() to the 5.x API. + +--- src/tracker-extract/tracker-extract-gif.c.orig 2012-10-15 16:37:00.360314076 +0200 ++++ src/tracker-extract/tracker-extract-gif.c 2012-10-15 16:37:48.823166861 +0200 +@@ -592,7 +592,7 @@ tracker_extract_get_metadata (TrackerExt + const gchar *graph; + gchar *filename, *uri; + GFile *file; +- int fd; ++ int fd, err = 0; + + preupdate = tracker_extract_info_get_preupdate_builder (info); + metadata = tracker_extract_info_get_metadata_builder (info); +@@ -617,7 +617,8 @@ tracker_extract_get_metadata (TrackerExt + return FALSE; + } + +- if ((gifFile = DGifOpenFileHandle (fd)) == NULL) { ++ gifFile = DGifOpenFileHandle (fd, &err); ++ if (err) { + PrintGifError (); + close (fd); + return FALSE; diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template index 2850e3ad8e8..ce177dac753 100644 --- a/srcpkgs/tracker/template +++ b/srcpkgs/tracker/template @@ -1,16 +1,16 @@ # Template file for 'tracker' pkgname=tracker version=0.14.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-libflac --enable-libvorbis --disable-unit-tests ---enable-libtiff --disable-static --enable-network-manager" + --enable-libtiff --disable-static --enable-network-manager" makedepends="pkg-config intltool gobject-introspection libpng-devel>=1.5.10 -libgee-devel libgnome-keyring-devel upower-devel exempi-devel poppler-glib-devel -libgsf-devel icu-devel>=49 enca-devel libvorbis-devel libflac-devel nautilus-devel -gnome-panel-devel taglib-devel giflib-devel totem-pl-parser-devel gupnp-dlna-devel -libexif-devel tiff-devel network-manager-applet-devel sqlite-devel" - + libgee-devel libgnome-keyring-devel upower-devel exempi-devel + poppler-glib-devel nautilus-devel gupnp-dlna-devel + libgsf-devel icu-devel>=49 enca-devel libvorbis-devel libflac-devel + gnome-panel-devel taglib-devel giflib-devel>=5.0 totem-pl-parser-devel + libexif-devel tiff-devel network-manager-applet-devel sqlite-devel" subpackages="$pkgname-devel libtracker" short_desc="Personal search tool and storage system" maintainer="Juan RP " diff --git a/srcpkgs/tracker/tracker-devel.template b/srcpkgs/tracker/tracker-devel.template index 503349303e4..fbcf4f2cb93 100644 --- a/srcpkgs/tracker/tracker-devel.template +++ b/srcpkgs/tracker/tracker-devel.template @@ -1,7 +1,7 @@ # Template file for 'tracker-devel'. # noarch=yes -depends="glib-devel libtracker>=$version" +depends="glib-devel libtracker-${version}_${revision}" short_desc="${short_desc} - development files" long_desc="${long_desc} diff --git a/srcpkgs/tracker/tracker.rshlibs b/srcpkgs/tracker/tracker.rshlibs index 9632dccd7ca..36a23e61a83 100644 --- a/srcpkgs/tracker/tracker.rshlibs +++ b/srcpkgs/tracker/tracker.rshlibs @@ -4,41 +4,30 @@ libtracker-common.so.0 libgio-2.0.so.0 libgobject-2.0.so.0 libgmodule-2.0.so.0 -libgthread-2.0.so.0 -librt.so.1 libglib-2.0.so.0 libpthread.so.0 libc.so.6 libvorbisfile.so.3 libvorbis.so.0 -libm.so.6 -libogg.so.0 libFLAC.so.8 -libgif.so.4 +libgif.so.6 libjpeg.so.8 libxml2.so.2 libgsf-1.so.114 libpoppler-glib.so.8 -libcairo.so.2 libgsttag-0.10.so.0 libgstpbutils-0.10.so.0 libgstreamer-0.10.so.0 libtotem-plparser.so.17 libtag_c.so.0 -libtag.so.1 libnautilus-extension.so.1 libgtk-3.so.0 libgdk-3.so.0 -libatk-1.0.so.0 -libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 -libcairo-gobject.so.2 -libpango-1.0.so.0 libupower-glib.so.1 libtiff.so.5 libtracker-extract-0.14.so.0 libtracker-sparql-0.14.so.0 libtracker-miner-0.14.so.0 libgee.so.2 -libpanel-applet-4.so.0 libpng15.so.15