Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11
In directory vz-cvs-3.sog:/tmp/cvs-serv25805/stable/main/finkinfo/x11
Modified Files:
wine.info
Log Message:
latest wine looks fine, send to stable
Index: wine.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11/wine.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- wine.info 10 Aug 2011 21:14:59 -0000 1.2
+++ wine.info 16 Mar 2012 16:20:29 -0000 1.3
@@ -1,10 +1,11 @@
Package: wine
-Version: 1.1.44
+Version: 1.3.21
Revision: 1
Description: Microsoft Windows compatibility layer
License: LGPL
Maintainer: Damian Dimmich <dam...@tauri-tec.com>
#Previous maintainer: Robert Cusick <bobn...@gmail.com>
+#Additions by Max Horn
# This version updated by Damian Dimmich
#Much love to costabel, jfmertens, and other finkers for rebooting this
package.
@@ -17,18 +18,20 @@
# 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-devel (>=
2.5.33),
- fontforge, freetype219, gcc4.0, giflib | libungif,
- glib2-dev, jack-dev, lcms, lcms-bin, libgettext8-dev, libiconv-dev,
libicu36-dev,
- libjpeg8, libusb, libxml2, libxml2-bin, libxslt, libxslt-bin,
- openldap24-dev, system-openssl-dev, sane-backends-dev, x11-dev, libgphoto2
+ bison, dbus-dev, fontconfig2-dev, flex-devel (>= 2.5.33),
+ freetype219, giflib | libungif,
+ 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
<<
Depends: <<
- arts-shlibs, audiofile-shlibs, dbus-shlibs, esound-shlibs, fontconfig2-shlibs,
+ dbus-shlibs, fontconfig2-shlibs,
freetype219-shlibs, giflib-shlibs | libungif-shlibs,
- glib2-shlibs, jack-shlibs, lcms-shlibs, libgettext8-shlibs, libiconv,
libjpeg8-shlibs,
- libusb-shlibs, libxml2-shlibs, libxslt-shlibs,
- openldap24-shlibs, sane-backends-shlibs, x11, libgphoto2-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
<<
Recommends: <<
msttcorefonts
@@ -36,18 +39,33 @@
BuildConflicts: <<
flex (<= 1:2.5.33-1)
<<
+Conflicts: <<
+ wine-stable
+<<
+Replaces: <<
+ wine-stable
+<<
Source: mirror:sourceforge:%n/%n-%v.tar.bz2
-Source-MD5: f18649bd71b9099fecad22436d239cba
+Source-MD5: dfcefe48a9aae82f7f1aa4d2c6617961
NoSetCPPFLAGS: true
-SetCPPFLAGS: -DDBUS_API_SUBJECT_TO_CHANGE
NoSetLDFLAGS: true
-SetLIBRARY_PATH: %p/lib/mesa:%p/lib
-ConfigureParams: --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
+SetLIBRARY_PATH: %p/lib
+ConfigureParams: <<
+ --x-includes=/usr/X11/include \
+ --x-libraries=/usr/X11/lib \
+ --without-esd \
+ --without-gnutls \
+ --without-gstreamer \
+ --without-jack \
+ --without-mpg123 \
+ --without-openal \
+ --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/X11R6/include
+ 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 LD_LIBRARY_PATH=%p/lib
export CPPFLAGS="-I/%p/lib/system-openssl/include"
@@ -56,7 +74,7 @@
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 --without-openal
+ ./configure %c
# 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 ...
@@ -69,11 +87,9 @@
DocFiles: ANNOUNCE AUTHORS COPYING.LIB LICENSE README VERSION
DescPort: <<
-Didn't find "dbus/dbus.h" : added %p/include/dbus-1.0:%p/lib/dbus-1.0/include
to search path, and required CPPFLAGS
-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.
+Didn't find "dbus/dbus.h" : added %p/include/dbus-1.0:%p/lib/dbus-1.0/include
+to search path, and required CPPFLAGS
+fontconfig.h : added /usr/X11/include
<<
DescDetail: <<
@@ -84,36 +100,27 @@
feel to other applications on your desktop.
<<
DescUsage: <<
-Wine uses X Windows for its backend, so you need to start your X Server
-(e.g. X11) before running Wine. In addition, Wine needs a valid DISPLAY
-variable in order to find the X server. For example:
-
- export DISPLAY=:0.0
-
-#Also, Wine is unable to find the FreeType libraries unless you add Fink's lib
-#directory to the library path. For example:
-#
-# export LD_LIBRARY_PATH=%p/lib
-#
-# Adding export DYLD_LIBRARY_PATH=%p/lib/freetype219/lib seemed to give better
-# results - Damian
-
-Another note: The ~/.wine directory is supposed to be created and set up
-automatically the first time you launch Wine. However, I have experienced
-"wineserver: could not save registry branch" errors during the initial launch.
-To fix this problem, run wineprefixcreate before launching Wine. This should
-create the ~/.wine directory and populate it with the necessary files. You may
-still see error messages, but the directory will be created. For example:
+The ~/.wine directory is supposed to be created and set up automatically the
+first time you launch Wine. However, I have experienced "wineserver: could not
+save registry branch" errors during the initial launch. To fix this problem,
+run wineprefixcreate before launching Wine. This should create the ~/.wine
+directory and populate it with the necessary files. You may still see error
+messages, but the directory will be created. For example:
export LD_LIBRARY_PATH=%p/lib
%p/bin/wineprefixcreate
This only needs to be done once.
-It will also warn that wine-gecko is missing the during the first launch and
-ask to download it. Click "Install" to continue.
+It will also warn that wine-gecko is missing during the first launch and ask
+to download it. Click "Install" to continue.
For a quick test of Wine, run %p/bin/notepad
+
+For best results install an update X server such as XQuartz from
+http://xquartz.macosforge.org/trac/wiki
+
+This is the development version of wine. For stable please install wine-stable.
<<
Homepage: http://www.winehq.org/
@@ -122,7 +129,6 @@
Package: %N-dev
Depends: %N (= %v-%r)
BuildDependsOnly: true
+ Conflicts: wine-stable-dev
Files: include lib/libwine.dylib
<<
-
-
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
