Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4422
Modified Files:
gtk+2.info gtk+2.patch
Log Message:
New version. Tests re-enabled.
Index: gtk+2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/gtk+2.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gtk+2.patch 2 Jul 2004 15:36:59 -0000 1.4
+++ gtk+2.patch 8 Jun 2005 03:09:48 -0000 1.5
@@ -1,15 +1,3 @@
-diff -Naur gtk+-2.4.0-old/Makefile.in gtk+-2.4.0/Makefile.in
---- gtk+-2.4.0-old/Makefile.in Tue Mar 16 15:26:52 2004
-+++ gtk+-2.4.0/Makefile.in Wed Mar 17 09:40:39 2004
-@@ -274,7 +274,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
-
- # require automake 1.4
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
@@ -148,11 +136,10 @@
#include <config.h>
--#include <locale.h>
+#if defined(X_LOCALE)
-+# include <X11/Xlocale.h>
++#include <X11/Xlocale.h>
+#else
-+# include <locale.h>
+ #include <locale.h>
+#endif
#include <stdlib.h>
#include <string.h>
@@ -164,11 +151,10 @@
#include <config.h>
#include <string.h>
--#include <locale.h>
+#if defined(X_LOCALE)
-+# include <X11/Xlocale.h>
++#include <X11/Xlocale.h>
+#else
-+# include <locale.h>
+ #include <locale.h>
+#endif
#include "gtkimmulticontext.h"
@@ -180,11 +166,10 @@
#include "gdkconfig.h"
--#include <locale.h>
+#if defined(X_LOCALE)
-+# include <X11/Xlocale.h>
++#include <X11/Xlocale.h>
+#else
-+# include <locale.h>
+ #include <locale.h>
+#endif
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
@@ -263,9 +248,9 @@
+#
+# update-gdk-pixbuf-loaders
+#
-+# Package which install gdk-pixbuf loader(s) should call update-gdk-pixbuf-
-+# loaders in it's PostInstScript/PostRmScript to update gdk-pixbuf.loaders
-+# file.
++# Packages which install gdk-pixbuf loader(s) should call update-gdk-
++# pixbuf-loaders in their PostInstScript and PostRmScript to update the
++# gdk-pixbuf.loaders file.
+#
+
+CONFDIR=/opt/etc/gtk-2.0
@@ -288,8 +273,8 @@
+#
+# update-gtk-immodules
+#
-+# Package which install gtk immodule(s) should call update-gtk-immodules in
-+# it's PostInstScript/PostRmScript to update gtk.immodules file.
++# Packages which install gtk immodule(s) should call update-gtk-immodules
++# in their PostInstScript and PostRmScript to update the gtk.immodules file.
+#
+
+CONFDIR=/opt/etc/gtk-2.0
Index: gtk+2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/gtk+2.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gtk+2.info 12 Mar 2005 17:47:32 -0000 1.11
+++ gtk+2.info 8 Jun 2005 03:09:48 -0000 1.12
@@ -1,20 +1,24 @@
Package: gtk+2
-Version: 2.4.9
-Revision: 8
-Depends: %N-shlibs (= %v-%r), atk1-shlibs (>= 1.6.0-1), gettext, glib2 (>=
2.4.0-1), libiconv, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4),
libtiff-shlibs, pango1-xft2 (>= 1.4.0-1), x11
+Version: 2.6.7
+Revision: 1
+Depends: %N-shlibs (= %v-%r), atk1-shlibs (>= 1.6.0-1), gettext, 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.4.0-1), atk1 (>= 1.6.0-1), pango1-xft2-dev (>=
1.4.0-1), libpng3, libjpeg, libtiff, pkgconfig (>= 0.15.0-2), gettext-dev,
gettext-bin, gettext-tools, libiconv-dev
-Source: mirror:gnome:sources/gtk+/2.4/gtk+-%v.tar.bz2
-Source-MD5: bfe3b960d334e81d8f91c3509f70868d
+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), gettext-dev,
gettext-bin, gettext-tools, libiconv-dev, x11-dev
+Source: mirror:gnome:sources/gtk+/2.6/gtk+-%v.tar.bz2
+Source-MD5: b89bf892a0dee943f98b4caa12f773c8
PatchScript: sed -e 's|/opt|%p|g' <%a/%n.patch | patch -p1
NoSetLDFLAGS: true
SetCPPFLAGS: -no-cpp-precomp -DX_LOCALE
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing -pipe
SetLIBRARY_PATH: %p/lib
SetMACOSX_DEPLOYMENT_TARGET: 10.3
-ConfigureParams: --mandir=%p/share/man --enable-static --disable-shm
--disable-gtk-doc
-CompileScript: ./configure %c; ulimit -s unlimited && make -j2
+ConfigureParams: --mandir=%p/share/man --enable-static --disable-shm
--disable-gtk-doc --disable-dependency-tracking
+CompileScript: <<
+ ./configure %c
+# ulimit -s unlimited && make -j2
+make -j2
+<<
InstallScript: <<
make install DESTDIR=%d
install -d -m 755 %i/sbin %i/etc/gtk-2.0
@@ -23,13 +27,13 @@
<<
SplitOff: <<
Package: %N-shlibs
- Depends: atk1-shlibs (>= 1.6.0-1), gettext, glib2-shlibs (>= 2.4.0-1),
libiconv, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4), libtiff-shlibs,
pango1-xft2-shlibs (>= 1.4.0-1), x11
+ Depends: atk1-shlibs (>= 1.6.0-1), gettext, 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
Files: lib/lib*-2.0.*.dylib lib/gtk-2.0/2.4.0
Shlibs: <<
- %p/lib/libgdk-x11-2.0.0.dylib 201.0.0 %n (>= 2.4.0-1)
- %p/lib/libgdk_pixbuf-2.0.0.dylib 201.0.0 %n (>= 2.4.0-1)
- %p/lib/libgdk_pixbuf_xlib-2.0.0.dylib 201.0.0 %n (>= 2.4.0-1)
- %p/lib/libgtk-x11-2.0.0.dylib 201.0.0 %n (>= 2.4.0-1)
+ %p/lib/libgdk-x11-2.0.0.dylib 601.0.0 %n (>= 2.6.7-1)
+ %p/lib/libgdk_pixbuf-2.0.0.dylib 601.0.0 %n (>= 2.6.7-1)
+ %p/lib/libgdk_pixbuf_xlib-2.0.0.dylib 601.0.0 %n (>= 2.6.7-1)
+ %p/lib/libgtk-x11-2.0.0.dylib 601.0.0 %n (>= 2.6.7-1)
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
RunTimeVars: GDK_USE_XFT: 1
@@ -40,12 +44,17 @@
DescPackaging: <<
Uses pkgconfig.
Any package which BuildDepends on this one must also BuildDepend on:
- atk1 (>= 1.6.0-1), glib2-dev (>= 2.4.0-1), pango1-xft2-dev (>= 1.4.0-1)
+ atk1 (>= 1.6.0-1), glib2-dev (>= 2.6.0-1), pango1-xft2-dev (>= 1.8.0-1)
<<
Replaces: %N (<< 2.0.2-2)
Conflicts: gtk+ (<< 1.2.10-12)
BuildDependsOnly: True
- Files: include lib/gtk-2.0/include lib/lib*-2.0.* lib/pkgconfig
share/aclocal share/gtk-doc
+ Files: <<
+ include
+ lib
+ share/aclocal
+ share/gtk-doc
+ <<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
<<
PostInstScript: <<
@@ -77,12 +86,12 @@
link which intercepts include files of the package.
<<
DescPackaging: <<
-Package which install gdk-pixbuf loader(s) should call update-gdk-pixbuf-
-loaders in it's PostInst/PostRm script to update gdk-pixbuf.loaderss file.
-
-Package which install gtk immodule(s) should call update-gtk-immodules in
-it's PostInst/PostRm script to update gtk.immodules file.
+Packages which install gdk-pixbuf loader(s) should call update-gdk-
+pixbuf-loaders in their PostInstScript and PostRmScript to update the
+gdk-pixbuf.loaders file.
+Packages which install gtk immodule(s) should call update-gtk-immodules
+in their PostInstScript and PostRmScript to update the gtk.immodules file.
<<
License: LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
