Now that lib32icu-dev is in unstable, I guess there should be no problem with
fixing this bug.
I'm attaching an updated patch.
On Tue, Aug 07, 2007 at 08:08:18PM +0200, Robert Millan wrote:
> severity 381341 important
> merge 381341 430845
> tags 381341 patch
> thanks
>
> Hi,
>
> It is now possible to properly compile a 32-bit wine on amd64. See attached
> patch. It's tested and known to work on etch and sid.
>
> As collateral benefit, this fixes #430845. I'm merging it.
>
> Notes on the patch:
>
> - While I was at it, I simplified some Build-Depends rules which were
> there to support old debian releases.
> - libicu hack is no longer necessary at all because of upstream fix:
> 2007-05-07 Alexandre Julliard <[EMAIL PROTECTED]>
>
> Btw, remember to get rid of the stale amd64.lzma.uu ;-)
--
Robert Millan
<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call, if you are unable to speak?
(as seen on /.)
diff -ur wine-0.9.44.old/debian/control wine-0.9.44/debian/control
--- wine-0.9.44.old/debian/control 2007-09-20 12:38:15.000000000 +0000
+++ wine-0.9.44/debian/control 2007-09-20 12:49:06.000000000 +0000
@@ -13,16 +13,18 @@
xlibmesa-gl-dev | xlibmesa-dev (<< 4.3) | libgl-dev,
libglu1-xorg-dev | xlibmesa-glu-dev | xlibmesa-dev (<= 4.2.1-4) | libglu-dev,
freeglut3-dev | libglut-dev | glutg3-dev, libxmu-dev | xlibs-dev (<< 4.3),
- libxcursor-dev | xlibs-dev (<< 4.3), libncurses5-dev, libcupsys2-dev,
+ libxcursor-dev | xlibs-dev (<< 4.3), libcupsys2-dev,
+ libncurses5-dev [!amd64 !kfreebsd-amd64] | lib32ncurses5-dev [amd64 kfreebsd-amd64],
libjpeg62-dev | libjpeg-dev, libungif4-dev, libfreetype6-dev,
- libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libasound2-dev [!amd64 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] | lib32asound2-dev [amd64],
libjack0.100.0-dev | libjack0.80.0-dev | libjack0.71.2-dev | libjack0.50.0-dev,
libaudio-dev | nas-dev, libesd0-dev, libsane-dev, libusb-dev,
libicu36-dev | libicu34-dev (>= 3.4-4) | libicu28-dev,
+ libicu36-dev [amd64 kfreebsd-amd64] | libicu34-dev (>= 3.4-4) [amd64 kfreebsd-amd64] | libicu28-dev [amd64 kfreebsd-amd64],
libfontconfig1-dev, libssl-dev, libcapi20-dev (>= 1:3.3.0.20041024-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libhal-dev, libdbus-1-dev | dbus-1-dev, libgphoto2-2-dev, liblcms1-dev, libldap2-dev,
libxml2-dev, libxslt1-dev, fontforge, prelink,
- grep-dctrl, lzma, sharutils
+ libc6-dev-i386 [amd64 kfreebsd-amd64], lib32z1-dev [amd64 kfreebsd-amd64], ia32-libs (>= 1.19) [amd64 kfreebsd-amd64]
Standards-Version: 3.6.2
Package: wine
diff -ur wine-0.9.44.old/debian/rules wine-0.9.44/debian/rules
--- wine-0.9.44.old/debian/rules 2007-09-20 12:38:15.000000000 +0000
+++ wine-0.9.44/debian/rules 2007-09-20 12:47:38.000000000 +0000
@@ -18,7 +18,6 @@
configure: configure-stamp
configure-stamp:
dh_testdir
-ifneq ($(DEB_HOST_GNU_CPU), x86_64)
CFLAGS="$(CFLAGS)" \
./configure --with-x --enable-opengl --prefix=/usr \
--sysconfdir=/etc \
@@ -26,7 +25,6 @@
--libdir=\$${prefix}/lib \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info
-endif
touch configure-stamp
@@ -40,13 +38,11 @@
build-arch-stamp: configure-stamp
dh_testdir
-ifneq ($(DEB_HOST_GNU_CPU), x86_64)
$(MAKE) depend
# build wine & tools
$(MAKE)
# build winelib programs
$(MAKE) -C programs
-endif
touch build-arch-stamp
@@ -74,7 +70,6 @@
# create installation directories
dh_installdirs -s
-ifneq ($(DEB_HOST_GNU_CPU), x86_64)
# install wine, libwine, and tools
$(MAKE) install prefix=`pwd`/debian/tmp/usr libdir=`pwd`/debian/tmp/usr/lib
# move the real binaries into /usr/lib/wine,
@@ -94,7 +89,6 @@
cp debian/mime-info.mime debian/tmp/usr/share/mime-info/wine.mime
cp debian/mime-info.keys debian/tmp/usr/share/mime-info/wine.keys
cp debian/wine.binfmt debian/tmp/usr/share/binfmts/wine
-endif
install: install-arch
@@ -117,7 +111,6 @@
dh_testdir
dh_testroot
-ifneq ($(DEB_HOST_GNU_CPU), x86_64)
# distribute the files in debian/tmp into debian/<packagename>
# according to the <packagename>.files files
dh_movefiles -s
@@ -152,7 +145,6 @@
mv debian/libwine/usr/lib/wine/wldap32* debian/libwine-ldap/usr/lib/wine
mv debian/libwine/usr/lib/wine/winenas* debian/libwine-nas/usr/lib/wine
mv debian/libwine/usr/lib/wine/wineps* debian/libwine-print/usr/lib/wine
-endif
dh_installdocs -s
# dh_installmenu -s
@@ -190,15 +182,6 @@
echo "jack=, libjack0.50.0-0" >> debian/libwine-jack.substvars) || \
true
-ifeq ($(DEB_HOST_GNU_CPU)-$(DEB_HOST_GNU_SYSTEM), x86_64-linux-gnu)
- # Using compressed 32-bit build. Make sure it's the latest one!!
- uudecode < debian/amd64.tar.lzma.uu | lzma -d | tar -xpf -
-endif
-ifeq ($(DEB_HOST_GNU_CPU)-$(DEB_HOST_GNU_SYSTEM), i486-linux-gnu)
- # Generating compressed 32-bit build. Make sure to keep your *_i386.deb in sync with this file in your *.diff.gz!!
- tar -cpf - `grep-dctrl -v "Architecture: all" debian/control | grep "^Package: " | sed -e "s,^Package: ,debian/,g"` \
- | lzma -c9 | uuencode - > debian/amd64.tar.lzma.uu
-endif
dh_gencontrol -s
dh_md5sums -s
dh_builddeb -s
