32-bit dependencies for Wine on Lion

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I've taken the liberty of making some updates to libpng15-32bit and
freetype219-32bit.  A common change to both was to use %p/lib/i386 as
the library directory--I think I had Linux on the brain when I said
"lib32".  By doing this via the --libdir configure parameter, the
install_name automatically gets set correctly, as does the library
information encoded in the .la and .pc files.

I also removed the Conflicts/Replaces *x86 entries, since those were
never released into the distribution.

Specific notes:

libpng15-32bit:
There's no reason to recycle the headers from libpng15 for packages
that use libpng15-32bit.  In fact, since there wasn't an explicit
dependency, it would have been possible for a build to use libpng14's
or libpng3's, and that wouldn't work.  As I've mentioned, it's more
standard and cleaner just to have libpng15-32bit Conflict/Replace
every other libpng*, and vice versa.  And if you do that, the
libpng15-config script can stay in the PATH, making it easier to use
_this_ package.

$ dpkg -L libpng15-32bit
/.
/sw
/sw/bin
/sw/bin/libpng15-config
/sw/include
/sw/include/libpng15
/sw/include/libpng15/png.h
/sw/include/libpng15/pngconf.h
/sw/include/libpng15/pnglibconf.h
/sw/lib
/sw/lib/i386
/sw/lib/i386/libpng15.a
/sw/lib/i386/libpng15.la
/sw/lib/i386/pkgconfig
/sw/lib/i386/pkgconfig/libpng15.pc
/sw/share
/sw/share/doc
/sw/share/doc/libpng15-32bit
/sw/share/doc/libpng15-32bit/ANNOUNCE
/sw/share/doc/libpng15-32bit/CHANGES
/sw/share/doc/libpng15-32bit/INSTALL
/sw/share/doc/libpng15-32bit/LICENSE
/sw/share/doc/libpng15-32bit/README
/sw/share/doc/libpng15-32bit/TODO
/sw/share/man
/sw/share/man/man3
/sw/share/man/man3/libpng.3
/sw/share/man/man3/libpngpf.3
/sw/share/man/man5
/sw/share/man/man5/png.5
/sw/bin/libpng-config
/sw/include/png.h
/sw/include/pngconf.h
/sw/include/pnglibconf.h
/sw/lib/i386/libpng.a
/sw/lib/i386/libpng.dylib
/sw/lib/i386/libpng.la
/sw/lib/i386/libpng15.dylib
/sw/lib/i386/pkgconfig/libpng.pc

$ dpkg -L libpng15-32bit-shlibs
/.
/sw
/sw/lib
/sw/lib/i386
/sw/lib/i386/libpng15.15.dylib
/sw/share
/sw/share/doc
/sw/share/doc/libpng15-32bit-shlibs
/sw/share/doc/libpng15-32bit-shlibs/ANNOUNCE
/sw/share/doc/libpng15-32bit-shlibs/CHANGES
/sw/share/doc/libpng15-32bit-shlibs/INSTALL
/sw/share/doc/libpng15-32bit-shlibs/LICENSE
/sw/share/doc/libpng15-32bit-shlibs/README
/sw/share/doc/libpng15-32bit-shlibs/TODO


freetype219-32bit:
As dmacks pointed out, freetype219 had a complicated past.  I've made
some changes to allow freetype219-32bit to start anew. :-)  With
Conflicts/Replaces freetype219 (among others) we can leave
freetype-config in the PATH, for ease of use by other packages that
may want this.

