rpms/nautilus/devel nautilus-2.21.1-dynamic-search.patch, NONE, 1.1 .cvsignore, 1.61, 1.62 nautilus.spec, 1.174, 1.175 sources, 1.65, 1.66
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Sat Dec 22 04:02:50 UTC 2007
- Previous message (by thread): rpms/perl-DBIx-DBSchema/F-7 .cvsignore, 1.9, 1.10 perl-DBIx-DBSchema.spec, 1.11, 1.12 sources, 1.9, 1.10 DBIx-DBSchema-0.28-version.diff, 1.1, NONE
- Next message (by thread): rpms/nautilus/devel rtl-fix.patch, NONE, 1.1 nautilus.spec, 1.175, 1.176
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/extras/rpms/nautilus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5850
Modified Files:
.cvsignore nautilus.spec sources
Added Files:
nautilus-2.21.1-dynamic-search.patch
Log Message:
2.21.1
nautilus-2.21.1-dynamic-search.patch:
--- NEW FILE nautilus-2.21.1-dynamic-search.patch ---
diff -up nautilus-2.21.1/configure.in.dynamic-search nautilus-2.21.1/configure.in
--- nautilus-2.21.1/configure.in.dynamic-search 2007-12-20 10:33:26.000000000 -0500
+++ nautilus-2.21.1/configure.in 2007-12-21 22:45:20.000000000 -0500
@@ -271,42 +271,12 @@ dnl ====================================
dnl search implementations
dnl ****************************
-AM_CONDITIONAL(HAVE_TRACKER, false)
+# We hardcode beagle and tracker use and then load it dynamically
+AM_CONDITIONAL(HAVE_TRACKER, true)
+AC_DEFINE(HAVE_TRACKER, 1, [Define to enable tracker support])
-dnl libtracker checking
-
-AC_ARG_ENABLE(tracker, [ --disable-tracker build without tracker support])
-msg_tracker=no
-if test "x$enable_tracker" != "xno"; then
- PKG_CHECK_MODULES(TRACKER, tracker >= tracker_minver, [
- AM_CONDITIONAL(HAVE_TRACKER, true)
- AC_DEFINE(HAVE_TRACKER, 1, [Define to enable tracker support])
- ]
- msg_tracker=yes,
- [AM_CONDITIONAL(HAVE_TRACKER, false)])
- AC_SUBST(TRACKER_CFLAGS)
- AC_SUBST(TRACKER_LIBS)
-fi
-
-dnl ==========================================================================
-
-
-AM_CONDITIONAL(HAVE_BEAGLE, false)
-
-dnl libbeagle checking
-
-AC_ARG_ENABLE(beagle, [ --disable-beagle build without beagle support])
-msg_beagle=no
-if test "x$enable_beagle" != "xno"; then
- PKG_CHECK_MODULES(BEAGLE, libbeagle-0.0 >= beagle_minver, [
- AM_CONDITIONAL(HAVE_BEAGLE, true)
- AC_DEFINE(HAVE_BEAGLE, 1, [Define to enable beagle support])
- ]
- msg_beagle=yes,
- [AM_CONDITIONAL(HAVE_BEAGLE, false)])
- AC_SUBST(BEAGLE_CFLAGS)
- AC_SUBST(BEAGLE_LIBS)
-fi
+AM_CONDITIONAL(HAVE_BEAGLE, true)
+AC_DEFINE(HAVE_BEAGLE, 1, [Define to enable beagle support])
dnl ==========================================================================
diff -up nautilus-2.21.1/libnautilus-private/nautilus-search-engine-beagle.c.dynamic-search nautilus-2.21.1/libnautilus-private/nautilus-search-engine-beagle.c
--- nautilus-2.21.1/libnautilus-private/nautilus-search-engine-beagle.c.dynamic-search 2007-12-14 04:36:31.000000000 -0500
+++ nautilus-2.21.1/libnautilus-private/nautilus-search-engine-beagle.c 2007-12-21 22:45:20.000000000 -0500
@@ -23,10 +23,20 @@
#include <config.h>
#include "nautilus-search-engine-beagle.h"
-#include <beagle/beagle.h>
#include <eel/eel-gtk-macros.h>
#include <eel/eel-glib-extensions.h>
+#include <gmodule.h>
+
+typedef struct _BeagleHit BeagleHit;
+typedef struct _BeagleQuery BeagleQuery;
+typedef struct _BeagleClient BeagleClient;
+typedef struct _BeagleRequest BeagleRequest;
+typedef struct _BeagleFinishedResponse BeagleFinishedResponse;
+typedef struct _BeagleHitsAddedResponse BeagleHitsAddedResponse;
+typedef struct _BeagleQueryPartProperty BeagleQueryPartProperty;
+typedef struct _BeagleQueryPart BeagleQueryPart;
+typedef struct _BeagleHitsSubtractedResponse BeagleHitsSubtractedResponse;
struct NautilusSearchEngineBeagleDetails {
BeagleClient *client;
@@ -37,6 +47,127 @@ struct NautilusSearchEngineBeagleDetails
gboolean query_finished;
};
+/* We dlopen() all the following from libbeagle at runtime */
+#define BEAGLE_HIT(x) ((BeagleHit *)(x))
+#define BEAGLE_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_request_get_type(), BeagleRequest))
+#define BEAGLE_QUERY_PART(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_query_part_get_type(), BeagleQueryPart))
+
+typedef enum {
+ BEAGLE_QUERY_PART_LOGIC_REQUIRED = 1,
+ BEAGLE_QUERY_PART_LOGIC_PROHIBITED = 2
+} BeagleQueryPartLogic;
+
+typedef enum {
+ BEAGLE_PROPERTY_TYPE_UNKNOWN = 0,
+ BEAGLE_PROPERTY_TYPE_TEXT = 1,
+ BEAGLE_PROPERTY_TYPE_KEYWORD = 2,
+ BEAGLE_PROPERTY_TYPE_DATE = 3,
+ BEAGLE_PROPERTY_TYPE_LAST = 4
+} BeaglePropertyType;
+
+/* *static* wrapper function pointers */
+static gboolean (*beagle_client_send_request_async) (BeagleClient *client,
+ BeagleRequest *request,
+ GError **err) = NULL;
+static G_CONST_RETURN char *(*beagle_hit_get_uri) (BeagleHit *hit) = NULL;
+static GSList *(*beagle_hits_added_response_get_hits) (BeagleHitsAddedResponse *response) = NULL;
+static BeagleQuery *(*beagle_query_new) (void) = NULL;
+static void (*beagle_query_add_text) (BeagleQuery *query,
+ const char *str) = NULL;
+static void (*beagle_query_add_hit_type) (BeagleQuery *query,
+ const char *hit_type) = NULL;
+static BeagleQueryPartProperty *(*beagle_query_part_property_new) (void) = NULL;
+static void (*beagle_query_part_set_logic) (BeagleQueryPart *part,
+ BeagleQueryPartLogic logic) = NULL;
+static void (*beagle_query_part_property_set_key) (BeagleQueryPartProperty *part,
+ const char *key) = NULL;
+static void (*beagle_query_part_property_set_value) (BeagleQueryPartProperty *part,
+ const char * value) = NULL;
+static void (*beagle_query_part_property_set_property_type) (BeagleQueryPartProperty *part,
+ BeaglePropertyType prop_type) = NULL;
+static void (*beagle_query_add_part) (BeagleQuery *query,
+ BeagleQueryPart *part) = NULL;
+static GType (*beagle_request_get_type) (void) = NULL;
+static GType (*beagle_query_part_get_type) (void) = NULL;
+static gboolean (*beagle_util_daemon_is_running) (void) = NULL;
+static BeagleClient *(*beagle_client_new_real) (const char *client_name) = NULL;
+static void (*beagle_query_set_max_hits) (BeagleQuery *query,
+ int max_hits) = NULL;
+static void (*beagle_query_add_mime_type) (BeagleQuery *query,
+ const char *mime_type) = NULL;
+static GSList *(*beagle_hits_subtracted_response_get_uris) (BeagleHitsSubtractedResponse *response) = NULL;
+
+static struct BeagleDlMapping
+{
+ const char *fn_name;
+ gpointer *fn_ptr_ref;
+} beagle_dl_mapping[] =
+{
+#define MAP(a) { #a, (gpointer *)&a }
+ MAP (beagle_client_send_request_async),
+ MAP (beagle_hit_get_uri),
+ MAP (beagle_hits_added_response_get_hits),
+ MAP (beagle_query_new),
+ MAP (beagle_query_add_text),
+ MAP (beagle_query_add_hit_type),
+ MAP (beagle_query_part_property_new),
+ MAP (beagle_query_part_set_logic),
+ MAP (beagle_query_part_property_set_key),
+ MAP (beagle_query_part_property_set_value),
+ MAP (beagle_query_part_property_set_property_type),
+ MAP (beagle_query_add_part),
+ MAP (beagle_request_get_type),
+ MAP (beagle_query_part_get_type),
+ MAP (beagle_util_daemon_is_running),
+ MAP (beagle_query_set_max_hits),
+ MAP (beagle_query_add_mime_type),
+ MAP (beagle_hits_subtracted_response_get_uris),
+#undef MAP
+ { "beagle_client_new", (gpointer *)&beagle_client_new_real },
+};
+
+static void
+open_libbeagle (void)
+{
+ static gboolean done = FALSE;
+
+ if (!done)
+ {
+ int i;
+ GModule *beagle;
+
+ done = TRUE;
+
+ beagle = g_module_open ("libbeagle.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+ if (!beagle)
+ return;
+
+ for (i = 0; i < G_N_ELEMENTS (beagle_dl_mapping); i++)
+ {
+ if (!g_module_symbol (beagle, beagle_dl_mapping[i].fn_name,
+ beagle_dl_mapping[i].fn_ptr_ref))
+ {
+ g_warning ("Missing symbol '%s' in libbeagle\n",
+ beagle_dl_mapping[i].fn_name);
+ g_module_close (beagle);
+
+ for (i = 0; i < G_N_ELEMENTS (beagle_dl_mapping); i++)
+ beagle_dl_mapping[i].fn_ptr_ref = NULL;
+
+ return;
+ }
+ }
+ }
+}
+
+static BeagleClient *
+beagle_client_new (const char *client_name)
+{
+ if (beagle_client_new_real)
+ return beagle_client_new_real (client_name);
+
+ return NULL;
+}
static void nautilus_search_engine_beagle_class_init (NautilusSearchEngineBeagleClass *class);
static void nautilus_search_engine_beagle_init (NautilusSearchEngineBeagle *engine);
@@ -276,8 +407,11 @@ nautilus_search_engine_beagle_new (void)
{
NautilusSearchEngineBeagle *engine;
BeagleClient *client;
+
+ open_libbeagle ();
- if (!beagle_util_daemon_is_running ()) {
+ if (beagle_util_daemon_is_running == NULL ||
+ !beagle_util_daemon_is_running ()) {
/* check whether daemon is running as beagle_client_new
* doesn't fail when a stale socket file exists */
return NULL;
diff -up nautilus-2.21.1/libnautilus-private/nautilus-search-engine-tracker.c.dynamic-search nautilus-2.21.1/libnautilus-private/nautilus-search-engine-tracker.c
--- nautilus-2.21.1/libnautilus-private/nautilus-search-engine-tracker.c.dynamic-search 2007-12-14 04:36:31.000000000 -0500
+++ nautilus-2.21.1/libnautilus-private/nautilus-search-engine-tracker.c 2007-12-21 22:55:17.000000000 -0500
@@ -23,11 +23,89 @@
#include <config.h>
#include "nautilus-search-engine-tracker.h"
-#include <tracker.h>
+#include <gmodule.h>
#include <eel/eel-gtk-macros.h>
#include <eel/eel-glib-extensions.h>
+typedef struct _TrackerClient TrackerClient;
+
+typedef void (*TrackerArrayReply) (char **result, GError *error, gpointer user_data);
+
+static TrackerClient * (*tracker_connect) (gboolean enable_warnings) = NULL;
+static void (*tracker_disconnect) (TrackerClient *client) = NULL;
+static void (*tracker_cancel_last_call) (TrackerClient *client) = NULL;
+
+static void (*tracker_search_metadata_by_text_async) (TrackerClient *client,
+ const char *query,
+ TrackerArrayReply callback,
+ gpointer user_data) = NULL;
+static void (*tracker_search_metadata_by_text_and_mime_async) (TrackerClient *client,
+ const char *query,
+ const char **mimes,
+ TrackerArrayReply callback,
+ gpointer user_data) = NULL;
+static void (*tracker_search_metadata_by_text_and_location_async) (TrackerClient *client,
+ const char *query,
+ const char *location,
+ TrackerArrayReply callback,
+ gpointer user_data) = NULL;
+static void (*tracker_search_metadata_by_text_and_mime_and_location_async) (TrackerClient *client,
+ const char *query,
+ const char **mimes,
+ const char *location,
+ TrackerArrayReply callback,
+ gpointer user_data) = NULL;
+
+static struct TrackerDlMapping
+{
+ const char *fn_name;
+ gpointer *fn_ptr_ref;
+} tracker_dl_mapping[] =
+{
+#define MAP(a) { #a, (gpointer *)&a }
+ MAP (tracker_connect),
+ MAP (tracker_disconnect),
+ MAP (tracker_cancel_last_call),
+ MAP (tracker_search_metadata_by_text_async),
+ MAP (tracker_search_metadata_by_text_and_mime_async),
+ MAP (tracker_search_metadata_by_text_and_location_async),
+ MAP (tracker_search_metadata_by_text_and_mime_and_location_async)
+#undef MAP
+};
+
+static void
+open_libtracker (void)
+{
+ static gboolean done = FALSE;
+ if (!done)
+ {
+ int i;
+ GModule *tracker;
+
+ done = TRUE;
+
+ tracker = g_module_open ("libtrackerclient.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+ if (!tracker)
+ return;
+
+ for (i = 0; i < G_N_ELEMENTS (tracker_dl_mapping); i++)
+ {
+ if (!g_module_symbol (tracker, tracker_dl_mapping[i].fn_name,
+ tracker_dl_mapping[i].fn_ptr_ref))
+ {
+ g_warning ("Missing symbol '%s' in libtracker\n",
+ tracker_dl_mapping[i].fn_name);
+ g_module_close (tracker);
+
+ for (i = 0; i < G_N_ELEMENTS (tracker_dl_mapping); i++)
+ tracker_dl_mapping[i].fn_ptr_ref = NULL;
+
+ return;
+ }
+ }
+ }
+}
struct NautilusSearchEngineTrackerDetails {
NautilusQuery *query;
@@ -259,6 +337,12 @@ nautilus_search_engine_tracker_new (void
NautilusSearchEngineTracker *engine;
TrackerClient *tracker_client;
+ open_libtracker ();
+
+ if (!tracker_connect) {
+ return NULL;
+ }
+
tracker_client = tracker_connect (FALSE);
if (!tracker_client) {
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore 18 Sep 2007 16:23:17 -0000 1.61
+++ .cvsignore 22 Dec 2007 04:02:02 -0000 1.62
@@ -1 +1 @@
-nautilus-2.20.0.tar.bz2
+nautilus-2.21.1.tar.bz2
Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- nautilus.spec 19 Dec 2007 16:40:03 -0000 1.174
+++ nautilus.spec 22 Dec 2007 04:02:02 -0000 1.175
@@ -1,8 +1,8 @@
-%define glib2_version 2.6.0
+%define glib2_version 2.15.0
%define pango_version 1.1.3
%define gtk2_version 2.11.6
%define libgnomeui_version 2.6.0
-%define eel2_version 2.15.91
+%define eel2_version 2.21.1
%define gnome_icon_theme_version 1.1.5
%define libxml2_version 2.4.20
%define gail_version 0.17-2
@@ -17,11 +17,11 @@
Name: nautilus
Summary: Nautilus is a file manager for GNOME
-Version: 2.20.0
-Release: 7%{?dist}
+Version: 2.21.1
+Release: 1%{?dist}
License: GPLv2+
Group: User Interface/Desktops
-Source: http://download.gnome.org/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.21/%{name}-%{version}.tar.bz2
URL: http://www.gnome.org/projects/nautilus/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,8 +29,7 @@
Requires: filesystem >= 2.1.1-1
Requires: desktop-backgrounds-basic >= %{desktop_backgrounds_version}
Requires: redhat-menus >= %{redhat_menus_version}
-Requires: gnome-vfs2 >= %{gnome_vfs2_version}
-Requires: gnome-vfs2-smb
+Requires: gvfs
Requires: eel2 >= %{eel2_version}
Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
Requires: libexif >= %{libexif_version}
@@ -47,8 +46,8 @@
BuildRequires: eel2-devel >= %{eel2_version}
BuildRequires: gail-devel >= %{gail_version}
BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
-BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
BuildRequires: gamin-devel
+BuildRequires: gvfs-devel
BuildRequires: librsvg2
BuildRequires: intltool
BuildRequires: libX11-devel
@@ -73,19 +72,12 @@
# Some changes to default config
Patch1: nautilus-2.5.7-rhconfig.patch
-Patch2: nautilus-2.15.2-format.patch
Patch3: background-no-delay.patch
-Patch5: nautilus-2.19.2-selinux.patch
-Patch6: nautilus-2.16.2-dynamic-search.patch
+# This patch needs to be redone and pushed upstream
+# Patch5: nautilus-2.19.2-selinux.patch
-# Backports from svn:
-Patch7: nautilus-2.20-async_thumbnail_fixes.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=454884
-Patch8: nautilus-2.20.0-small-font-fix.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=486827
-Patch9: nautilus-2.20-make-audio-preview-work.patch
+# Why is this not upstream ?
+Patch6: nautilus-2.21.1-dynamic-search.patch
%description
Nautilus integrates access to files, applications, media,
@@ -117,13 +109,9 @@
%setup -q -n %{name}-%{version}
%patch1 -p1 -b .rhconfig
-#%patch2 -p1 -b .format
%patch3 -p1 -b .no-delay
-%patch5 -p1 -b .selinux
+#%patch5 -p1 -b .selinux
%patch6 -p1 -b .dynamic-search
-%patch7 -p0 -b .async_thumbnail_fixes
-%patch8 -p1 -b .small-font-fix
-%patch9 -p0 -b .audio-preview
%build
@@ -232,6 +220,9 @@
%{_libdir}/*.so
%changelog
+* Fri Dec 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.21.1-1
+- Upodate to 2.21.1
+
* Wed Dec 19 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-7
- Update audio preview patch to check for aliases (#381401)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources 18 Sep 2007 16:23:17 -0000 1.65
+++ sources 22 Dec 2007 04:02:02 -0000 1.66
@@ -1 +1 @@
-3856ec2ffeba786d12f8f6622e398c33 nautilus-2.20.0.tar.bz2
+c52c447617196434fc0fc81b48610f65 nautilus-2.21.1.tar.bz2
- Previous message (by thread): rpms/perl-DBIx-DBSchema/F-7 .cvsignore, 1.9, 1.10 perl-DBIx-DBSchema.spec, 1.11, 1.12 sources, 1.9, 1.10 DBIx-DBSchema-0.28-version.diff, 1.1, NONE
- Next message (by thread): rpms/nautilus/devel rtl-fix.patch, NONE, 1.1 nautilus.spec, 1.175, 1.176
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list