Update of /cvsroot/fink/experimental/dmacks/finkinfo/gnome-2.28
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1698
Modified Files:
gtk+2.info gtk+2.patch
Log Message:
more portable cups fix
Index: gtk+2.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome-2.28/gtk+2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gtk+2.patch 16 Mar 2010 07:35:58 -0000 1.3
+++ gtk+2.patch 19 Mar 2010 01:36:21 -0000 1.4
@@ -1,6 +1,6 @@
-diff -Nurd -x'*~' gtk+-2.18.8.orig/Makefile.in gtk+-2.18.8/Makefile.in
---- gtk+-2.18.8.orig/Makefile.in 2010-03-15 18:37:28.000000000 -0400
-+++ gtk+-2.18.8/Makefile.in 2010-03-16 02:42:13.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/Makefile.in gtk+-2.18.9/Makefile.in
+--- gtk+-2.18.9.orig/Makefile.in 2010-03-17 09:54:37.000000000 -0400
++++ gtk+-2.18.9/Makefile.in 2010-03-18 21:30:52.000000000 -0400
@@ -469,7 +469,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11
target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -10,9 +10,9 @@
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
# require automake 1.4
-diff -Nurd -x'*~' gtk+-2.18.8.orig/configure gtk+-2.18.8/configure
---- gtk+-2.18.8.orig/configure 2010-03-15 18:37:29.000000000 -0400
-+++ gtk+-2.18.8/configure 2010-03-16 02:42:14.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/configure gtk+-2.18.9/configure
+--- gtk+-2.18.9.orig/configure 2010-03-17 09:54:39.000000000 -0400
++++ gtk+-2.18.9/configure 2010-03-18 21:30:52.000000000 -0400
@@ -23842,6 +23842,7 @@
# Check for Xinerama extension (Solaris impl or Xfree impl)
gtk_save_cppflags="$CPPFLAGS"
@@ -30,9 +30,9 @@
$as_echo "#define HAVE_RANDR 1" >>confdefs.h
-diff -Nurd -x'*~' gtk+-2.18.8.orig/docs/reference/gdk-pixbuf/Makefile.in
gtk+-2.18.8/docs/reference/gdk-pixbuf/Makefile.in
---- gtk+-2.18.8.orig/docs/reference/gdk-pixbuf/Makefile.in 2010-03-15
18:37:23.000000000 -0400
-+++ gtk+-2.18.8/docs/reference/gdk-pixbuf/Makefile.in 2010-03-16
02:42:14.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/docs/reference/gdk-pixbuf/Makefile.in
gtk+-2.18.9/docs/reference/gdk-pixbuf/Makefile.in
+--- gtk+-2.18.9.orig/docs/reference/gdk-pixbuf/Makefile.in 2010-03-17
09:54:26.000000000 -0400
++++ gtk+-2.18.9/docs/reference/gdk-pixbuf/Makefile.in 2010-03-18
21:30:52.000000000 -0400
@@ -463,8 +463,8 @@
@ENABLE_GTK_DOC_TRUE@@gtk_doc_build_pdf_t...@pdf_build_stamp = pdf-build.stamp
@@ -44,9 +44,9 @@
all: all-am
.SUFFIXES:
-diff -Nurd -x'*~' gtk+-2.18.8.orig/docs/reference/gtk/Makefile.in
gtk+-2.18.8/docs/reference/gtk/Makefile.in
---- gtk+-2.18.8.orig/docs/reference/gtk/Makefile.in 2010-03-15
18:37:23.000000000 -0400
-+++ gtk+-2.18.8/docs/reference/gtk/Makefile.in 2010-03-16 02:42:14.000000000
-0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/docs/reference/gtk/Makefile.in
gtk+-2.18.9/docs/reference/gtk/Makefile.in
+--- gtk+-2.18.9.orig/docs/reference/gtk/Makefile.in 2010-03-17
09:54:27.000000000 -0400
++++ gtk+-2.18.9/docs/reference/gtk/Makefile.in 2010-03-18 21:30:52.000000000
-0400
@@ -753,8 +753,8 @@
@ENABLE_GTK_DOC_TRUE@@gtk_doc_build_pdf_t...@pdf_build_stamp = pdf-build.stamp
@@ -58,9 +58,9 @@
all: all-am
.SUFFIXES:
-diff -Nurd -x'*~' gtk+-2.18.8.orig/docs/tools/shooter.c
gtk+-2.18.8/docs/tools/shooter.c
---- gtk+-2.18.8.orig/docs/tools/shooter.c 2009-06-04 15:18:03.000000000
-0400
-+++ gtk+-2.18.8/docs/tools/shooter.c 2010-03-16 02:42:14.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/docs/tools/shooter.c
gtk+-2.18.9/docs/tools/shooter.c
+--- gtk+-2.18.9.orig/docs/tools/shooter.c 2009-06-04 15:18:03.000000000
-0400
++++ gtk+-2.18.9/docs/tools/shooter.c 2010-03-18 21:30:52.000000000 -0400
@@ -16,7 +16,11 @@
#include <stdlib.h>
#include <fcntl.h>
@@ -73,9 +73,9 @@
#include "widgets.h"
#include "shadow.h"
-diff -Nurd -x'*~' gtk+-2.18.8.orig/gdk/Makefile.in gtk+-2.18.8/gdk/Makefile.in
---- gtk+-2.18.8.orig/gdk/Makefile.in 2010-03-15 18:37:24.000000000 -0400
-+++ gtk+-2.18.8/gdk/Makefile.in 2010-03-16 02:42:14.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/gdk/Makefile.in gtk+-2.18.9/gdk/Makefile.in
+--- gtk+-2.18.9.orig/gdk/Makefile.in 2010-03-17 09:54:29.000000000 -0400
++++ gtk+-2.18.9/gdk/Makefile.in 2010-03-18 21:30:52.000000000 -0400
@@ -655,7 +655,7 @@
libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
@@ -85,9 +85,9 @@
libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-diff -Nurd -x'*~' gtk+-2.18.8.orig/gdk/directfb/gdkim-directfb.c
gtk+-2.18.8/gdk/directfb/gdkim-directfb.c
---- gtk+-2.18.8.orig/gdk/directfb/gdkim-directfb.c 2009-06-04
15:18:03.000000000 -0400
-+++ gtk+-2.18.8/gdk/directfb/gdkim-directfb.c 2010-03-16 02:42:14.000000000
-0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/gdk/directfb/gdkim-directfb.c
gtk+-2.18.9/gdk/directfb/gdkim-directfb.c
+--- gtk+-2.18.9.orig/gdk/directfb/gdkim-directfb.c 2009-06-04
15:18:03.000000000 -0400
++++ gtk+-2.18.9/gdk/directfb/gdkim-directfb.c 2010-03-18 21:30:52.000000000
-0400
@@ -33,7 +33,11 @@
#include "config.h"
@@ -100,9 +100,9 @@
#include "gdkdirectfb.h"
-diff -Nurd -x'*~' gtk+-2.18.8.orig/gdk/x11/gdkdrawable-x11.c
gtk+-2.18.8/gdk/x11/gdkdrawable-x11.c
---- gtk+-2.18.8.orig/gdk/x11/gdkdrawable-x11.c 2010-01-07 15:04:55.000000000
-0500
-+++ gtk+-2.18.8/gdk/x11/gdkdrawable-x11.c 2010-03-16 02:42:14.000000000
-0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/gdk/x11/gdkdrawable-x11.c
gtk+-2.18.9/gdk/x11/gdkdrawable-x11.c
+--- gtk+-2.18.9.orig/gdk/x11/gdkdrawable-x11.c 2010-01-07 15:04:55.000000000
-0500
++++ gtk+-2.18.9/gdk/x11/gdkdrawable-x11.c 2010-03-18 21:30:52.000000000
-0400
@@ -1044,11 +1044,19 @@
* RENDER's preferred order
*/
@@ -168,9 +168,9 @@
*format = XRenderFindFormat (xdisplay,
(PictFormatType | PictFormatDepth |
-diff -Nurd -x'*~' gtk+-2.18.8.orig/gdk/x11/gdkfont-x11.c
gtk+-2.18.8/gdk/x11/gdkfont-x11.c
---- gtk+-2.18.8.orig/gdk/x11/gdkfont-x11.c 2009-06-04 15:18:03.000000000
-0400
-+++ gtk+-2.18.8/gdk/x11/gdkfont-x11.c 2010-03-16 02:42:14.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/gdk/x11/gdkfont-x11.c
gtk+-2.18.9/gdk/x11/gdkfont-x11.c
+--- gtk+-2.18.9.orig/gdk/x11/gdkfont-x11.c 2009-06-04 15:18:03.000000000
-0400
++++ gtk+-2.18.9/gdk/x11/gdkfont-x11.c 2010-03-18 21:30:52.000000000 -0400
@@ -29,7 +29,11 @@
#include "config.h"
#include <X11/Xlib.h>
@@ -183,9 +183,9 @@
#include "gdkx.h"
#include "gdkfont.h"
-diff -Nurd -x'*~' gtk+-2.18.8.orig/gdk/x11/gdkim-x11.c
gtk+-2.18.8/gdk/x11/gdkim-x11.c
---- gtk+-2.18.8.orig/gdk/x11/gdkim-x11.c 2010-03-15 15:32:37.000000000
-0400
-+++ gtk+-2.18.8/gdk/x11/gdkim-x11.c 2010-03-16 02:42:14.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/gdk/x11/gdkim-x11.c
gtk+-2.18.9/gdk/x11/gdkim-x11.c
+--- gtk+-2.18.9.orig/gdk/x11/gdkim-x11.c 2010-03-17 09:31:43.000000000
-0400
++++ gtk+-2.18.9/gdk/x11/gdkim-x11.c 2010-03-18 21:30:52.000000000 -0400
@@ -26,7 +26,11 @@
#include "config.h"
@@ -198,9 +198,9 @@
#include <stdlib.h>
#include <string.h>
-diff -Nurd -x'*~' gtk+-2.18.8.orig/gtk/gtk-builder-convert
gtk+-2.18.8/gtk/gtk-builder-convert
---- gtk+-2.18.8.orig/gtk/gtk-builder-convert 2009-10-09 00:11:26.000000000
-0400
-+++ gtk+-2.18.8/gtk/gtk-builder-convert 2010-03-16 02:42:14.000000000
-0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/gtk/gtk-builder-convert
gtk+-2.18.9/gtk/gtk-builder-convert
+--- gtk+-2.18.9.orig/gtk/gtk-builder-convert 2009-10-09 00:11:26.000000000
-0400
++++ gtk+-2.18.9/gtk/gtk-builder-convert 2010-03-18 21:30:52.000000000
-0400
@@ -527,12 +527,12 @@
if prop.childNodes:
data = prop.childNodes[0].data
@@ -220,9 +220,9 @@
else:
prop.appendChild(self._dom.createTextNode(""))
-diff -Nurd -x'*~' gtk+-2.18.8.orig/gtk/gtkimmulticontext.c
gtk+-2.18.8/gtk/gtkimmulticontext.c
---- gtk+-2.18.8.orig/gtk/gtkimmulticontext.c 2010-03-15 15:32:39.000000000
-0400
-+++ gtk+-2.18.8/gtk/gtkimmulticontext.c 2010-03-16 02:42:14.000000000
-0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/gtk/gtkimmulticontext.c
gtk+-2.18.9/gtk/gtkimmulticontext.c
+--- gtk+-2.18.9.orig/gtk/gtkimmulticontext.c 2010-03-17 09:31:45.000000000
-0400
++++ gtk+-2.18.9/gtk/gtkimmulticontext.c 2010-03-18 21:30:52.000000000
-0400
@@ -20,7 +20,11 @@
#include "config.h"
@@ -235,9 +235,9 @@
#include "gtkimmulticontext.h"
#include "gtkimmodule.h"
-diff -Nurd -x'*~' gtk+-2.18.8.orig/gtk/gtkmain.c gtk+-2.18.8/gtk/gtkmain.c
---- gtk+-2.18.8.orig/gtk/gtkmain.c 2010-03-15 15:32:39.000000000 -0400
-+++ gtk+-2.18.8/gtk/gtkmain.c 2010-03-16 02:42:14.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/gtk/gtkmain.c gtk+-2.18.9/gtk/gtkmain.c
+--- gtk+-2.18.9.orig/gtk/gtkmain.c 2010-03-17 09:31:45.000000000 -0400
++++ gtk+-2.18.9/gtk/gtkmain.c 2010-03-18 21:30:52.000000000 -0400
@@ -29,7 +29,11 @@
#include <glib.h>
#include "gdkconfig.h"
@@ -250,9 +250,9 @@
#include <stdio.h>
#include <stdlib.h>
-diff -Nurd -x'*~' gtk+-2.18.8.orig/gtk/gtkpagesetupunixdialog.c
gtk+-2.18.8/gtk/gtkpagesetupunixdialog.c
---- gtk+-2.18.8.orig/gtk/gtkpagesetupunixdialog.c 2010-03-15
15:32:39.000000000 -0400
-+++ gtk+-2.18.8/gtk/gtkpagesetupunixdialog.c 2010-03-16 02:42:14.000000000
-0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/gtk/gtkpagesetupunixdialog.c
gtk+-2.18.9/gtk/gtkpagesetupunixdialog.c
+--- gtk+-2.18.9.orig/gtk/gtkpagesetupunixdialog.c 2010-03-17
09:31:45.000000000 -0400
++++ gtk+-2.18.9/gtk/gtkpagesetupunixdialog.c 2010-03-18 21:30:52.000000000
-0400
@@ -21,7 +21,11 @@
#include "config.h"
@@ -265,9 +265,9 @@
#include "gtkintl.h"
#include "gtkprivate.h"
-diff -Nurd -x'*~' gtk+-2.18.8.orig/gtk/gtkpapersize.c
gtk+-2.18.8/gtk/gtkpapersize.c
---- gtk+-2.18.8.orig/gtk/gtkpapersize.c 2010-03-15 15:32:39.000000000
-0400
-+++ gtk+-2.18.8/gtk/gtkpapersize.c 2010-03-16 02:42:14.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/gtk/gtkpapersize.c
gtk+-2.18.9/gtk/gtkpapersize.c
+--- gtk+-2.18.9.orig/gtk/gtkpapersize.c 2010-03-17 09:31:45.000000000
-0400
++++ gtk+-2.18.9/gtk/gtkpapersize.c 2010-03-18 21:30:52.000000000 -0400
@@ -22,7 +22,11 @@
#include "config.h"
#include <string.h>
@@ -280,9 +280,9 @@
#if defined(HAVE__NL_PAPER_HEIGHT) && defined(HAVE__NL_PAPER_WIDTH)
#include <langinfo.h>
#endif
-diff -Nurd -x'*~' gtk+-2.18.8.orig/gtk/gtkrc.c gtk+-2.18.8/gtk/gtkrc.c
---- gtk+-2.18.8.orig/gtk/gtkrc.c 2010-03-15 15:32:40.000000000 -0400
-+++ gtk+-2.18.8/gtk/gtkrc.c 2010-03-16 02:42:14.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/gtk/gtkrc.c gtk+-2.18.9/gtk/gtkrc.c
+--- gtk+-2.18.9.orig/gtk/gtkrc.c 2010-03-17 09:31:46.000000000 -0400
++++ gtk+-2.18.9/gtk/gtkrc.c 2010-03-18 21:30:52.000000000 -0400
@@ -26,7 +26,11 @@
#include "config.h"
@@ -295,9 +295,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-diff -Nurd -x'*~' gtk+-2.18.8.orig/gtk/gtkspinbutton.c
gtk+-2.18.8/gtk/gtkspinbutton.c
---- gtk+-2.18.8.orig/gtk/gtkspinbutton.c 2010-03-15 15:32:40.000000000
-0400
-+++ gtk+-2.18.8/gtk/gtkspinbutton.c 2010-03-16 02:42:14.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/gtk/gtkspinbutton.c
gtk+-2.18.9/gtk/gtkspinbutton.c
+--- gtk+-2.18.9.orig/gtk/gtkspinbutton.c 2010-03-17 09:31:47.000000000
-0400
++++ gtk+-2.18.9/gtk/gtkspinbutton.c 2010-03-18 21:30:52.000000000 -0400
@@ -32,7 +32,11 @@
#include <stdlib.h>
#include <math.h>
@@ -310,9 +310,9 @@
#include "gdk/gdkkeysyms.h"
#include "gtkbindings.h"
#include "gtkspinbutton.h"
-diff -Nurd -x'*~' gtk+-2.18.8.orig/gtk/gtkwidget.c gtk+-2.18.8/gtk/gtkwidget.c
---- gtk+-2.18.8.orig/gtk/gtkwidget.c 2010-03-15 15:32:44.000000000 -0400
-+++ gtk+-2.18.8/gtk/gtkwidget.c 2010-03-16 02:42:14.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/gtk/gtkwidget.c gtk+-2.18.9/gtk/gtkwidget.c
+--- gtk+-2.18.9.orig/gtk/gtkwidget.c 2010-03-17 09:31:48.000000000 -0400
++++ gtk+-2.18.9/gtk/gtkwidget.c 2010-03-18 21:30:52.000000000 -0400
@@ -27,7 +27,11 @@
#include "config.h"
#include <stdarg.h>
@@ -325,9 +325,9 @@
#include "gtkcontainer.h"
#include "gtkaccelmap.h"
#include "gtkclipboard.h"
-diff -Nurd -x'*~' gtk+-2.18.8.orig/modules/input/gtkimcontextxim.c
gtk+-2.18.8/modules/input/gtkimcontextxim.c
---- gtk+-2.18.8.orig/modules/input/gtkimcontextxim.c 2010-03-15
15:32:44.000000000 -0400
-+++ gtk+-2.18.8/modules/input/gtkimcontextxim.c 2010-03-16
02:42:14.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/modules/input/gtkimcontextxim.c
gtk+-2.18.9/modules/input/gtkimcontextxim.c
+--- gtk+-2.18.9.orig/modules/input/gtkimcontextxim.c 2010-03-17
09:31:49.000000000 -0400
++++ gtk+-2.18.9/modules/input/gtkimcontextxim.c 2010-03-18
21:30:52.000000000 -0400
@@ -18,7 +18,11 @@
*/
@@ -341,91 +341,53 @@
#include <string.h>
#include <stdlib.h>
-diff -Nurd -x'*~'
gtk+-2.18.8.orig/modules/printbackends/cups/gtkprintbackendcups.c
gtk+-2.18.8/modules/printbackends/cups/gtkprintbackendcups.c
---- gtk+-2.18.8.orig/modules/printbackends/cups/gtkprintbackendcups.c
2010-03-15 15:32:44.000000000 -0400
-+++ gtk+-2.18.8/modules/printbackends/cups/gtkprintbackendcups.c
2010-03-16 02:42:14.000000000 -0400
-@@ -54,6 +54,78 @@
-
- #include "gtkcupsutils.h"
+diff -Nurd -x'*~'
gtk+-2.18.9.orig/modules/printbackends/cups/gtkprintbackendcups.c
gtk+-2.18.9/modules/printbackends/cups/gtkprintbackendcups.c
+--- gtk+-2.18.9.orig/modules/printbackends/cups/gtkprintbackendcups.c
2010-03-17 09:31:49.000000000 -0400
++++ gtk+-2.18.9/modules/printbackends/cups/gtkprintbackendcups.c
2010-03-18 21:31:04.000000000 -0400
+@@ -663,6 +663,40 @@
+ return FALSE;
+ }
-+/*
-+ avoid needing to change function-name in copied code or its use
-+ later in this gtk source (and avoid multiply-defined symbol if
-+ libcups does have it)
-+*/
-+#define httpGetHostname my_httpGetHostname
-+
-+/* ***** begin included source from cups/http-addr.c ***** */
-+/* ***** that file is:
-+ * Copyright 2007-2009 by Apple Inc.
-+ * Copyright 1997-2006 by Easy Software Products, all rights reserved.
-+ and is LPGL licensed */
-+
-+/*
-+ * 'httpGetHostname()' - Get the FQDN for the connection or local system.
-+ *
-+ * When "http" points to a connected socket, return the hostname or
-+ * address that was used in the call to httpConnect() or httpConnectEncrypt().
-+ * Otherwise, return the FQDN for the local system using both gethostname()
-+ * and gethostbyname() to get the local hostname with domain.
-+ *
-+ * @since CUPS 1.2/Mac OS X 10.5@
-+ */
++#ifndef HAVE_CUPS_API_1_2
+
-+const char * /* O - FQDN for connection or system */
-+httpGetHostname(http_t *http, /* I - HTTP connection or NULL */
-+ char *s, /* I - String buffer for name */
-+ int slen) /* I - Size of buffer */
++const char *
++httpGetHostname(http_t *http,
++ char *s,
++ int slen)
+{
-+ struct hostent *host; /* Host entry to get FQDN */
-+
++ struct hostent *host;
+
+ if (!s || slen <= 1)
+ return (NULL);
+
+ if (http)
-+ {
-+ if (http->hostname[0] == '/')
-+ strlcpy(s, "localhost", slen);
-+ else
-+ strlcpy(s, http->hostname, slen);
-+ }
++ {
++ if (http->hostname[0] == '/')
++ g_strlcpy (s, "localhost", slen);
++ else
++ g_strlcpy (s, http->hostname, slen);
++ }
+ else
-+ {
-+ /*
-+ * Get the hostname...
-+ */
-+
-+ if (gethostname(s, slen) < 0)
-+ strlcpy(s, "localhost", slen);
-+
-+ if (!strchr(s, '.'))
+ {
-+ /*
-+ * The hostname is not a FQDN, so look it up...
-+ */
++ if (gethostname (s, slen) < 0)
++ g_strlcpy (s, "localhost", slen);
+
-+ if ((host = gethostbyname(s)) != NULL && host->h_name)
-+ strlcpy(s, host->h_name, slen);
++ if (!strchr (s, '.'))
++ {
++ if ((host = gethostbyname (s)) != NULL && host->h_name)
++ g_strlcpy (s, host->h_name, slen);
++ }
+ }
-+ }
-+
-+ /*
-+ * Return the hostname with as much domain info as we have...
-+ */
-+
+ return (s);
+}
++#endif
+
-+/* ***** end included source from cups/http-addr.c ***** */
-+
-+
-
- typedef struct _GtkPrintBackendCupsClass GtkPrintBackendCupsClass;
-
-diff -Nurd -x'*~' gtk+-2.18.8.orig/tests/testicontheme.c
gtk+-2.18.8/tests/testicontheme.c
---- gtk+-2.18.8.orig/tests/testicontheme.c 2009-06-04 15:18:04.000000000
-0400
-+++ gtk+-2.18.8/tests/testicontheme.c 2010-03-16 02:42:14.000000000 -0400
+ static void
+ gtk_print_backend_cups_set_password (GtkPrintBackend *backend,
+ gchar **auth_info_required,
+diff -Nurd -x'*~' gtk+-2.18.9.orig/tests/testicontheme.c
gtk+-2.18.9/tests/testicontheme.c
+--- gtk+-2.18.9.orig/tests/testicontheme.c 2009-06-04 15:18:04.000000000
-0400
++++ gtk+-2.18.9/tests/testicontheme.c 2010-03-18 21:30:52.000000000 -0400
@@ -21,7 +21,11 @@
#include <gtk/gtk.h>
#include <stdlib.h>
@@ -438,9 +400,9 @@
static void
usage (void)
-diff -Nurd -x'*~' gtk+-2.18.8.orig/update-gdk-pixbuf-loaders
gtk+-2.18.8/update-gdk-pixbuf-loaders
---- gtk+-2.18.8.orig/update-gdk-pixbuf-loaders 1969-12-31 19:00:00.000000000
-0500
-+++ gtk+-2.18.8/update-gdk-pixbuf-loaders 2010-03-16 02:42:14.000000000
-0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/update-gdk-pixbuf-loaders
gtk+-2.18.9/update-gdk-pixbuf-loaders
+--- gtk+-2.18.9.orig/update-gdk-pixbuf-loaders 1969-12-31 19:00:00.000000000
-0500
++++ gtk+-2.18.9/update-gdk-pixbuf-loaders 2010-03-18 21:30:52.000000000
-0400
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+#
@@ -463,9 +425,9 @@
+chmod 0644 $CONFFILE
+
+exit 0
-diff -Nurd -x'*~' gtk+-2.18.8.orig/update-gtk-immodules
gtk+-2.18.8/update-gtk-immodules
---- gtk+-2.18.8.orig/update-gtk-immodules 1969-12-31 19:00:00.000000000
-0500
-+++ gtk+-2.18.8/update-gtk-immodules 2010-03-16 02:42:14.000000000 -0400
+diff -Nurd -x'*~' gtk+-2.18.9.orig/update-gtk-immodules
gtk+-2.18.9/update-gtk-immodules
+--- gtk+-2.18.9.orig/update-gtk-immodules 1969-12-31 19:00:00.000000000
-0500
++++ gtk+-2.18.9/update-gtk-immodules 2010-03-18 21:30:52.000000000 -0400
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
Index: gtk+2.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome-2.28/gtk+2.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gtk+2.info 17 Mar 2010 17:28:27 -0000 1.12
+++ gtk+2.info 19 Mar 2010 01:36:21 -0000 1.13
@@ -1,6 +1,6 @@
Package: gtk+2
Version: 2.18.9
-Revision: 1
+Revision: 2
Description: The Gimp Toolkit
License: LGPL
Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
@@ -42,7 +42,7 @@
Source2: mirror:debian:pool/main/g/gtk+2.0/gtk+2.0_2.18.7-1.diff.gz
Source2-MD5: 4a41c6d2b5d29833759610abe1268686
PatchFile: %n.patch
-PatchFile-MD5: f3390b39e2247549f75b02aaf07ef7cb
+PatchFile-MD5: a247fc5d9970a301720b1362c1758069
PatchScript: <<
#!/bin/sh -ev
sed -e 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
@@ -326,9 +326,8 @@
http://permalink.gmane.org/gmane.os.apple.fink.general/27311
CUPS backend uses httpGetHostname(), which is only available
- with cups>=1.2, which only comes with OS X >= 10.5. Copy
- source for that function from recent cups upstream so we are
- portable back to 10.4 with older cups. See:
+ with cups>=1.2, which only comes with OS X >= 10.5. Use
+ upstream patch to import local copy of that function for
+ platforms where system cups is too old.
https://bugzilla.gnome.org/show_bug.cgi?id=610176
- http://svn.easysw.com/public/cups/trunk/cups/http-addr.c
<<
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
