Subject: Updates to wine-1.4.1-2 -- acceptable for wheezy?
Package: release.debian.org
Severity: normal
After wine_1.4.1-2 has now migrated, there are still a few non-RC but
quite annoying and user-visible bugs left that we would like to fix for
the wheezy release.
Since some of these fixes are not exactly one-line patches, I'd like to
know whether the following attached patches would be acceptable from the
release team's point of view before we push them along with a fix for
#687062 (RC: missing copyright file).
- #474289: The libnss-mdns bug can no longer be reproduced on amd64
systems, so the warning that is displayed on every invokation of
wine should be considered useless, annoying, and misleading. It
should just go away (warning.patch)
- #681595, #685196: Some programs developed display problems after
*.fon files had removed from the package because the fnt2fon
program that is used to create them did not work properly on
big-endian architectures and so architecture-dependent files had
ended up in libwine (#676443).
Upstream has already accepted a patch by me that fixes the
endianess issue in fnt2fon. Adding this patch and re-including the
*.fon files is what I consider the proper solution (font-1.patch,
font-2.patch).
- wine64-bin: It has been pointed out in some bug reports (for example
#678001) that printing the multiarch instructions to STDOUT is not
enough. wine64.patch contains a change that uses xmessage.
- #677538, #679572: Add an SVG icon so desktop environments have
something to display with the .desktop files. (icon.patch)
Cheers,
-Hilko
From 015c816a3f24591affa20287a51726b6bc08e266 Mon Sep 17 00:00:00 2001
From: Hilko Bengen ben...@debian.org
Date: Sat, 7 Jul 2012 16:07:08 +0200
Subject: [PATCH] Remove libnss-mdns warning as the issue seems to have been
fixed (closes: #474289)
---
debian/winelauncher | 28
1 file changed, 28 deletions(-)
mode change 100644 = 100755 debian/winelauncher
diff --git a/debian/winelauncher b/debian/winelauncher
old mode 100644
new mode 100755
index f198cee..3f9c512
--- a/debian/winelauncher
+++ b/debian/winelauncher
@@ -31,34 +31,6 @@ if [ `basename $0` = wine-safe ]; then
fi
fi
-# Check for known problem with amd64
-if [ $ARCH = amd64 ]; then
-
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430845
-if grep -q ^hosts:.*mdns4_minimal \[NOTFOUND=return\] /etc/nsswitch.conf \
- [ ! -e /usr/lib32/libnss_mdns4.so.2 ]; then
- $XMESSAGE -center \
- -title Wine Warning \
-
- It appears that libnss-mdns is installed on your system,
- but lib32nss-mdns is not. Please note that Wine will not be
- able to access the Internet unless you either install
- lib32nss-mdns (or ia32-libnss-mdns), or uninstall libnss-mdns.
- 2/dev/null
- notify=$?
- if [ $notify -eq 1 ] ; then
- # xmessage was unable to notify the user, try tty instead
- echo It appears that libnss-mdns is installed on your system, 2
- echo but lib32nss-mdns is not. Please note that Wine will not be 2
- echo able to access the Internet unless you either install 2
- echo lib32nss-mdns (or ia32-libnss-mdns), or uninstall libnss-mdns. 2
- echo -n (okay) 2
- read confirm
- fi
-fi # nss_mdns4
-
-fi # amd64
-
# Launch Wine
export WINELOADER=/usr/lib/wine/wine.bin
exec $WINELOADER $@
--
1.7.10.4
From 2f62ca012c0154e58d432c7dc69ec6f98e113621 Mon Sep 17 00:00:00 2001
From: Hilko Bengen ben...@debian.org
Date: Tue, 3 Jul 2012 21:09:01 +0200
Subject: [PATCH 1/2] sfnt2fnt: Fix broken .fon files on big-endian
architectures
(cherry picked from upstream commit fb16ce1fe092438216e878a9d5fad63d06100caa)
---
tools/sfnt2fnt.c | 135 +-
1 file changed, 102 insertions(+), 33 deletions(-)
diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c
index df43ec0..07c82b1 100644
--- a/tools/sfnt2fnt.c
+++ b/tools/sfnt2fnt.c
@@ -43,6 +43,7 @@
#include wine/unicode.h
#include wingdi.h
+#include basetsd.h
#include pshpack1.h
@@ -187,11 +188,30 @@ typedef struct
} FT_Version_t;
static FT_Version_t FT_Version;
+#include poppack.h
+
#define GET_BE_WORD(ptr) MAKEWORD( ((BYTE *)(ptr))[1], ((BYTE *)(ptr))[0] )
#define GET_BE_DWORD(ptr) ((DWORD)MAKELONG( GET_BE_WORD(((WORD *)(ptr))[1]), \
GET_BE_WORD(((WORD *)(ptr))[0]) ))
-
-#include poppack.h
+#ifdef WORDS_BIGENDIAN
+static WORD byteswap_word(WORD x)
+{
+return ( ( (x 0xff) 8) |
+ ( (x 0xff00) 8) );
+}
+static DWORD byteswap_dword(DWORD x)
+{
+return ( ( (x 0xff) 24) |
+ ( (x 0xff00) 8) |
+ ( (x 0xff) 8) |
+ ( (x 0xff00) 24) );
+}
+# define PUT_LE_WORD(x) byteswap_word(x)
+# define PUT_LE_DWORD(x) byteswap_dword(x)
+#else
+# define PUT_LE_WORD(x) (x)
+# define PUT_LE_DWORD(x) (x)
+#endif
struct fontinfo
{
@@ -378,7 +398,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc,
size_table =
