Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome
In directory vz-cvs-3.sog:/tmp/cvs-serv5347
Modified Files:
gtk+2.info gtk+2.patch
Log Message:
fix build on 10.6/i386 by removing a many-versions-old (both in upstream and
osx senses) X_LOCALE hack that now breaks building on many platforms.
Index: gtk+2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/gtk+2.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gtk+2.patch 6 May 2012 18:44:28 -0000 1.12
+++ gtk+2.patch 22 Sep 2012 21:14:22 -0000 1.13
@@ -67,21 +67,6 @@
all: all-am
.SUFFIXES:
-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>
- #include <errno.h>
-+#if defined(X_LOCALE)
-+#include <X11/Xlocale.h>
-+#else
- #include <locale.h>
-+#endif
- #include "widgets.h"
- #include "shadow.h"
-
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
@@ -94,21 +79,6 @@
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.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"
-
- #include <string.h>
-+#if defined(X_LOCALE)
-+#include <X11/Xlocale.h>
-+#else
- #include <locale.h>
-+#endif
-
- #include "gdkdirectfb.h"
-
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
@@ -177,36 +147,6 @@
*format = XRenderFindFormat (xdisplay,
(PictFormatType | PictFormatDepth |
-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>
- #include <X11/Xos.h>
-+#if defined(X_LOCALE)
-+#include <X11/Xlocale.h>
-+#else
- #include <locale.h>
-+#endif
-
- #include "gdkx.h"
- #include "gdkfont.h"
-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"
-
-+#if defined(X_LOCALE)
-+#include <X11/Xlocale.h>
-+#else
- #include <locale.h>
-+#endif
- #include <stdlib.h>
- #include <string.h>
-
diff -Nurd -x'*~' gtk+-2.18.9.orig/gdk-pixbuf/io-png.c
gtk+-2.18.9/gdk-pixbuf/io-png.c
--- gtk+-2.18.9.orig/gdk-pixbuf/io-png.c 2010-03-17 09:31:41.000000000
-0400
+++ gtk+-2.18.9/gdk-pixbuf/io-png.c 2011-07-25 02:27:01.000000000 -0400
@@ -286,127 +226,6 @@
else:
prop.appendChild(self._dom.createTextNode(""))
-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"
-
- #include <string.h>
-+#if defined(X_LOCALE)
-+#include <X11/Xlocale.h>
-+#else
- #include <locale.h>
-+#endif
-
- #include "gtkimmulticontext.h"
- #include "gtkimmodule.h"
-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"
-
-+#if defined(X_LOCALE)
-+#include <X11/Xlocale.h>
-+#else
- #include <locale.h>
-+#endif
-
- #include <stdio.h>
- #include <stdlib.h>
-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"
- #include <string.h>
-+#if defined(X_LOCALE)
-+#include <X11/Xlocale.h>
-+#else
- #include <locale.h>
-+#endif
-
- #include "gtkintl.h"
- #include "gtkprivate.h"
-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>
- #include <stdlib.h>
-+#if defined(X_LOCALE)
-+#include <X11/Xlocale.h>
-+#else
- #include <locale.h>
-+#endif
- #if defined(HAVE__NL_PAPER_HEIGHT) && defined(HAVE__NL_PAPER_WIDTH)
- #include <langinfo.h>
- #endif
-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"
-
-+#if defined(X_LOCALE)
-+#include <X11/Xlocale.h>
-+#else
- #include <locale.h>
-+#endif
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-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>
- #include <string.h>
-+#if defined(X_LOCALE)
-+#include <X11/Xlocale.h>
-+#else
- #include <locale.h>
-+#endif
- #include "gdk/gdkkeysyms.h"
- #include "gtkbindings.h"
- #include "gtkspinbutton.h"
-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>
- #include <string.h>
-+#if defined(X_LOCALE)
-+#include <X11/Xlocale.h>
-+#else
- #include <locale.h>
-+#endif
- #include "gtkcontainer.h"
- #include "gtkaccelmap.h"
- #include "gtkclipboard.h"
-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 @@
- */
-
- #include "config.h"
--#include "locale.h"
-+#if defined(X_LOCALE)
-+#include <X11/Xlocale.h>
-+#else
-+#include <locale.h>
-+#endif
- #include <string.h>
- #include <stdlib.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
@@ -451,21 +270,6 @@
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>
- #include <string.h>
-+#if defined(X_LOCALE)
-+#include <X11/Xlocale.h>
-+#else
- #include <locale.h>
-+#endif
-
- static void
- usage (void)
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
Index: gtk+2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/gtk+2.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gtk+2.info 6 May 2012 18:44:28 -0000 1.19
+++ gtk+2.info 22 Sep 2012 21:14:22 -0000 1.20
@@ -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: 3c9d902e00d7f542e776ee4002b0dc09
+PatchFile-MD5: 7396574a6965ffbfbbce63e15454048a
PatchScript: <<
#!/bin/sh -ev
sed -e 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
@@ -61,7 +61,7 @@
perl -pi -e 's,libpng12,libpng15,' configure
<<
-SetCPPFLAGS: -DX_LOCALE -I%p/lib/fontconfig2/include
-D_IPP_PRIVATE_STRUCTURES=1
+SetCPPFLAGS: -I%p/lib/fontconfig2/include -D_IPP_PRIVATE_STRUCTURES=1
SetLDFLAGS: -L%p/lib/fontconfig2/lib
SetCFLAGS: -Os
SetCXXFLAGS: -Os
------------------------------------------------------------------------------
How fast is your code?
3 out of 4 devs don\\\'t know how their code performs in production.
Find out how slow your code is with AppDynamics Lite.
http://ad.doubleclick.net/clk;262219672;13503038;z?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
