Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv21394
Modified Files:
wine.info
Log Message:
New upstream version submitted by damez:
https://sourceforge.net/tracker/?func=detail&aid=2925533&group_id=17203&atid=414256
Index: wine.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/wine.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- wine.info 22 Sep 2009 00:34:14 -0000 1.16
+++ wine.info 9 Jan 2010 22:31:14 -0000 1.17
@@ -1,6 +1,6 @@
Package: wine
-Version: 1.1.29
-Revision: 100
+Version: 1.1.36
+Revision: 1
Description: Microsoft Windows compatibility layer
License: LGPL
Maintainer: Damian Dimmich <dam...@tauri-tec.com>
@@ -17,24 +17,24 @@
# See Wine's documentation/PACKAGING file for more details about dependencies.
# I may have gone overboard on these dependencies, but better safe than sorry.
BuildDepends: <<
- arts-dev, audiofile, bison, dbus-dev, esound, fontconfig2-dev, flex (>= 2.5),
+ arts-dev, audiofile, bison, dbus-dev, esound, fontconfig2-dev, flex-devel (>=
2.5.33),
fontforge, freetype219-shlibs, freetype219, gcc4.0, giflib | libungif,
glib2-dev, jack-dev, lcms, lcms-bin, libgettext3-dev, libiconv-dev,
libicu32-dev | libicu36-dev,
- libjpeg, libusb, libxml2, libxml2-bin, libxslt, libxslt-bin, mesa (>=
6.5.2-1),
+ libjpeg, libusb, libxml2, libxml2-bin, libxslt, libxslt-bin,
openldap23-dev, system-openssl-dev, sane-backends-dev, x11-dev, libgphoto2
<<
Depends: <<
arts-shlibs, audiofile-shlibs, dbus-shlibs, esound-shlibs, fontconfig2-shlibs,
freetype219-shlibs, giflib-shlibs | libungif-shlibs,
glib2-shlibs, jack-shlibs, lcms-shlibs, libgettext3-shlibs, libiconv,
libjpeg-shlibs,
- libusb-shlibs, libxml2-shlibs, libxslt-shlibs, mesa-shlibs (>= 6.5.2-1),
+ libusb-shlibs, libxml2-shlibs, libxslt-shlibs,
openldap23-shlibs, sane-backends-shlibs, x11, libgphoto2-shlibs
<<
Recommends: <<
msttcorefonts
<<
Source: mirror:sourceforge:%n/%n-%v.tar.bz2
-Source-MD5: c3a9218840a80b29932cee49f2d45d9d
+Source-MD5: 2afa7846175c7c2ce4c7482aa1d82f0f
NoSetCPPFLAGS: true
SetCPPFLAGS: -DDBUS_API_SUBJECT_TO_CHANGE
@@ -44,18 +44,16 @@
# A custom CompileScript is necessary for the extra "make depend" step
CompileScript: <<
#!/bin/sh -ev
- export
CPATH=%p/include/dbus-1.0:%p/lib/dbus-1.0/include:%p/include/mesa:%p/include:/usr/X11R6/include
- export X_CFLAGS=-I%p/include/mesa X_LIBS=-L%p/lib/mesa
- export LDFLAGS="-L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
-L/%p/lib/system-openssl/lib"
+ export
CPATH=%p/include/dbus-1.0:%p/lib/dbus-1.0/include:%p/include:/usr/X11R6/include
+ export LDFLAGS="-L/%p/lib/system-openssl/lib"
export LD_LIBRARY_PATH=%p/lib
- export PATH=%p/lib/freetype219/bin:$PATH
- export CPPFLAGS="-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include
-I/%p/lib/system-openssl/include"
+ export CPPFLAGS="-I/%p/lib/system-openssl/include"
# strip out all non ascii to something that sed and gcc script will eat
tr -cd '\11\12\40-\176' <AUTHORS >AUTHORS.tmp
mv AUTHORS.tmp AUTHORS
# change the library detection so that the full path name of the library is
retained
perl -pi.bak -e 's|\^\.\*\\\/\\\(lib|^[^\\/]*\\\(.*lib|g' configure
- ./configure %c --disable-win16
+ ./configure %c --disable-win16 --without-openal
# small safety measure: preventing libSystem from coming up too early in the
link line (and hence also in load commands)
# (specifically for wineesd.drv.so winearts.drv.so sane.ds.so and
msxml3.dll.so).
# For further safety, we can then as well remove the remaining -L%p/lib and
-I%p/include flags ...
@@ -72,6 +70,7 @@
fontconfig.h : added /usr/X11R6/include
Use mesa because GL/gl.h in some versions of Apple's X11 is too old. But then
to be safe mesa has also
to substitute for the glut or freeglut dep; thus put mesa in every path before
%p and before /usr/X11R6.
+#on 10.5/10.6 this should no longer be an issue.
<<
DescDetail: <<
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
