rpms/gtk2
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix tracker search

Browse Source
This commit is contained in:
Matthias Clasen 2007-09-18 23:35:30 +00:00
parent dbd262edbf
commit dabbd75e83
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2.spec
View File

@ -16,7 +16,7 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk2 Name: gtk2
Version: %{base_version} Version: %{base_version}
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://download.gnome.org/sources/gtk+/2.11/gtk+-%{version}.tar.bz2 Source: http://download.gnome.org/sources/gtk+/2.11/gtk+-%{version}.tar.bz2
@ -32,6 +32,7 @@ Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
Patch2: workaround.patch Patch2: workaround.patch
# fixed in upstream svn # fixed in upstream svn
Patch3: novalidate.patch Patch3: novalidate.patch
Patch4: libtracker.patch
BuildRequires: atk-devel >= %{atk_version} BuildRequires: atk-devel >= %{atk_version}
BuildRequires: pango-devel >= %{pango_version} BuildRequires: pango-devel >= %{pango_version}
@ -119,6 +120,7 @@ docs for the GTK+ widget toolkit.
%patch1 -p1 -b .set-invisible-char-to-bullet %patch1 -p1 -b .set-invisible-char-to-bullet
%patch2 -p1 -b .workaround %patch2 -p1 -b .workaround
%patch3 -p1 -b .novalidate %patch3 -p1 -b .novalidate
%patch4 -p1 -b .libtracker
for i in config.guess config.sub ; do for i in config.guess config.sub ; do
test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@ -301,6 +303,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-2.0 %{_datadir}/gtk-2.0
%changelog %changelog
* Tue Sep 18 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.0-2
- Adapt to tracker ABI changes
* Fri Sep 14 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.0-1 * Fri Sep 14 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.0-1
- Update to 2.12.0 - Update to 2.12.0

22
libtracker.patch Normal file
View File

@ -0,0 +1,22 @@
diff -up gtk+-2.12.0/gtk/gtksearchenginetracker.c.libtracker gtk+-2.12.0/gtk/gtksearchenginetracker.c
--- gtk+-2.12.0/gtk/gtksearchenginetracker.c.libtracker 2007-09-18 19:29:57.000000000 -0400
+++ gtk+-2.12.0/gtk/gtksearchenginetracker.c 2007-09-18 19:30:54.000000000 -0400
@@ -71,10 +71,16 @@ open_libtracker (void)
{
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;