$ dpkg -L freetype219-32bit
/.
/sw
/sw/bin
/sw/bin/freetype-config
/sw/include
/sw/include/freetype2
/sw/include/freetype2/freetype
/sw/include/freetype2/freetype/config
/sw/include/freetype2/freetype/config/ftconfig.h
/sw/include/freetype2/freetype/config/ftheader.h
/sw/include/freetype2/freetype/config/ftmodule.h
/sw/include/freetype2/freetype/config/ftoption.h
/sw/include/freetype2/freetype/config/ftstdlib.h
/sw/include/freetype2/freetype/freetype.h
/sw/include/freetype2/freetype/ftadvanc.h
/sw/include/freetype2/freetype/ftbbox.h
/sw/include/freetype2/freetype/ftbdf.h
/sw/include/freetype2/freetype/ftbitmap.h
/sw/include/freetype2/freetype/ftcache.h
/sw/include/freetype2/freetype/ftchapters.h
/sw/include/freetype2/freetype/ftcid.h
/sw/include/freetype2/freetype/fterrdef.h
/sw/include/freetype2/freetype/fterrors.h
/sw/include/freetype2/freetype/ftgasp.h
/sw/include/freetype2/freetype/ftglyph.h
/sw/include/freetype2/freetype/ftgxval.h
/sw/include/freetype2/freetype/ftgzip.h
/sw/include/freetype2/freetype/ftimage.h
/sw/include/freetype2/freetype/ftincrem.h
/sw/include/freetype2/freetype/ftlcdfil.h
/sw/include/freetype2/freetype/ftlist.h
/sw/include/freetype2/freetype/ftlzw.h
/sw/include/freetype2/freetype/ftmac.h
/sw/include/freetype2/freetype/ftmm.h
/sw/include/freetype2/freetype/ftmodapi.h
/sw/include/freetype2/freetype/ftmoderr.h
/sw/include/freetype2/freetype/ftotval.h
/sw/include/freetype2/freetype/ftoutln.h
/sw/include/freetype2/freetype/ftpfr.h
/sw/include/freetype2/freetype/ftrender.h
/sw/include/freetype2/freetype/ftsizes.h
/sw/include/freetype2/freetype/ftsnames.h
/sw/include/freetype2/freetype/ftstroke.h
/sw/include/freetype2/freetype/ftsynth.h
/sw/include/freetype2/freetype/ftsystem.h
/sw/include/freetype2/freetype/fttrigon.h
/sw/include/freetype2/freetype/fttypes.h
/sw/include/freetype2/freetype/ftwinfnt.h
/sw/include/freetype2/freetype/ftxf86.h
/sw/include/freetype2/freetype/t1tables.h
/sw/include/freetype2/freetype/ttnameid.h
/sw/include/freetype2/freetype/tttables.h
/sw/include/freetype2/freetype/tttags.h
/sw/include/freetype2/freetype/ttunpat.h
/sw/include/ft2build.h
/sw/lib
/sw/lib/i386
/sw/lib/i386/libfreetype.la
/sw/lib/i386/pkgconfig
/sw/lib/i386/pkgconfig/freetype2.pc
/sw/share
/sw/share/aclocal
/sw/share/aclocal/freetype2.m4
/sw/share/doc
/sw/share/doc/freetype219-32bit
/sw/share/doc/freetype219-32bit/ChangeLog
/sw/share/doc/freetype219-32bit/ChangeLog.20
/sw/share/doc/freetype219-32bit/ChangeLog.21
/sw/share/doc/freetype219-32bit/ChangeLog.22
/sw/share/doc/freetype219-32bit/ChangeLog.23
/sw/share/doc/freetype219-32bit/LICENSE.TXT
/sw/share/doc/freetype219-32bit/README
/sw/lib/i386/libfreetype.dylib

$ dpkg -L freetype219-32bit-shlibs
/.
/sw
/sw/lib
/sw/lib/i386
/sw/lib/i386/libfreetype.6.dylib
/sw/share
/sw/share/doc
/sw/share/doc/freetype219-32bit-shlibs
/sw/share/doc/freetype219-32bit-shlibs/ChangeLog
/sw/share/doc/freetype219-32bit-shlibs/ChangeLog.20
/sw/share/doc/freetype219-32bit-shlibs/ChangeLog.21
/sw/share/doc/freetype219-32bit-shlibs/ChangeLog.22
/sw/share/doc/freetype219-32bit-shlibs/ChangeLog.23
/sw/share/doc/freetype219-32bit-shlibs/LICENSE.TXT
/sw/share/doc/freetype219-32bit-shlibs/README


wine-32bit doesn't build here, due to the use of compilers that are
unavailable on Xcode 4.2.x  (as is, it might well work on
10.6/x86_64/Xcode 3.2.6, though, if the listed xcode dependency were
removed).

I'm suggesting the following changes currently, though:

diff -r1.1 wine-32bit.info
3c3
< Revision: 3
- ---
> Revision: 4
32c32
<  glib2-dev, xcode (>= 4.1-1), libpng15-32bit, libpng15
- ---
> glib2-dev, xcode (= 4.1-1), libpng15-32bit (>=1.5.5-2)
36c36
<  freetype219-32bit-shlibs, giflib-shlibs | libungif-shlibs,
- ---
> freetype219-32bit-shlibs (>=2.4.4-4), giflib-shlibs |
> libungif-shlibs,
40c40
<  glib2-shlibs, libpng15-32bit-shlibs
- ---
> glib2-shlibs, libpng15-32bit-shlibs (>=1.5.5-2)
49c49
<  wine-stable, libpng15-x86
- ---
> wine-stable
52c52
<  wine-stable, libpng15-x86
- ---
> wine-stable
77c77
<  export LDFLAGS="-L%p/lib32 -L/%p/lib/system-openssl/lib -Wl,-no_pie"
- ---
> export LDFLAGS="-L%p/lib/i386 -L/%p/lib/system-openssl/lib
> -Wl,-no_pie"



-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk8u3QsACgkQB8UpO3rKjQ8dZACfQb8qnKt0HJaEYAzAlKR1c/Vy
4HAAn26skxn1XrZIRVf436aQ14PPBCE1
=0Ebp
-----END PGP SIGNATURE-----

------------------------------------------------------------------------------
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-core mailing list
[email protected]
List archive:
http://news.gmane.org/gmane.os.apple.fink.core
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-core

Package: freetype219-32bit
Version: 2.4.4
Revision: 4
BuildDepends: fink (>= 0.24.12-1)
Depends: %N-shlibs (= %v-%r)
BuildConflicts: make (<= 3.79.1-3)
Conflicts: freetype219-hinting, freetype219
Replaces: freetype219-hinting, freetype219-default, freetype219
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 CFLAGS="-arch i386"
	export CXXFLAGS="$CFLAGS"
	export LDFLAGS="$CFLAGS"
	./configure --prefix=%p --libdir=%p/lib/i386 --with-old-mac-fonts --disable-static
	make
<<
InstallScript: <<
#!/bin/sh -ev
	make install DESTDIR="%d"
<<

SplitOff: <<
	Package: %N-shlibs
	Depends: dpkg-base-files
	Replaces:  freetype219-hinting-shlibs, freetype2 (<< 2.0.8-2)
	Conflicts: freetype219-hinting-shlibs
	Files: lib/i386/libfreetype.6*dylib
	Shlibs: %p/lib/i386/libfreetype.6.dylib 13.0.0 %n (>= 2.4.4-4)
	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 <[email protected]>
  - 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 <[email protected]>
  - integrated endianness fix from freetype CVS
* 2008-August/September Daniel Macks <[email protected]>
  - 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/
# Original maintainer for non-32bit version of package: The Gnome Core
# Team <[email protected]>
Maintainer: Sjors Gielen <[email protected]>

Package: libpng15-32bit
Version: 1.5.5
Revision: 2
BuildDepends: fink-package-precedence
Depends: %N-shlibs (= %v-%r), pkgconfig
DescPackaging: <<
 Uses pkgconfig, but there are no pkgconfig-related dependencies.
<<
Conflicts: libpng, libpng3, libpng14, libpng15
Replaces: libpng, libpng3, libpng14, libpng15
Source: mirror:sourceforge:libpng/libpng-%v.tar.bz2
Source-MD5: 3270bf2990c3174ae939388398de751e
ConfigureParams: --mandir='${prefix}/share/man' --libdir=%p/lib/i386
DocFiles: ANNOUNCE CHANGES INSTALL LICENSE README TODO
BuildDependsOnly: True
InfoTest: TestScript: make test
CompileScript: <<
#!/bin/sh -ev
 export CFLAGS="-arch i386"
 export CXXFLAGS="$CFLAGS"
 export LDFLAGS="$CFLAGS"
 %{default_script}
 fink-package-precedence . 
<<
InstallScript: <<
 make install DESTDIR=%d
<<
SplitOff: <<
  Package: %N-shlibs
  Files: lib/i386/libpng15.15.dylib
  Shlibs: <<
    %p/lib/i386/libpng15.15.dylib 21.0.0 %n (>= 1.5.5-2)
  <<
  Description: Shared libraries for libpng15 package
  DocFiles: ANNOUNCE CHANGES INSTALL LICENSE README TODO
<<
Description: PNG library (32-bit)
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: Dave Morrison <[email protected]>