Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20340
Modified Files:
wxgtk2.8.info
Log Message:
GNOME2.28 cleanup
Index: wxgtk2.8.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/wxgtk2.8.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- wxgtk2.8.info 7 Jul 2010 19:33:32 -0000 1.20
+++ wxgtk2.8.info 5 Nov 2010 17:58:41 -0000 1.21
@@ -1,6 +1,6 @@
Package: wxgtk2.8
Version: 2.8.10
-Revision: 24
+Revision: 25
Source-MD5: d9638db3f3a9ce36c900a52f8c0087c6
Source: mirror:sourceforge:wxwindows/wxGTK-%v.tar.gz
PatchFile: %n.patch
@@ -20,41 +20,44 @@
<<
DocFiles: BuildCVS.txt install-gtk.txt docs readme-gtk.txt
BuildDepends: <<
- atk1 (>= 1.24.0-1),
- cairo (>= 1.8.2-1),
- dbus-dev (>= 1.2.3-6),
+ atk1 (>= 1.28.0-1),
+ cairo (>= 1.8.8-3),
expat1,
fink (>= 0.28.6-1),
- fontconfig2-dev (>= 2.4.1-5),
- freetype219 (>= 2.3.7-7),
- gconf2-dev (>= 2.24.0-1),
- glib2-dev (>= 2.18.2-1),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
+ gconf2-dev (>= 2.28.0-1),
+ glib2-dev (>= 2.22.0-1),
glitz,
- gnome-vfs2-unified-dev (>= 1:2.24.0-1),
- gst-plugins-base-0.10-dev,
- gstreamer-0.10-dev,
- gtk+2-dev (>= 2.14.4-1),
+ gnome-vfs2-unified-dev (>= 1:2.24.2-1),
+ gst-plugins-base-0.10-dev (>= 0.10.26-1),
+ gstreamer-0.10-dev (>= 0.10.26-1),
+ gtk+2-dev (>= 2.18.0-1),
libart2,
- libbonobo2-dev (>= 2.20.0-1),
- libgettext3-dev,
- libgl,
- libgnomecanvas2-dev (>= 2.20.1-1),
- libgnomeprint2.2-dev (>= 2.18.5-1),
- libgnomeprintui2.2-dev (>= 2.18.3-1),
+ libgettext8-dev,
+ libgnomecanvas2-dev (>= 2.26.0-3),
+ libgnomeprint2.2-dev (>= 2.18.6-5),
+ libgnomeprintui2.2-dev (>= 2.18.4-5),
libiconv-dev,
- libjpeg,
+ libjpeg8,
libpng3,
libtiff,
libxml2 (>= 2.6.32-1),
- orbit2-dev (>= 2.14.16-1),
- pango1-xft2-ft219-dev (>= 1.22.0-4),
- pixman (>= 0.12.0-1),
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pixman (>= 0.16x.0-1),
pkgconfig (>= 0.23-1),
sdl,
- x11-dev,
- xft2-dev
+ x11-dev
+<<
+Depends: <<
+ %N-shlibs (>= %v-%r),
+ expat1-shlibs,
+ glib2-shlibs (>= 2.22.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ libiconv,
+ x11
<<
-Depends: %N-shlibs (>= %v-%r)
Conflicts: wxgtk, wxmac, wxmac28
Replaces: wxgtk, wxmac, wxmac28
GCC: 4.0
@@ -75,8 +78,8 @@
# add missing libraries to avoid undefined symbol errors when using wx-config
perl -pi -e 's|ApplicationServices|ApplicationServices -lgdk-x11-2.0
-lgobject-2.0 -lX11|g' configure
<<
-SetCPPFLAGS: -I%p/include/SDL -I/usr/X11R6/include
-SetLDFLAGS: -L%p/lib/fontconfig2/lib
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-L/usr/X11R6/lib
+SetCPPFLAGS: -I%p/include/SDL -MD
+SetLDFLAGS: -L%p/lib/fontconfig2/lib
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
ConfigureParams: <<
--with-extra-includes=%p/include --with-extra-libs=%p/lib
--disable-dependency-tracking --disable-debug --disable-debug_flag \
--disable-debug_info --disable-monolithic --disable-precomp-headers
--enable-objc_uniquifying --enable-optimise --enable-threads \
@@ -91,7 +94,7 @@
# --enable-stl --with-odbc --enable-plugins ??
CompileScript: <<
#!/bin/sh -ev
- export
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+ export PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
cd build
if [ %m = "x86_64" ]; then
../configure %c --build=%m-apple-darwin`uname -r|cut -f1 -d.`
--host=%m-apple-darwin`uname -r|cut -f1 -d.`
@@ -107,6 +110,7 @@
make -C contrib/src/plot
make -C contrib/src/stc
make -C contrib/src/svg
+ fink-package-precedence --depfile-ext='\.d' --prohibit-bdep %n .
<<
InstallScript: <<
#!/bin/sh -ev
@@ -127,22 +131,23 @@
Description: Shared libraries for %n
DocFiles: docs/readme.txt docs/licence.txt docs/changes.txt docs/lgpl.txt
docs/gpl.txt
Depends: <<
- atk1-shlibs (>= 1.24.0-1),
- cairo-shlibs (>= 1.8.2-1),
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
expat1-shlibs,
- gconf2-shlibs (>= 2.24.0-1),
- glib2-shlibs (>= 2.18.2-1),
- gst-plugins-base-0.10-shlibs,
- gstreamer-0.10-shlibs,
- gtk+2-shlibs (>= 2.14.4-1),
- libgettext3-shlibs,
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ gconf2-shlibs (>= 2.28.0-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gst-plugins-base-0.10-shlibs (>= 0.10.26-1),
+ gstreamer-0.10-shlibs (>= 0.10.26-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ libgettext8-shlibs,
libiconv,
- libjpeg-shlibs,
+ libjpeg8-shlibs,
libpng3-shlibs,
libtiff-shlibs,
libxml2-shlibs (>= 2.6.32-1),
- orbit2-shlibs (>= 2.14.16-1),
- pango1-xft2-ft219-shlibs (>= 1.22.0-4),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
sdl-shlibs,
x11-shlibs
<<
@@ -171,6 +176,12 @@
%p/lib/libwx_gtk2u_gizmos_xrc-2.8.0.dylib 7.0.0 %n (>=
2.8.7-4)
<<
<<
+DescPackaging: <<
+ dmacks: added fink-package-precedence for lib-use sanity. And
+ --enable-dependency-tracking doesn't, so need to -MD instead.
+
+ Needs libpng functions that were removed as of libpng14.
+<<
DescPort: <<
dmacks: dispalyx11.cpp (among others) uses x11 directly if
wxUSE_DISPLAY, so needs to link directly to libX11
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
