Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11 In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16799/x11
Modified Files: wine-32bit.info Log Message: Update wine-32bit to 1.5.22; force it to use TrueType, fixes font metrics issue Index: wine-32bit.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11/wine-32bit.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- wine-32bit.info 15 Oct 2012 06:02:58 -0000 1.5 +++ wine-32bit.info 22 Jan 2013 02:32:21 -0000 1.6 @@ -1,8 +1,9 @@ Package: wine-32bit -Version: 1.3.21 -Revision: 5 +Version: 1.5.22 +Revision: 1 Description: Microsoft Windows compatibility layer (x86) License: LGPL + # Sjors is maintainer of the wine-32bit package, while Damian Dimmich # is the maintainer of the normal wine package on Fink i386. Maintainer: Sjors Gielen <f...@sjorsgielen.nl> @@ -16,13 +17,7 @@ # Does not compile on PowerPC. # error: encode_type: VT_USERDEFINED - unhandled type 17 Architecture: x86_64 -# Requires too old of an Xcode for 10.8 -Distribution: 10.7 -# Trevor writes: -# According to the Wine README, any GCC higher than 2.7.2 should work, but only GCC 4.x has been tested. -# See Wine's documentation/PACKAGING file for more details about dependencies. -# I may have gone overboard on these dependencies, but better safe than sorry. -# Sjors writes: + # http://wiki.winehq.org/Wine64 describes that for building x86-64, # gcc >= 4.5.1 is required. BuildDepends: << @@ -31,7 +26,7 @@ glib2-dev, lcms, lcms-bin, libgettext8-dev, libiconv-dev, libicu36-dev, libjpeg8, libusb, libxml2 (>=2.6.21), libxml2-bin (>=2.6.21), libxslt, libxslt-bin, openldap24-dev, system-openssl-dev, sane-backends-dev, x11-dev, libgphoto2, - glib2-dev, libpng15-32bit (>=1.5.5-2), xcode (<< 4.2-1 ), gcc4.2 + glib2-dev, libpng15-32bit (>=1.5.5-2), xcode, dev-tools << Depends: << dbus1.3-shlibs, fontconfig2-shlibs, @@ -54,7 +49,7 @@ wine-stable << Source: mirror:sourceforge:wine/wine-%v.tar.bz2 -Source-MD5: dfcefe48a9aae82f7f1aa4d2c6617961 +Source-MD5: 8b37350b58da09eb3ce63422070c27c4 NoSetCPPFLAGS: true NoSetLDFLAGS: true @@ -63,29 +58,26 @@ --host=i686-apple-darwin11 \ --x-includes=/usr/X11/include \ --x-libraries=/usr/X11/lib \ - --without-esd \ --without-gnutls \ --without-gstreamer \ - --without-jack \ --without-mpg123 \ --without-openal \ + --with-freetype \ --with-png << -# Was: --disable-win16 -# 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:/usr/X11/include export LDFLAGS="-L%p/lib/i386 -L/%p/lib/system-openssl/lib -Wl,-no_pie" export LD_LIBRARY_PATH=%p/lib - export CPPFLAGS="-I/%p/lib/system-openssl/include -D_DARWIN_NO_64_BIT_INODE" - export CC="/Developer/usr/bin/i686-apple-darwin11-gcc-4.2.1" - export CXX="/Developer/usr/bin/i686-apple-darwin11-g++-4.2.1" + export CPPFLAGS="-I/%p/lib/system-openssl/include" + export CC="%p/bin/gcc-fsf-4.7" + export CXX="/%p/bin/g++-fsf-4.7" export ft_devel="%p/bin/freetype-config" mkdir bin - ln -s /Developer/usr/bin/as bin/i686-apple-darwin11-as - ln -s /Developer/usr/bin/ld bin/i686-apple-darwin11-ld - ln -s /Developer/usr/bin/nm bin/i686-apple-darwin11-nm + ln -s /usr/bin/as bin/i686-apple-darwin11-as + ln -s /usr/bin/ld bin/i686-apple-darwin11-ld + ln -s /usr/bin/nm bin/i686-apple-darwin11-nm ln -s $CC bin/i686-apple-darwin11-gcc ln -s $CXX bin/i686-apple-darwin11-g++ export PATH="`pwd`/bin:$PATH" @@ -103,6 +95,8 @@ perl -pi.bak -e 's,\-L%p/lib ,,g; s:\-I%p/include( |,):\1:g; s,\-l(m|dl|pthread)([^a-z]),\2,g' config.status ./config.status make depend + perl -pi -e 's,^CC ,CC = /usr/bin/clang -m32\n#,g;' dlls/winemac.drv/Makefile + perl -pi -e 's,LDEXECFLAGS = ,LDEXECFLAGS = /usr/lib/crt1.o ,;' loader/Makefile make << Shlibs: %p/lib/libwine.1.dylib 1.0.0 %n (>= 0.9.21-3) ------------------------------------------------------------------------------ Master SQL Server Development, Administration, T-SQL, SSAS, SSIS, SSRS and more. Get SQL Server skills now (including 2012) with LearnDevNow - 200+ hours of step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only - learn more at: http://p.sf.net/sfu/learnmore_122512 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs