Update of /cvsroot/fink/experimental/dazjorz/finkinfo/wine In directory vz-cvs-3.sog:/tmp/cvs-serv14135
Added Files: freetype219-x86.info libpng15-x86.info wine-x86.info freetype219.patch Log Message: Add -x86 infofiles and patch for Wine on x86-64 (tested on 10.7 only) --- NEW FILE: wine-x86.info --- Package: wine-x86 Version: 1.3.21 Revision: 2 Description: Microsoft Windows compatibility layer (x86) License: LGPL 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 #Much love to costabel, jfmertens, and other finkers for rebooting this package. # # Does not compile on PowerPC. # error: encode_type: VT_USERDEFINED - unhandled type 17 Architecture: i386, x86_64 # 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. # TODO: freetype x86 BuildDepends: << bison, dbus1.3-dev, fontconfig2-dev, flex-devel (>= 2.5.33), freetype219-x86, 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, xcode (>= 4.1-1), libpng15-x86, libpng15 << Depends: << dbus1.3-shlibs, fontconfig2-shlibs, freetype219-x86-shlibs, giflib-shlibs | libungif-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, libpng15-x86-shlibs << Recommends: << msttcorefonts << BuildConflicts: << flex (<= 1:2.5.33-1) << Conflicts: << wine-stable << Replaces: << wine-stable << Source: mirror:sourceforge:wine/wine-%v.tar.bz2 Source-MD5: dfcefe48a9aae82f7f1aa4d2c6617961 NoSetCPPFLAGS: true NoSetLDFLAGS: true SetLIBRARY_PATH: %p/lib ConfigureParams: << --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-png \ --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/lib32 -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 ft_devel="%p/lib/freetype219-x86/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 $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 # 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 # 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 ./config.status make depend make << Shlibs: %p/lib/libwine.1.dylib 1.0.0 %n (>= 0.9.21-3) 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/X11/include << DescDetail: << Wine is a translation layer (a program loader) capable of running Windows applications on Linux and other POSIX compatible operating systems. Windows programs running in Wine act as native programs would, running without the performance or memory usage penalties of an emulator, with a similar look and feel to other applications on your desktop. << DescUsage: << 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 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/ SplitOff: << Package: %N-dev Depends: %N (= %v-%r) BuildDependsOnly: true Conflicts: wine-stable-dev Files: include lib/libwine.dylib << --- NEW FILE: freetype219-x86.info --- Package: freetype219-x86 Version: 2.4.4 Revision: 2 BuildDepends: fink (>= 0.24.12-1) Depends: %N-shlibs (= %v-%r) BuildConflicts: make (<= 3.79.1-3) Conflicts: freetype219-hinting Replaces: freetype219-hinting, %N-default BuildDependsOnly: True Source: http://download.savannah.gnu.org/releases/freetype/freetype-%v.tar.bz2 Source-MD5: b3e2b6e2f1c3e0dffa1fd2a0f848b671 #Source2: mirror:debian:pool/main/f/freetype/freetype_%v-1.diff.gz Source2: mirror:debian:pool/main/f/freetype/freetype_2.4.4-1.diff.gz Source2-MD5: 0beb8386f9eba23dbbc00ae6c0d02f89 PatchFile: freetype219.patch PatchFile-MD5: fe4d9c9a991e77575d861d9a4ec69d0a PatchScript: << %{default_script} gzip -dc ../freetype_2.4.4-1.diff.gz | patch -p1 patch -p0 < debian/patches-freetype/freetype-2.1.7-backwards.compat.patch patch -p1 < debian/patches-freetype/enable-gxvalid-otvalid.patch patch -p1 < debian/patches-freetype/enable-subpixel-rendering.patch << NoSetCPPFLAGS: true CompileScript: << #!/bin/sh -ev export CPATH=%p/include export CC="i686-apple-darwin11-gcc-4.2.1" export CXX="i686-apple-darwin11-g++-4.2.1" ./configure --prefix=%p/lib/%N --with-old-mac-fonts --disable-static --host=i686-apple-darwin11 make << InstallScript: << #!/bin/sh -ev make -j1 install DESTDIR="%d" rm -rf %i/lib/%N/share install -d -m 755 %i/share/doc/%N cp -pR docs/* %i/share/doc/%N/ # everything is buried in a private hierarchy... # now symlink from the default places # must not symlink dirs...risk of confusing dpkg << SplitOff: << Package: %N-shlibs Depends: dpkg-base-files Replaces: freetype219-hinting-shlibs, freetype2 (<< 2.0.8-2) Conflicts: freetype219-hinting-shlibs Files: lib/%N/lib/libfreetype.6*dylib Shlibs: %p/lib/%N/lib/libfreetype.6.dylib 13.0.0 %n (>= 2.4.4-1) DocFiles: ChangeLog* README docs/LICENSE.TXT Description: TrueType font rendering library, shared libs << DocFiles: ChangeLog* README docs/LICENSE.TXT Description: TrueType font rendering library, headers DescDetail: << FreeType 2 is a library that provides access to and rendering of a wide range of font file formats, including TrueType, PostScript Type 1, and several bitmap font formats. << DescPort: << * Previous versions by Christoph Pfisterer * 2006-08-06 Benjamin Reed <rangerr...@users.sourceforge.net> - updated to 2.2.1 - integrated patches from debian's freetype-2.2.1 for backwards-compatibility with 2.1.9 and earlier * 2006-11-14 Martin Costabel <costa...@users.sourceforge.net> - integrated endianness fix from freetype CVS * 2008-August/September Daniel Macks <dma...@netspace.org> - updated from 2.3.5 to 2.3.7 - implemented symlinking game from compiler-default paths << DescPackaging: << CPPFLAGS gets passed before local -I and we don't use any fink headers, so just omit default -I%p/include Don't install freetype2.m4 because...that's how we've always done it for this package. This is lowest-level x11-supplied lib fink overlays, so use dpkg-base-files to purify .la to avoid mixing (or at least make it easier to be self-consistent) in higher-level pkgs. 2.3.8 broke ABI (size of a public struct), which we didn't catch prior to release. 2.3.9 reverted to 2.3.7 ABI. We patch the public struct in 2.3.9+ to have the same size as 2.3.8 to avoid further breakage going forward. # But forgot to bump c_v for new public functions also. So hack # ltmain.sh to append ".0.1" to -compatibility_version so when # upstream fixes -version-info triplet x+1.y.z will be higher. # See: https://savannah.nongnu.org/bugs/?28483 No longer supply static (as of 2.4.4-2), therefore no longer need to propagate linking against libs that are not in public ABI. << License: OSI-Approved Homepage: http://www.freetype.org/ Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net> --- NEW FILE: libpng15-x86.info --- Package: libpng15-x86 Version: 1.5.5 Revision: 1 Depends: %N-shlibs (= %v-%r), pkgconfig BuildDepends: fink (>= 0.24.12-1) DescPackaging: << Uses pkgconfig, but there are no pkgconfig-related dependencies. << Source: mirror:sourceforge:libpng/libpng-%v.tar.bz2 Source-MD5: 3270bf2990c3174ae939388398de751e ConfigureParams: --mandir='${prefix}/share/man' --disable-dependency-tracking --host="i686-apple-darwin11" DocFiles: ANNOUNCE CHANGES INSTALL LICENSE README TODO BuildDependsOnly: True InfoTest: TestScript: make test CompileScript: << #!/bin/sh -ev export CC="/Developer/usr/bin/i686-apple-darwin11-gcc-4.2.1" export CXX="/Developer/usr/bin/i686-apple-darwin11-g++-4.2.1" ./configure %c make << InstallScript: << make install prefix=%i rm -rf %i/include rm -rf %i/share/man rm %i/bin/libpng-config ln -s libpng15-config-x86 %i/bin/libpng-config-x86 mv %i/bin/libpng15-config %i/bin/libpng15-config-x86 mv %i/lib %i/lib32 perl -pi -e 's,prefix}/lib,prefix}/lib32,' %i/bin/libpng15-config-x86 install_name_tool -id "%p/lib32/libpng15.15.dylib" %i/lib32/libpng15.15.dylib ls -laR %i << SplitOff: << Package: %N-shlibs Files: lib32/libpng15.15.dylib Shlibs: << %p/lib32/libpng15.15.dylib 21.0.0 %n (>= 1.5.5-1) << Description: Shared libraries for libpng15 package DocFiles: ANNOUNCE CHANGES INSTALL LICENSE README TODO << Description: PNG library (x86, no headers) DescPort: << The included Makefile for Darwin which builds dynamic libraries had been written by Christoph Pfisterer for the Fink project and accepted by the upstream maintainers of libpng. However, these days we use "configure" instead. Previous versions by Christoph Pfisterer. << License: OSI-Approved Homepage: http://www.libpng.org/pub/png/libpng.html Maintainer: Sjors Gielen <f...@sjorsgielen.nl> --- NEW FILE: freetype219.patch --- diff -Nurd -x'*~' freetype-2.4.4.orig/builds/unix/freetype-config.in freetype-2.4.4/builds/unix/freetype-config.in --- freetype-2.4.4.orig/builds/unix/freetype-config.in 2009-12-21 18:23:42.000000000 -0500 +++ freetype-2.4.4/builds/unix/freetype-config.in 2011-04-23 10:59:37.000000000 -0400 @@ -144,7 +144,7 @@ if test "$enable_shared" = "yes" ; then eval "rpath=\"$hardcode_libdir_flag_spec\"" fi - libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@" + libs="-lfreetype" if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then echo -L${SYSROOT}$libdir $libs else diff -Nurd -x'*~' freetype-2.4.4.orig/builds/unix/freetype2.in freetype-2.4.4/builds/unix/freetype2.in --- freetype-2.4.4.orig/builds/unix/freetype2.in 2009-07-03 09:28:24.000000000 -0400 +++ freetype-2.4.4/builds/unix/freetype2.in 2011-04-23 10:58:18.000000000 -0400 @@ -8,5 +8,4 @@ Version: @ft_version@ Requires: Libs: -L${libdir} -lfreetype -Libs.private: @LIBZ@ @FT2_EXTRA_LIBS@ Cflags: -I${includedir}/freetype2 -I${includedir} diff -Nurd -x'*~' freetype-2.4.4.orig/include/freetype/t1tables.h freetype-2.4.4/include/freetype/t1tables.h --- freetype-2.4.4.orig/include/freetype/t1tables.h 2009-07-03 09:28:24.000000000 -0400 +++ freetype-2.4.4/include/freetype/t1tables.h 2011-04-23 10:55:23.000000000 -0400 @@ -78,6 +78,15 @@ FT_Short underline_position; FT_UShort underline_thickness; + /* + 2.3.8 transiently had added: + FT_UShort fs_type; + then removed it again in 2.3.9. Field was private(?) but size of + struct was public, so this was backard-incompatible ABI break. + Fink didn't notice and pushed 2.3.8 widely. So now we add a + dummy member to remain at 2.3.8 size and avoid further breakage. + */ + FT_UShort fink_ABI_shim; } PS_FontInfoRec; ------------------------------------------------------------------------------ Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs