rpms/gtk2/FC-6 gtk+-2.10.12-search.patch, NONE, 1.1 .cvsignore, 1.61, 1.62 gtk2.spec, 1.203, 1.204 sources, 1.68, 1.69
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu May 31 02:33:37 UTC 2007
Author: mclasen
Update of /cvs/dist/rpms/gtk2/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv26229
Modified Files:
.cvsignore gtk2.spec sources
Added Files:
gtk+-2.10.12-search.patch
Log Message:
2.10.12
gtk+-2.10.12-search.patch:
Makefile.am | 10
gtkfilechooserdefault.c | 1519 ++++++++++++++++++++++++++++++++++++-----------
gtkfilechooserprivate.h | 35 -
gtkquery.c | 142 ++++
gtkquery.h | 74 ++
gtksearchengine.c | 199 ++++++
gtksearchengine.h | 91 ++
gtksearchenginebeagle.c | 420 ++++++++++++
gtksearchenginebeagle.h | 59 +
gtksearchenginesimple.c | 374 +++++++++++
gtksearchenginesimple.h | 59 +
gtksearchenginetracker.c | 362 +++++++++++
gtksearchenginetracker.h | 59 +
13 files changed, 3053 insertions(+), 350 deletions(-)
--- NEW FILE gtk+-2.10.12-search.patch ---
--- /dev/null 2007-05-19 19:05:57.724948798 -0400
+++ gtk+-2.10.12/gtk/gtksearchenginetracker.h 2007-05-19 19:51:53.000000000 -0400
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2005 Mr Jamie McCracken
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ *
+ * Author: Jamie McCracken (jamiemcc at gnome.org)
+ *
+ * Based on nautilus-search-engine-tracker.h
+ */
+
+#ifndef __GTK_SEARCH_ENGINE_TRACKER_H__
+#define __GTK_SEARCH_ENGINE_TRACKER_H__
+
+#include "gtksearchengine.h"
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_SEARCH_ENGINE_TRACKER (_gtk_search_engine_tracker_get_type ())
+#define GTK_SEARCH_ENGINE_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEARCH_ENGINE_TRACKER, GtkSearchEngineTracker))
+#define GTK_SEARCH_ENGINE_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEARCH_ENGINE_TRACKER, GtkSearchEngineTrackerClass))
+#define GTK_IS_SEARCH_ENGINE_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEARCH_ENGINE_TRACKER))
+#define GTK_IS_SEARCH_ENGINE_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEARCH_ENGINE_TRACKER))
+#define GTK_SEARCH_ENGINE_TRACKER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEARCH_ENGINE_TRACKER, GtkSearchEngineTrackerClass))
+
+typedef struct _GtkSearchEngineTracker GtkSearchEngineTracker;
+typedef struct _GtkSearchEngineTrackerClass GtkSearchEngineTrackerClass;
+typedef struct _GtkSearchEngineTrackerPrivate GtkSearchEngineTrackerPrivate;
+
+struct _GtkSearchEngineTracker
+{
+ GtkSearchEngine parent;
+
+ GtkSearchEngineTrackerPrivate *priv;
+};
+
+struct _GtkSearchEngineTrackerClass
+{
+ GtkSearchEngineClass parent_class;
+};
+
+GType _gtk_search_engine_tracker_get_type (void);
+
+GtkSearchEngine* _gtk_search_engine_tracker_new (void);
+
+G_END_DECLS
+
+#endif /* __GTK_SEARCH_ENGINE_TRACKER_H__ */
--- /dev/null 2007-05-19 19:05:57.724948798 -0400
+++ gtk+-2.10.12/gtk/gtksearchengine.h 2007-05-19 19:51:53.000000000 -0400
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2005 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ *
+ * Author: Anders Carlsson <andersca at imendio.com>
+ *
+ * Based on nautilus-search-engine.h
+ */
+
+#ifndef __GTK_SEARCH_ENGINE_H__
+#define __GTK_SEARCH_ENGINE_H__
+
+#include <glib-object.h>
+#include "gtkquery.h"
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_SEARCH_ENGINE (_gtk_search_engine_get_type ())
+#define GTK_SEARCH_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngine))
+#define GTK_SEARCH_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngineClass))
+#define GTK_IS_SEARCH_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEARCH_ENGINE))
+#define GTK_IS_SEARCH_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEARCH_ENGINE))
+#define GTK_SEARCH_ENGINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngineClass))
+
+typedef struct _GtkSearchEngine GtkSearchEngine;
+typedef struct _GtkSearchEngineClass GtkSearchEngineClass;
+typedef struct _GtkSearchEnginePrivate GtkSearchEnginePrivate;
+
+struct _GtkSearchEngine
+{
+ GObject parent;
+
+ GtkSearchEnginePrivate *priv;
+};
+
+struct _GtkSearchEngineClass
+{
+ GObjectClass parent_class;
+
+ /* VTable */
+ void (*set_query) (GtkSearchEngine *engine,
+ GtkQuery *query);
+ void (*start) (GtkSearchEngine *engine);
+ void (*stop) (GtkSearchEngine *engine);
+ gboolean (*is_indexed) (GtkSearchEngine *engine);
+
+ /* Signals */
+ void (*hits_added) (GtkSearchEngine *engine,
+ GList *hits);
+ void (*hits_subtracted) (GtkSearchEngine *engine,
+ GList *hits);
+ void (*finished) (GtkSearchEngine *engine);
+ void (*error) (GtkSearchEngine *engine,
+ const gchar *error_message);
+};
+
+GType _gtk_search_engine_get_type (void);
+gboolean _gtk_search_engine_enabled (void);
+
+GtkSearchEngine* _gtk_search_engine_new (void);
+
+void _gtk_search_engine_set_query (GtkSearchEngine *engine,
+ GtkQuery *query);
+void _gtk_search_engine_start (GtkSearchEngine *engine);
+void _gtk_search_engine_stop (GtkSearchEngine *engine);
+gboolean _gtk_search_engine_is_indexed (GtkSearchEngine *engine);
+
+void _gtk_search_engine_hits_added (GtkSearchEngine *engine,
+ GList *hits);
+void _gtk_search_engine_hits_subtracted (GtkSearchEngine *engine,
+ GList *hits);
+void _gtk_search_engine_finished (GtkSearchEngine *engine);
+void _gtk_search_engine_error (GtkSearchEngine *engine,
+ const gchar *error_message);
+
+G_END_DECLS
+
+#endif /* __GTK_SEARCH_ENGINE_H__ */
--- /dev/null 2007-05-19 19:05:57.724948798 -0400
+++ gtk+-2.10.12/gtk/gtksearchenginebeagle.h 2007-05-19 19:51:53.000000000 -0400
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2005 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ *
+ * Author: Anders Carlsson <andersca at imendio.com>
+ *
+ * Based on nautilus-search-engine-beagle.h
+ */
+
+#ifndef __GTK_SEARCH_ENGINE_BEAGLE_H__
+#define __GTK_SEARCH_ENGINE_BEAGLE_H__
+
+#include "gtksearchengine.h"
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_SEARCH_ENGINE_BEAGLE (_gtk_search_engine_beagle_get_type ())
+#define GTK_SEARCH_ENGINE_BEAGLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEARCH_ENGINE_BEAGLE, GtkSearchEngineBeagle))
+#define GTK_SEARCH_ENGINE_BEAGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEARCH_ENGINE_BEAGLE, GtkSearchEngineBeagleClass))
+#define GTK_IS_SEARCH_ENGINE_BEAGLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEARCH_ENGINE_BEAGLE))
+#define GTK_IS_SEARCH_ENGINE_BEAGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEARCH_ENGINE_BEAGLE))
+#define GTK_SEARCH_ENGINE_BEAGLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEARCH_ENGINE_BEAGLE, GtkSearchEngineBeagleClass))
+
+typedef struct _GtkSearchEngineBeagle GtkSearchEngineBeagle;
+typedef struct _GtkSearchEngineBeagleClass GtkSearchEngineBeagleClass;
+typedef struct _GtkSearchEngineBeaglePrivate GtkSearchEngineBeaglePrivate;
+
[...4037 lines suppressed...]
+ * Based on nautilus-query.c
+ */
+
+#include <config.h>
+#include <string.h>
+
+#include "gtkquery.h"
+
+struct _GtkQueryPrivate
+{
+ gchar *text;
+ gchar *location_uri;
+ GList *mime_types;
+};
+
+G_DEFINE_TYPE (GtkQuery, _gtk_query, G_TYPE_OBJECT);
+
+static void
+finalize (GObject *object)
+{
+ GtkQuery *query;
+
+ query = GTK_QUERY (object);
+
+ g_free (query->priv->text);
+
+ G_OBJECT_CLASS (_gtk_query_parent_class)->finalize (object);
+}
+
+static void
+_gtk_query_class_init (GtkQueryClass *class)
+{
+ GObjectClass *gobject_class;
+
+ gobject_class = G_OBJECT_CLASS (class);
+ gobject_class->finalize = finalize;
+
+ g_type_class_add_private (gobject_class, sizeof (GtkQueryPrivate));
+}
+
+static void
+_gtk_query_init (GtkQuery *query)
+{
+ query->priv = G_TYPE_INSTANCE_GET_PRIVATE (query, GTK_TYPE_QUERY, GtkQueryPrivate);
+}
+
+GtkQuery *
+_gtk_query_new (void)
+{
+ return g_object_new (GTK_TYPE_QUERY, NULL);
+}
+
+
+gchar *
+_gtk_query_get_text (GtkQuery *query)
+{
+ return g_strdup (query->priv->text);
+}
+
+void
+_gtk_query_set_text (GtkQuery *query,
+ const gchar *text)
+{
+ g_free (query->priv->text);
+ query->priv->text = g_strdup (text);
+}
+
+gchar *
+_gtk_query_get_location (GtkQuery *query)
+{
+ return g_strdup (query->priv->location_uri);
+}
+
+void
+_gtk_query_set_location (GtkQuery *query,
+ const gchar *uri)
+{
+ g_free (query->priv->location_uri);
+ query->priv->location_uri = g_strdup (uri);
+}
+
+GList *
+_gtk_query_get_mime_types (GtkQuery *query)
+{
+ GList *list, *l;
+ gchar *mime_type;
+
+ list = NULL;
+ for (l = query->priv->mime_types; l; l = l->next)
+ {
+ mime_type = (gchar*)l->data;
+ list = g_list_prepend (list, g_strdup (mime_type));
+ }
+
+ return list;
+}
+
+void
+_gtk_query_set_mime_types (GtkQuery *query,
+ GList *mime_types)
+{
+ GList *l;
+ gchar *mime_type;
+
+ g_list_foreach (query->priv->mime_types, (GFunc)g_free, NULL);
+ g_list_free (query->priv->mime_types);
+ query->priv->mime_types = NULL;
+
+ for (l = mime_types; l; l = l->next)
+ {
+ mime_type = (gchar*)l->data;
+ query->priv->mime_types = g_list_prepend (query->priv->mime_types, g_strdup (mime_type));
+ }
+}
+
+void
+_gtk_query_add_mime_type (GtkQuery *query,
+ const gchar *mime_type)
+{
+ query->priv->mime_types = g_list_prepend (query->priv->mime_types,
+ g_strdup (mime_type));
+}
+
--- /dev/null 2007-05-19 19:05:57.724948798 -0400
+++ gtk+-2.10.12/gtk/gtkquery.h 2007-05-19 19:51:53.000000000 -0400
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2005 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ *
+ * Author: Anders Carlsson <andersca at imendio.com>
+ *
+ * Based on nautilus-query.h
+ */
+
+#ifndef __GTK_QUERY_H__
+#define __GTK_QUERY_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_QUERY (_gtk_query_get_type ())
+#define GTK_QUERY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_QUERY, GtkQuery))
+#define GTK_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_QUERY, GtkQueryClass))
+#define GTK_IS_QUERY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_QUERY))
+#define GTK_IS_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_QUERY))
+#define GTK_QUERY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_QUERY, GtkQueryClass))
+
+typedef struct _GtkQuery GtkQuery;
+typedef struct _GtkQueryClass GtkQueryClass;
+typedef struct _GtkQueryPrivate GtkQueryPrivate;
+
+struct _GtkQuery
+{
+ GObject parent;
+
+ GtkQueryPrivate *priv;
+};
+
+struct _GtkQueryClass
+{
+ GObjectClass parent_class;
+};
+
+GType _gtk_query_get_type (void);
+gboolean _gtk_query_enabled (void);
+
+GtkQuery* _gtk_query_new (void);
+
+gchar* _gtk_query_get_text (GtkQuery *query);
+void _gtk_query_set_text (GtkQuery *query,
+ const gchar *text);
+
+gchar* _gtk_query_get_location (GtkQuery *query);
+void _gtk_query_set_location (GtkQuery *query,
+ const gchar *uri);
+
+GList* _gtk_query_get_mime_types (GtkQuery *query);
+void _gtk_query_set_mime_types (GtkQuery *query,
+ GList *mime_types);
+void _gtk_query_add_mime_type (GtkQuery *query,
+ const gchar *mime_type);
+
+G_END_DECLS
+
+#endif /* __GTK_QUERY_H__ */
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-6/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore 23 Sep 2006 21:07:14 -0000 1.61
+++ .cvsignore 31 May 2007 02:33:35 -0000 1.62
@@ -1,46 +1 @@
-gtk+-2.4.9.tar.bz2
-update-scripts.tar.gz
-gtk+-2.4.10.tar.bz2
-gtk+-2.4.13.tar.bz2
-gtk+-2.4.14.tar.bz2
-gtk+-2.6.0.tar.bz2
-gtk+-2.6.1.tar.bz2
-gtk+-2.6.2.tar.bz2
-gtk+-2.6.3.tar.bz2
-gtk+-2.6.4.tar.bz2
-gtk+-2.6.5.tar.bz2
-gtk+-2.6.6.tar.gz
-gtk+-2.6.7.tar.bz2
-gtk+-2.7.0.tar.bz2
-gtk+-2.7.1.tar.bz2
-gtk+-2.7.2.tar.bz2
-gtk+-2.7.3.tar.bz2
-gtk+-2.7.4.tar.bz2
-gtk+-2.7.5.tar.bz2
-gtk+-2.8.0.tar.bz2
-gtk+-2.8.3.tar.bz2
-gtk+-2.8.4.tar.bz2
-gtk+-2.8.5.tar.bz2
-gtk+-2.8.6.tar.bz2
-gtk+-2.8.7.tar.bz2
-gtk+-2.8.8.tar.bz2
-gtk+-2.8.9.tar.bz2
-gtk+-2.8.10.tar.bz2
-gtk+-2.8.11.tar.bz2
-gtk+-2.8.12.tar.bz2
-gtk+-2.8.13.tar.bz2
-gtk+-2.8.14.tar.bz2
-gtk+-2.8.15.tar.bz2
-gtk+-2.8.15.tar.bz2
-gtk+-2.8.16.tar.bz2
-gtk+-2.8.17.tar.bz2
-gtk+-2.9.0.tar.bz2
-gtk+-2.9.1.tar.bz2
-gtk+-2.9.2.tar.bz2
-gtk+-2.9.3.tar.bz2
-gtk+-2.9.4.tar.bz2
-gtk+-2.10.0.tar.bz2
-gtk+-2.10.1.tar.bz2
-gtk+-2.10.2.tar.bz2
-gtk+-2.10.3.tar.bz2
-gtk+-2.10.4.tar.bz2
+gtk+-2.10.12.tar.bz2
Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-6/gtk2.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- gtk2.spec 3 Apr 2007 17:16:17 -0000 1.203
+++ gtk2.spec 31 May 2007 02:33:35 -0000 1.204
@@ -10,13 +10,13 @@
%define cairo_version %{cairo_base_version}-1
%define libpng_version 2:1.2.2-16
-%define base_version 2.10.8
+%define base_version 2.10.12
%define bin_version 2.10.0
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk2
Version: %{base_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
License: LGPL
Group: System Environment/Libraries
Source: gtk+-%{version}.tar.bz2
@@ -27,17 +27,13 @@
# Fedora patch
Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch
# Filechooser search
-Patch2: gtk+-2.10.8-search.patch
+Patch2: gtk+-2.10.12-search.patch
# use fam for recent-files
Patch3: gtk+-2.10.3-fam.patch
-
# backport from HEAD
Patch7: gtk+-2.10.7-cursor-blink.patch
-
# fixed in upstream cvs
Patch10: gtk+-2.10.4-im-reset.patch
-Patch11: gtk+-2.10.8-recent-menu-crash.patch
-Patch12: raw-printers.patch
BuildPrereq: atk-devel >= %{atk_version}
BuildPrereq: pango-devel >= %{pango_version}
@@ -122,12 +118,8 @@
%patch1 -p1 -b .set-invisible-char-to-bullet
%patch2 -p1 -b .search
%patch3 -p1 -b .fam
-
%patch7 -p1 -b .cursor-blink
-
%patch10 -p1 -b .im-reset
-%patch11 -p1 -b .recent-menu-crash
-%patch12 -p1 -b .raw-printers
for i in config.guess config.sub ; do
test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -301,6 +293,9 @@
%doc tmpdocs/examples
%changelog
+* Wed May 30 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.12-1
+- Update to 2.10.12
+
* Tue Apr 3 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.8-3
- Apply a patch to make raw printers work (#219806)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-6/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources 17 Jan 2007 14:14:07 -0000 1.68
+++ sources 31 May 2007 02:33:35 -0000 1.69
@@ -1,2 +1 @@
-25e73f5bdf6a1272799d0536a869f645 update-scripts.tar.gz
-46bfef60f02c39acdcdba2ac46825db4 gtk+-2.10.8.tar.bz2
+cf969c62134c662ff07e64613ed6c11f gtk+-2.10.12.tar.bz2
More information about the fedora-cvs-commits
mailing list