Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1b2822689d9534ca518712b060e685d4e4a6614f
commit 1b2822689d9534ca518712b060e685d4e4a6614f
Author: crazy <[EMAIL PROTECTED]>
Date: Wed Oct 17 17:26:14 2007 +0200
gtk+2-2.12.1-1-i686
* removed all merged patches
diff --git a/source/xlib/gtk+2/cups-1.3.X.patch
b/source/xlib/gtk+2/cups-1.3.X.patch
deleted file mode 100644
index c4290cd..0000000
--- a/source/xlib/gtk+2/cups-1.3.X.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur gtk+-2.10.14/modules/printbackends/cups/gtkcupsutils.c
gtk+-2.10.14-p/modules/printbackends/cups/gtkcupsutils.c
---- gtk+-2.10.14/modules/printbackends/cups/gtkcupsutils.c 2007-07-16
21:45:18.000000000 +0200
-+++ gtk+-2.10.14-p/modules/printbackends/cups/gtkcupsutils.c 2007-09-07
20:20:19.000000000 +0200
-@@ -30,8 +30,10 @@
- #include <stdlib.h>
- #include <time.h>
-
--#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR
> 1) || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR == 1 &&
CUPS_VERSION_PATCH >= 20)
--#define HAVE_HTTP_AUTHSTRING 1
-+#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR == 1 && CUPS_VERSION_PATCH
>= 20) || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR == 2 &&
CUPS_VERSION_PATCH >= 0)
-+#define OLD_API 1
-+#elif (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR == 3 &&
CUPS_VERSION_PATCH >= 0)
-+#define NEW_API 1
- #endif
-
- typedef void (*GtkCupsRequestStateFunc) (GtkCupsRequest *request);
-@@ -627,8 +629,10 @@
- httpClearFields(request->http);
- httpSetField(request->http, HTTP_FIELD_CONTENT_LENGTH, length);
- httpSetField(request->http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
--#ifdef HAVE_HTTP_AUTHSTRING
-+#if defined(OLD_API)
- httpSetField(request->http, HTTP_FIELD_AUTHORIZATION,
request->http->authstring);
-+#elif defined(NEW_API)
-+ httpSetField (request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString
(request->http));
- #endif
-
- if (httpPost(request->http, request->resource))
-@@ -966,8 +970,10 @@
- }
-
- httpClearFields(request->http);
--#ifdef HAVE_HTTP_AUTHSTRING
-+#if defined(OLD_API)
- httpSetField(request->http, HTTP_FIELD_AUTHORIZATION,
request->http->authstring);
-+#elif defined(NEW_API)
-+ httpSetField (request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString
(request->http));
- #endif
-
- if (httpGet(request->http, request->resource))
diff --git a/source/xlib/gtk+2/gtk+-2.12.0-fix-pidgin-issues.patch
b/source/xlib/gtk+2/gtk+-2.12.0-fix-pidgin-issues.patch
deleted file mode 100644
index 04455c6..0000000
--- a/source/xlib/gtk+2/gtk+-2.12.0-fix-pidgin-issues.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: gtk/gtkiconfactory.c
-===================================================================
---- gtk/gtkiconfactory.c (revision 18848)
-+++ gtk/gtkiconfactory.c (working copy)
-@@ -831,6 +831,9 @@
-
- init_icon_sizes ();
-
-+ if (size == (GtkIconSize)-1)
-+ return FALSE;
-+
- if (size >= icon_sizes_used)
- return FALSE;
-
-@@ -1338,7 +1341,7 @@
-
- if ((s->any_direction || (s->direction == direction)) &&
- (s->any_state || (s->state == state)) &&
-- (s->any_size || (sizes_equivalent (size, s->size))))
-+ (s->any_size || size == (GtkIconSize)-1 || (sizes_equivalent (size,
s->size))))
- {
- if (!g_slist_find (failed, s))
- {
-@@ -1417,7 +1420,7 @@
-
- if (!gtk_icon_size_lookup_for_settings (settings, size, &width, &height))
- {
-- if (size == -1)
-+ if (size == (GtkIconSize)-1)
- {
- /* Find an available size close to 48
- */
-@@ -2438,7 +2441,7 @@
- if (icon->style == style &&
- icon->direction == direction &&
- icon->state == state &&
-- icon->size == size)
-+ (size == (GtkIconSize)-1 || icon->size == size))
- {
- if (prev)
- {
diff --git a/source/xlib/gtk+2/gtk+-2.12.0-icon-cache-speedup.patch
b/source/xlib/gtk+2/gtk+-2.12.0-icon-cache-speedup.patch
deleted file mode 100644
index 99311df..0000000
--- a/source/xlib/gtk+2/gtk+-2.12.0-icon-cache-speedup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN
gtk+-2.12.0.orig/gtk/gtkiconcache.c gtk+-2.12.0/gtk/gtkiconcache.c
---- gtk+-2.12.0.orig/gtk/gtkiconcache.c 2007-09-13 16:35:41.000000000
-0400
-+++ gtk+-2.12.0/gtk/gtkiconcache.c 2007-09-14 15:33:01.000000000 -0400
-@@ -127,14 +127,19 @@ _gtk_icon_cache_new_for_path (const gcha
- info.n_directories = 0;
- info.flags = CHECK_OFFSETS|CHECK_STRINGS;
-
-- if (!_gtk_icon_cache_validate (&info))
-+#ifdef G_ENABLE_DEBUG
-+ if (gtk_debug_flags & GTK_DEBUG_ICONTHEME)
- {
-- g_mapped_file_free (map);
-- g_warning ("Icon cache '%s' is invalid\n", cache_filename);
-+ if (!_gtk_icon_cache_validate (&info))
-+ {
-+ g_mapped_file_free (map);
-+ g_warning ("Icon cache '%s' is invalid\n", cache_filename);
-
-- goto done;
-+ goto done;
-+ }
- }
--
-+#endif
-+
- GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path));
-
- cache = g_new0 (GtkIconCache, 1);
diff --git a/source/xlib/gtk+2/gtk+-2.12.0-libtracker_so.patch
b/source/xlib/gtk+2/gtk+-2.12.0-libtracker_so.patch
deleted file mode 100644
index d5f3fdd..0000000
--- a/source/xlib/gtk+2/gtk+-2.12.0-libtracker_so.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- gtk/gtksearchenginetracker.c 2007/06/22 14:32:22 18219
-+++ gtk/gtksearchenginetracker.c 2007/09/18 21:48:01 18846
-@@ -71,10 +71,16 @@
- {
- 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;
-
diff --git a/source/xlib/gtk+2/gtk+-2.12.0-searchenginesimple-crash-fix.patch
b/source/xlib/gtk+2/gtk+-2.12.0-searchenginesimple-crash-fix.patch
deleted file mode 100644
index af9aeb1..0000000
--- a/source/xlib/gtk+2/gtk+-2.12.0-searchenginesimple-crash-fix.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Index: gtk/gtksearchenginesimple.c
-===================================================================
---- gtk/gtksearchenginesimple.c (revision 18864)
-+++ gtk/gtksearchenginesimple.c (working copy)
-@@ -72,19 +72,27 @@ struct _GtkSearchEngineSimplePrivate
- G_DEFINE_TYPE (GtkSearchEngineSimple, _gtk_search_engine_simple,
GTK_TYPE_SEARCH_ENGINE);
-
- static void
--finalize (GObject *object)
-+gtk_search_engine_simple_dispose (GObject *object)
- {
- GtkSearchEngineSimple *simple;
-+ GtkSearchEngineSimplePrivate *priv;
-
- simple = GTK_SEARCH_ENGINE_SIMPLE (object);
-+ priv = simple->priv;
-
-- if (simple->priv->query)
-+ if (priv->query)
-+ {
-+ g_object_unref (priv->query);
-+ priv->query = NULL;
-+ }
-+
-+ if (priv->active_search)
- {
-- g_object_unref (simple->priv->query);
-- simple->priv->query = NULL;
-+ priv->active_search->cancelled = TRUE;
-+ priv->active_search = NULL;
- }
-
-- G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->finalize (object);
-+ G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->dispose (object);
- }
-
- static SearchThreadData *
-@@ -131,12 +139,10 @@ search_thread_done_idle (gpointer user_d
-
- data = user_data;
-
-- if (!data->cancelled)
-- {
-- _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
-- data->engine->priv->active_search = NULL;
-- }
--
-+ if (!data->cancelled)
-+ _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
-+
-+ data->engine->priv->active_search = NULL;
- search_thread_data_free (data);
-
- return FALSE;
-@@ -181,6 +187,7 @@ send_batch (SearchThreadData *data)
- hits = g_new (SearchHits, 1);
- hits->uris = data->uri_hits;
- hits->thread_data = data;
-+
- gdk_threads_add_idle (search_thread_add_hits_idle, hits);
- }
- data->uri_hits = NULL;
-@@ -349,7 +356,7 @@ _gtk_search_engine_simple_class_init (Gt
- GtkSearchEngineClass *engine_class;
-
- gobject_class = G_OBJECT_CLASS (class);
-- gobject_class->finalize = finalize;
-+ gobject_class->dispose = gtk_search_engine_simple_dispose;
-
- engine_class = GTK_SEARCH_ENGINE_CLASS (class);
- engine_class->set_query = gtk_search_engine_simple_set_query;
-Index: gtk/gtkfilechooserdefault.c
-===================================================================
---- gtk/gtkfilechooserdefault.c (revision 18864)
-+++ gtk/gtkfilechooserdefault.c (working copy)
-@@ -8994,6 +8994,8 @@ search_stop_searching (GtkFileChooserDef
-
- if (impl->search_engine)
- {
-+ _gtk_search_engine_stop (impl->search_engine);
-+
- g_object_unref (impl->search_engine);
- impl->search_engine = NULL;
- }
diff --git a/source/xlib/gtk+2/gtk+-2.12.0-swt-tooltips-fix.patch
b/source/xlib/gtk+2/gtk+-2.12.0-swt-tooltips-fix.patch
deleted file mode 100644
index 8277cdf..0000000
--- a/source/xlib/gtk+2/gtk+-2.12.0-swt-tooltips-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix http://bugzilla.gnome.org/show_bug.cgi?id=460194
-Patch from
http://svn.gnome.org/viewcvs/gtk%2B/trunk/gtk/gtktooltips.c?view=patch&r1=18864&r2=18863&pathrev=18864
-Will be part of gtk+-2.12.1
-
---- trunk/gtk/gtktooltips.c 2007/09/24 17:13:40 18863
-+++ trunk/gtk/gtktooltips.c 2007/09/24 18:23:01 18864
-@@ -230,6 +230,7 @@
- }
-
- if (tooltips->active_tips_data
-+ && tooltipsdata
- && tooltips->active_tips_data->widget == widget
- && GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget))
- {
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
