Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3905/10.4-transitional/unstable/main/finkinfo/gnome
Modified Files:
gtk+2.info gtk+2.patch
Log Message:
New version. Cleaned-up patchfile. Fixed _environ in 10.3.
Index: gtk+2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/gtk+2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gtk+2.patch 20 Jun 2005 05:40:18 -0000 1.3
+++ gtk+2.patch 21 Oct 2005 00:17:52 -0000 1.4
@@ -1,7 +1,7 @@
-diff -Naur gtk+-2.4.0-old/configure gtk+-2.4.0/configure
---- gtk+-2.4.0-old/configure Tue Mar 16 15:27:05 2004
-+++ gtk+-2.4.0/configure Wed Mar 17 09:44:18 2004
-@@ -26465,7 +26465,7 @@
+diff -Nurd -x'*~' gtk+-2.6.10.orig/configure gtk+-2.6.10/configure
+--- gtk+-2.6.10.orig/configure 2005-08-18 10:12:43.000000000 -0400
++++ gtk+-2.6.10/configure 2005-10-20 16:14:41.000000000 -0400
+@@ -27821,7 +27821,7 @@
if $have_freetype ; then
gtk_save_cppflags="$CPPFLAGS"
@@ -10,7 +10,7 @@
echo "$as_me:$LINENO: checking For sufficiently new FreeType (at least
2.0.1)" >&5
echo $ECHO_N "checking For sufficiently new FreeType (at least 2.0.1)...
$ECHO_C" >&6
-@@ -28217,7 +28217,7 @@
+@@ -29573,7 +29573,7 @@
# GTK+ uses some X calls, so needs to link against X directly
if test $enable_explicit_deps != yes ; then
@@ -19,7 +19,7 @@
fi
# Check for Xinerama extension (Solaris impl or Xfree impl)
-@@ -28348,7 +28348,8 @@
+@@ -29704,7 +29704,8 @@
fi
echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5
echo "${ECHO_T}$ac_cv_header_X11_extensions_xinerama_h" >&6
@@ -29,10 +29,10 @@
case "$x_extra_libs " in
*-lXext[\ \ ]*) ;;
*) x_extra_libs="-lXext $x_extra_libs" ;;
-diff -Naur gtk+-2.4.0-old/demos/Makefile.in gtk+-2.4.0/demos/Makefile.in
---- gtk+-2.4.0-old/demos/Makefile.in Tue Mar 16 15:26:54 2004
-+++ gtk+-2.4.0/demos/Makefile.in Wed Mar 17 09:40:39 2004
-@@ -360,7 +360,9 @@
+diff -Nurd -x'*~' gtk+-2.6.10.orig/demos/Makefile.in
gtk+-2.6.10/demos/Makefile.in
+--- gtk+-2.6.10.orig/demos/Makefile.in 2005-08-18 10:12:35.000000000 -0400
++++ gtk+-2.6.10/demos/Makefile.in 2005-10-20 16:14:41.000000000 -0400
+@@ -372,7 +372,9 @@
@[EMAIL PROTECTED] = testpixbuf-drawable$(EXEEXT) \
@HAVE_PNG_FALSE@ testanimation$(EXEEXT) testpixbuf-save$(EXEEXT) \
@HAVE_PNG_FALSE@ testpixbuf-scale$(EXEEXT) pixbuf-demo$(EXEEXT)
@@ -43,11 +43,11 @@
am_pixbuf_demo_OBJECTS = pixbuf-demo.$(OBJEXT) pixbuf-init.$(OBJEXT)
pixbuf_demo_OBJECTS = $(am_pixbuf_demo_OBJECTS)
-diff -Naur gtk+-2.4.0-old/demos/gtk-demo/Makefile.in
gtk+-2.4.0/demos/gtk-demo/Makefile.in
---- gtk+-2.4.0-old/demos/gtk-demo/Makefile.in Tue Mar 16 15:26:54 2004
-+++ gtk+-2.4.0/demos/gtk-demo/Makefile.in Wed Mar 17 09:40:39 2004
-@@ -374,7 +374,7 @@
- textview.$(OBJEXT) tree_store.$(OBJEXT) ui_manager.$(OBJEXT)
+diff -Nurd -x'*~' gtk+-2.6.10.orig/demos/gtk-demo/Makefile.in
gtk+-2.6.10/demos/gtk-demo/Makefile.in
+--- gtk+-2.6.10.orig/demos/gtk-demo/Makefile.in 2005-08-18
10:12:36.000000000 -0400
++++ gtk+-2.6.10/demos/gtk-demo/Makefile.in 2005-10-20 16:14:41.000000000
-0400
+@@ -397,7 +397,7 @@
+ ui_manager.$(OBJEXT)
am_gtk_demo_OBJECTS = $(am__objects_1) main.$(OBJEXT)
gtk_demo_OBJECTS = $(am_gtk_demo_OBJECTS)
-gtk_demo_LDFLAGS =
@@ -55,10 +55,10 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-diff -Naur gtk+-2.4.0-old/gdk/x11/gdkdrawable-x11.c
gtk+-2.4.0/gdk/x11/gdkdrawable-x11.c
---- gtk+-2.4.0-old/gdk/x11/gdkdrawable-x11.c Sat Mar 6 13:54:37 2004
-+++ gtk+-2.4.0/gdk/x11/gdkdrawable-x11.c Wed Mar 17 09:40:39 2004
-@@ -983,6 +983,7 @@
+diff -Nurd -x'*~' gtk+-2.6.10.orig/gdk/x11/gdkdrawable-x11.c
gtk+-2.6.10/gdk/x11/gdkdrawable-x11.c
+--- gtk+-2.6.10.orig/gdk/x11/gdkdrawable-x11.c 2005-08-18 10:10:56.000000000
-0400
++++ gtk+-2.6.10/gdk/x11/gdkdrawable-x11.c 2005-10-20 16:14:41.000000000
-0400
+@@ -1036,6 +1036,7 @@
}
else
{
@@ -66,7 +66,7 @@
pf.direct.alpha = 0;
}
-@@ -999,10 +1000,18 @@
+@@ -1052,10 +1053,18 @@
* RENDER's preferred order
*/
pf.direct.alphaMask = 0;
@@ -89,7 +89,7 @@
*format = XRenderFindFormat (xdisplay,
(PictFormatType | PictFormatDepth |
-@@ -1014,7 +1023,14 @@
+@@ -1067,7 +1076,14 @@
0);
pf.direct.alphaMask = 0xff;
@@ -105,7 +105,7 @@
*mask = XRenderFindFormat (xdisplay,
(PictFormatType | PictFormatDepth |
-@@ -1031,11 +1047,19 @@
+@@ -1084,11 +1100,19 @@
pf.type = PictTypeDirect;
pf.depth = 32;
@@ -129,9 +129,9 @@
*format = XRenderFindFormat (xdisplay,
(PictFormatType | PictFormatDepth |
-diff -Naur gtk+-2.4.0-old/gdk/x11/gdkim-x11.c gtk+-2.4.0/gdk/x11/gdkim-x11.c
---- gtk+-2.4.0-old/gdk/x11/gdkim-x11.c Sat Mar 6 13:54:37 2004
-+++ gtk+-2.4.0/gdk/x11/gdkim-x11.c Wed Mar 17 09:40:39 2004
+diff -Nurd -x'*~' gtk+-2.6.10.orig/gdk/x11/gdkim-x11.c
gtk+-2.6.10/gdk/x11/gdkim-x11.c
+--- gtk+-2.6.10.orig/gdk/x11/gdkim-x11.c 2005-08-18 10:10:56.000000000
-0400
++++ gtk+-2.6.10/gdk/x11/gdkim-x11.c 2005-10-20 16:14:42.000000000 -0400
@@ -26,7 +26,11 @@
#include <config.h>
@@ -144,9 +144,25 @@
#include <stdlib.h>
#include <string.h>
-diff -Naur gtk+-2.4.0-old/gtk/gtkimmulticontext.c
gtk+-2.4.0/gtk/gtkimmulticontext.c
---- gtk+-2.4.0-old/gtk/gtkimmulticontext.c Sat Mar 6 13:54:56 2004
-+++ gtk+-2.4.0/gtk/gtkimmulticontext.c Wed Mar 17 09:40:39 2004
+diff -Nurd -x'*~' gtk+-2.6.10.orig/gdk/x11/gdkspawn-x11.c
gtk+-2.6.10/gdk/x11/gdkspawn-x11.c
+--- gtk+-2.6.10.orig/gdk/x11/gdkspawn-x11.c 2005-08-18 10:10:56.000000000
-0400
++++ gtk+-2.6.10/gdk/x11/gdkspawn-x11.c 2005-10-20 16:17:09.000000000 -0400
+@@ -28,7 +28,12 @@
+ #include <gdk/gdk.h>
+ #include "gdkalias.h"
+
++#ifdef __APPLE__
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#else
+ extern char **environ;
++#endif
+
+ /**
+ * gdk_make_spawn_environment_for_screen:
+diff -Nurd -x'*~' gtk+-2.6.10.orig/gtk/gtkimmulticontext.c
gtk+-2.6.10/gtk/gtkimmulticontext.c
+--- gtk+-2.6.10.orig/gtk/gtkimmulticontext.c 2005-08-18 10:10:58.000000000
-0400
++++ gtk+-2.6.10/gtk/gtkimmulticontext.c 2005-10-20 16:14:42.000000000
-0400
@@ -20,7 +20,11 @@
#include <config.h>
@@ -159,11 +175,11 @@
#include "gtkimmulticontext.h"
#include "gtkimmodule.h"
-diff -Naur gtk+-2.4.0-old/gtk/gtkmain.c gtk+-2.4.0/gtk/gtkmain.c
---- gtk+-2.4.0-old/gtk/gtkmain.c Mon Mar 15 10:32:04 2004
-+++ gtk+-2.4.0/gtk/gtkmain.c Wed Mar 17 09:40:39 2004
-@@ -28,7 +28,11 @@
-
+diff -Nurd -x'*~' gtk+-2.6.10.orig/gtk/gtkmain.c gtk+-2.6.10/gtk/gtkmain.c
+--- gtk+-2.6.10.orig/gtk/gtkmain.c 2005-08-18 10:10:58.000000000 -0400
++++ gtk+-2.6.10/gtk/gtkmain.c 2005-10-20 16:14:42.000000000 -0400
+@@ -29,7 +29,11 @@
+ #include <glib.h>
#include "gdkconfig.h"
+#if defined(X_LOCALE)
@@ -174,10 +190,24 @@
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
#include <libintl.h>
-diff -Naur gtk+-2.4.0-old/ltmain.sh gtk+-2.4.0/ltmain.sh
---- gtk+-2.4.0-old/ltmain.sh Tue Feb 17 14:55:01 2004
-+++ gtk+-2.4.0/ltmain.sh Wed Mar 17 09:40:39 2004
-@@ -5247,10 +5247,10 @@
+diff -Nurd -x'*~' gtk+-2.6.10.orig/gtk/xdgmime/xdgmimecache.c
gtk+-2.6.10/gtk/xdgmime/xdgmimecache.c
+--- gtk+-2.6.10.orig/gtk/xdgmime/xdgmimecache.c 2005-08-18
10:11:00.000000000 -0400
++++ gtk+-2.6.10/gtk/xdgmime/xdgmimecache.c 2005-10-20 16:14:42.000000000
-0400
+@@ -46,6 +46,10 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
++
+ #include "xdgmimecache.h"
+ #include "xdgmimeint.h"
+
+diff -Nurd -x'*~' gtk+-2.6.10.orig/ltmain.sh gtk+-2.6.10/ltmain.sh
+--- gtk+-2.6.10.orig/ltmain.sh 2005-07-09 15:14:44.000000000 -0400
++++ gtk+-2.6.10/ltmain.sh 2005-10-20 16:14:42.000000000 -0400
+@@ -5341,10 +5341,10 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -192,10 +222,10 @@
done
fi
-diff -Naur gtk+-2.4.0-old/modules/input/Makefile.in
gtk+-2.4.0/modules/input/Makefile.in
---- gtk+-2.4.0-old/modules/input/Makefile.in Tue Mar 16 15:27:01 2004
-+++ gtk+-2.4.0/modules/input/Makefile.in Wed Mar 17 09:40:39 2004
-@@ -767,25 +767,18 @@
+diff -Nurd -x'*~' gtk+-2.6.10.orig/modules/input/Makefile.in
gtk+-2.6.10/modules/input/Makefile.in
+--- gtk+-2.6.10.orig/modules/input/Makefile.in 2005-08-18 10:12:41.000000000
-0400
++++ gtk+-2.6.10/modules/input/Makefile.in 2005-10-20 16:14:42.000000000
-0400
+@@ -802,25 +802,18 @@
# install-data-am, and not install-exec-am. We need to ensure this gets run
# after the libraries are installed in their final locations.
install-data-hook:
@@ -228,9 +258,9 @@
@[EMAIL PROTECTED]: gtk.immodules
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -Naur gtk+-2.4.0-old/po/Makefile.in.in gtk+-2.4.0/po/Makefile.in.in
---- gtk+-2.4.0-old/po/Makefile.in.in Sat Jan 17 17:18:26 2004
-+++ gtk+-2.4.0/po/Makefile.in.in Wed Mar 17 09:40:39 2004
+diff -Nurd -x'*~' gtk+-2.6.10.orig/po/Makefile.in.in
gtk+-2.6.10/po/Makefile.in.in
+--- gtk+-2.6.10.orig/po/Makefile.in.in 2005-08-18 10:11:00.000000000 -0400
++++ gtk+-2.6.10/po/Makefile.in.in 2005-10-20 16:14:42.000000000 -0400
@@ -27,7 +27,7 @@
exec_prefix = @exec_prefix@
datadir = @datadir@
@@ -240,9 +270,9 @@
gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po
-diff -Naur gtk+-2.4.0-old/update-gdk-pixbuf-loaders
gtk+-2.4.0/update-gdk-pixbuf-loaders
---- gtk+-2.4.0-old/update-gdk-pixbuf-loaders Wed Dec 31 19:00:00 1969
-+++ gtk+-2.4.0/update-gdk-pixbuf-loaders Wed Mar 17 09:40:39 2004
+diff -Nurd -x'*~' gtk+-2.6.10.orig/update-gdk-pixbuf-loaders
gtk+-2.6.10/update-gdk-pixbuf-loaders
+--- gtk+-2.6.10.orig/update-gdk-pixbuf-loaders 1969-12-31 19:00:00.000000000
-0500
++++ gtk+-2.6.10/update-gdk-pixbuf-loaders 2005-10-20 16:14:42.000000000
-0400
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+#
@@ -253,7 +283,7 @@
+# gdk-pixbuf.loaders file.
+#
+
-+CONFDIR=/opt/etc/gtk-2.0
[EMAIL PROTECTED]@/etc/gtk-2.0
+CONFFILE=$CONFDIR/gdk-pixbuf.loaders
+
+mkdir -p $CONFDIR
@@ -265,9 +295,9 @@
+chmod 0644 $CONFFILE
+
+exit 0
-diff -Naur gtk+-2.4.0-old/update-gtk-immodules gtk+-2.4.0/update-gtk-immodules
---- gtk+-2.4.0-old/update-gtk-immodules Wed Dec 31 19:00:00 1969
-+++ gtk+-2.4.0/update-gtk-immodules Wed Mar 17 09:40:39 2004
+diff -Nurd -x'*~' gtk+-2.6.10.orig/update-gtk-immodules
gtk+-2.6.10/update-gtk-immodules
+--- gtk+-2.6.10.orig/update-gtk-immodules 1969-12-31 19:00:00.000000000
-0500
++++ gtk+-2.6.10/update-gtk-immodules 2005-10-20 16:14:42.000000000 -0400
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
@@ -277,7 +307,7 @@
+# in their PostInstScript and PostRmScript to update the gtk.immodules file.
+#
+
-+CONFDIR=/opt/etc/gtk-2.0
[EMAIL PROTECTED]@/etc/gtk-2.0
+CONFFILE=$CONFDIR/gtk.immodules
+
+mkdir -p $CONFDIR
@@ -289,17 +319,3 @@
+chmod 0644 $CONFFILE
+
+exit 0
-diff -Nurd gtk+-2.6.7.orig/gtk/xdgmime/xdgmimecache.c
gtk+-2.6.7/gtk/xdgmime/xdgmimecache.c
---- gtk+-2.6.7.orig/gtk/xdgmime/xdgmimecache.c 2005-04-08 17:02:28.000000000
-0400
-+++ gtk+-2.6.7/gtk/xdgmime/xdgmimecache.c 2005-06-20 01:32:35.000000000
-0400
-@@ -46,6 +46,10 @@
- #include <sys/stat.h>
- #include <sys/types.h>
-
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-+
- #include "xdgmimecache.h"
- #include "xdgmimeint.h"
-
Index: gtk+2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/gtk+2.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gtk+2.info 24 Aug 2005 19:16:28 -0000 1.6
+++ gtk+2.info 21 Oct 2005 00:17:52 -0000 1.7
@@ -1,16 +1,16 @@
Package: gtk+2
-Version: 2.6.8
-Revision: 2
+
+# do not upgrade to 2.8.x until cairo InheritedBuildDepends issue is resolved!
+Version: 2.6.10
+Revision: 1
+
Depends: %N-shlibs (= %v-%r), atk1-shlibs (>= 1.6.0-1), libgettext3-shlibs,
glib2 (>= 2.6.0-1), libiconv, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4),
libtiff-shlibs, pango1-xft2 (>= 1.8.0-1), x11
Replaces: %N-common
Conflicts: %N-common
BuildDepends: glib2-dev (>= 2.6.0-1), atk1 (>= 1.6.0-1), pango1-xft2-dev (>=
1.8.0-1), libpng3, libjpeg, libtiff, pkgconfig (>= 0.15.0-2), libgettext3-dev,
gettext-bin, gettext-tools, libiconv-dev, x11-dev
Source: mirror:gnome:sources/gtk+/2.6/gtk+-%v.tar.bz2
-Source-MD5: 535fa4b62d219445b99953f679b5cf8e
-PatchScript: <<
- sed -e 's|/opt|%p|g' <%a/%n.patch | patch -p1
- perl -pi.bak -e 's|extern char \*\*environ;|#ifdef __APPLE__\n#include
<crt_externs.h>\n#define environ (*_NSGetEnviron())\n#else\n$&\n#endif|'
gdk/x11/gdkspawn-x11.c
-<<
+Source-MD5: 520090ef291e35ba93397060e20f5025
+PatchScript: sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
NoSetLDFLAGS: true
SetCPPFLAGS: -no-cpp-precomp -DX_LOCALE
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing -pipe
@@ -28,7 +28,7 @@
<<
SplitOff: <<
Package: %N-shlibs
- Depends: atk1-shlibs (>= 1.6.0-1), libgettext3-shlibs, glib2-shlibs (>=
2.6.0-1), libiconv, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4),
libtiff-shlibs, pango1-xft2-shlibs (>= 1.8.0-1), x11
+ Depends: atk1-shlibs (>= 1.6.0-1), libgettext3-shlibs, glib2-shlibs (>=
2.6.0-1), libiconv, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4),
libtiff-shlibs, pango1-xft2-shlibs (>= 1.8.0-1), x11, xdg-base
Replaces: gtk2-engines (<< 2.6.3-1)
Files: lib/lib*-2.0.*.dylib lib/gtk-2.0/2.4.0
Shlibs: <<
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
