Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25737/10.4/stable/main/finkinfo/x11
Modified Files:
wine.info
Log Message:
unrar: update to newer upstream version (5.0.12)
Index: wine.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11/wine.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- wine.info 10 Jan 2013 21:36:05 -0000 1.5
+++ wine.info 7 Oct 2013 05:19:36 -0000 1.6
@@ -1,10 +1,14 @@
Package: wine
-Version: 1.3.21
+Version: 1.6
Revision: 3
-Description: Microsoft Windows compatibility layer
+Description: Microsoft Windows compatibility layer (x86)
License: LGPL
-Maintainer: Damian Dimmich <dam...@tauri-tec.com>
-#Previous maintainer: Robert Cusick <bobn...@gmail.com>
+
+# 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>
+#Previous maintainer: Damian Dimmich <dam...@tauri-tec.com>
+#Previous^2 maintainer: Robert Cusick <bobn...@gmail.com>
#Additions by Max Horn
# This version updated by Damian Dimmich
@@ -12,26 +16,30 @@
#
# Does not compile on PowerPC.
# error: encode_type: VT_USERDEFINED - unhandled type 17
-Architecture: i386
-# 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.
+
+# http://wiki.winehq.org/Wine64 describes that for building x86-64,
+# gcc >= 4.5.1 is required.
BuildDepends: <<
- bison, dbus-glib1.2-dev, dbus1.3-dev, fontconfig2-dev, flex-devel (>= 2.5.33),
- freetype219, giflib,
- 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
+ bison, dbus1.3-dev, fontconfig2-dev (>= 2.10.0-1), flex-devel (>= 2.5.33),
+ (%m = i386) freetype219, (%m = x86_64) freetype219-32bit,
+ giflib, glib2-dev (>= 2.22.0-1), lcms, lcms-bin, libgettext8-dev,
+ libiconv-dev, libicu36-dev, libjpeg9, libusb,
+ (%m = i386) libxml2, (%m = x86_64) libxml2-32bit,
+ libxml2-32bit-bin | libxml2-bin, libxslt, libxslt-bin, openldap24-dev,
+ system-openssl-dev, sane-backends-dev, libgphoto2, glib2-dev,
+ (%m = i386) libpng16, (%m = x86_64) libpng16-32bit,
+ xcode, dev-tools, gcc47-compiler
<<
Depends: <<
- dbus-glib1.2-shlibs, dbus1.3-shlibs, fontconfig2-shlibs,
- freetype219-shlibs, giflib-shlibs,
- glib2-shlibs, lcms-shlibs, libgettext8-shlibs, libiconv,
- libjpeg8-shlibs, libusb-shlibs, libxml2-shlibs, libxslt-shlibs,
- openldap24-shlibs, sane-backends-shlibs, x11, libgphoto2-shlibs,
- glib2-shlibs
+ dbus1.3-shlibs, fontconfig2-shlibs (>= 2.10.0-1),
+ (%m = i386) freetype219-shlibs (>=2.4.4-4),
+ (%m = x86_64) freetype219-32bit-shlibs (>=2.4.4-4),
+ giflib-shlibs, glib2-shlibs (>= 2.22.0-1), lcms-shlibs,
+ libgettext8-shlibs, libiconv, libjpeg9-shlibs, libusb-shlibs,
+ (%m = i386) libxml2-shlibs, (%m = x86_64) libxml2-32bit-shlibs,
+ libxslt-shlibs, openldap24-shlibs, sane-backends-shlibs,
+ libgphoto2-shlibs, glib2-shlibs,
+ (%m = i386) libpng16-shlibs, (%m = x86_64) libpng16-32bit-shlibs
<<
Recommends: <<
msttcorefonts
@@ -45,30 +53,42 @@
Replaces: <<
wine-stable
<<
-Source: mirror:sourceforge:%n/%n-%v.tar.bz2
-Source-MD5: dfcefe48a9aae82f7f1aa4d2c6617961
+Source: mirror:sourceforge:wine/wine-%v.tar.bz2
+Source-MD5: 47cf1e121d395e9c8ca1a4ab88f1e658
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetLIBRARY_PATH: %p/lib
+
ConfigureParams: <<
- --x-includes=/usr/X11/include \
- --x-libraries=/usr/X11/lib \
- --without-esd \
+ --host=i686-apple-darwin11 \
--without-gnutls \
--without-gstreamer \
- --without-jack \
--without-mpg123 \
--without-openal \
- --disable-win16
+ --with-freetype \
+ --with-png \
+ --with-xml
<<
-# 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/system-openssl/lib"
+ 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"
+ 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"
+ export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:%p/lib/i386/pkgconfig"
+ mkdir bin
+ 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"
+ echo $PATH
+ ls `pwd`/bin
# 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
@@ -78,11 +98,22 @@
# 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 ...
- 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
+ # Clang (at least recent enough versions) doesn't like -gstabs+, so take care
of that, too.
+ perl -pi.bak -e 's,\-L%p/lib ,,g; s:\-I%p/include( |,):\1:g;
s,\-l(m|dl|pthread)([^a-z]),\2,g; s,-gstabs\+,,' config.status
./config.status
make depend
+ perl -pi -e 's,^CC ,CC = /usr/bin/clang -m32\n#,g;'
dlls/winemac.drv/Makefile
+ if [ "%m" = "x86_64" ]; then
+ perl -pi -e 's,LDEXECFLAGS = ,LDEXECFLAGS = /usr/lib/crt1.o ,;'
loader/Makefile
+ fi
make
<<
+InstallScript: <<
+#!/bin/sh -ev
+ %{default_script}
+ install_name_tool -id %p/lib/libwine.1.dylib %i/lib/libwine.1.0.dylib
+<<
+
Shlibs: %p/lib/libwine.1.dylib 1.0.0 %n (>= 0.9.21-3)
DocFiles: ANNOUNCE AUTHORS COPYING.LIB LICENSE README VERSION
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
