[pkg-wine-party] Bug#637650: patches for 1.0.1-3.2 NMU
Robert Millan
rmh at debian.org
Sat Aug 13 12:29:35 UTC 2011
Package: wine
Version: 1.0.1-3.2
Severity: important
Tags: patch
Here are the patches for 1.0.1-3.2 NMU.
-- System Information:
Debian Release: 6.0.2
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: kfreebsd-amd64 (x86_64)
Kernel: kFreeBSD 8.2-1-amd64
Locale: LANG=ca_AD.utf8, LC_CTYPE=ca_AD.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-------------- next part --------------
=== modified file 'debian/control'
--- debian/control 2011-08-13 12:25:57 +0000
+++ debian/control 2011-08-13 12:26:13 +0000
@@ -25,7 +25,8 @@ Build-Depends: debhelper (>= 5), flex |
libhal-dev, libdbus-1-dev | dbus-1-dev, libgphoto2-2-dev, liblcms1-dev, libldap2-dev,
libssl-dev, libxml2-dev, libxslt1-dev, unixodbc-dev, prelink [i386 amd64],
dctrl-tools | grep-dctrl, lzma, sharutils,
- gcc-multilib [amd64 kfreebsd-amd64] | gcc-4.1 (<< 4.1.2) [amd64 kfreebsd-amd64],
+ gcc-4.4,
+ gcc-4.4-multilib [amd64 kfreebsd-amd64] | gcc-4.1 (<< 4.1.2) [amd64 kfreebsd-amd64],
ia32-libs (>= 1.19) [amd64 kfreebsd-amd64],
ia32-libs-dev [amd64 kfreebsd-amd64],
lib32ncurses5-dev [amd64 kfreebsd-amd64], lib32asound2-dev [amd64],
=== modified file 'debian/rules'
--- debian/rules 2011-08-11 11:47:01 +0000
+++ debian/rules 2011-08-13 12:26:13 +0000
@@ -6,6 +6,8 @@ export SHELL=bash
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+CC=gcc-4.4
+
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS=-O0 -g
else
@@ -76,6 +78,7 @@ configure-arch32-stamp: configure-ia32-s
ifeq (,$(DEB_SAVEBUILD))
mkdir build32 || true
cd build32 && \
+ CC="$(CC)" \
CFLAGS="$(CFLAGS)" \
LDFLAGS="$(LDFLAGS)" \
../configure --disable-win64 $(CONFIGOPTS) \
@@ -97,6 +100,7 @@ configure-arch64-stamp: configure-ia32-s
ifeq (,$(DEB_SAVEBUILD))
mkdir build64 || true
cd build64 && \
+ CC="$(CC)" \
CFLAGS="$(CFLAGS)" \
LDFLAGS="$(LDFLAGS)" \
../configure --enable-win64 $(CONFIGOPTS) \
-------------- next part --------------
=== modified file 'debian/control'
--- debian/control 2011-08-11 09:04:24 +0000
+++ debian/control 2011-08-13 12:25:57 +0000
@@ -12,8 +12,8 @@ Build-Depends: debhelper (>= 5), flex |
libxxf86vm-dev | xlibs-static-dev (<< 6) | xlibs-dev (<< 4.3),
libxinerama-dev | xlibs-static-dev (<< 6) | xlibs-dev (<< 4.3),
libxcomposite-dev | xlibs-static-dev (<< 6) | xlibs-dev (<< 4.3),
- xlibmesa-gl-dev | xlibmesa-dev (<< 4.3) | libgl-dev,
- libglu1-xorg-dev | xlibmesa-glu-dev | xlibmesa-dev (<= 4.2.1-4) | libglu-dev,
+ libgl1-mesa-dev | xlibmesa-gl-dev | xlibmesa-dev (<< 4.3) | libgl-dev,
+ libglu1-mesa-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, libcups2-dev | libcupsys2-dev,
libjpeg62-dev | libjpeg-dev, libpng12-dev | libpng3-dev | libpng-dev,
-------------- next part --------------
=== modified file 'configure'
--- configure 2011-08-11 09:04:24 +0000
+++ configure 2011-08-11 11:47:01 +0000
@@ -16685,12 +16685,12 @@ MAIN_BINARY="wine-pthread"
case $host_cpu in
*i[3456789]86*)
case $host_os in
- linux* | k*bsd*-gnu)
+ linux*)
MAIN_BINARY="wine-glibc"
EXTRA_BINARIES="wine-kthread wine-pthread wine-preloader"
;;
- freebsd*)
+ freebsd* | kfreebsd*-gnu)
MAIN_BINARY="wine-freebsd"
EXTRA_BINARIES="wine-pthread"
=== modified file 'configure.ac'
--- configure.ac 2011-08-11 09:04:24 +0000
+++ configure.ac 2011-08-11 11:47:01 +0000
@@ -1308,10 +1308,10 @@ AC_SUBST(MAIN_BINARY,"wine-pthread") dn
case $host_cpu in
*i[[3456789]]86*)
case $host_os in
- linux* | k*bsd*-gnu)
+ linux*)
AC_SUBST(MAIN_BINARY,"wine-glibc")
AC_SUBST(EXTRA_BINARIES,"wine-kthread wine-pthread wine-preloader") ;;
- freebsd*)
+ freebsd* | kfreebsd*-gnu)
AC_SUBST(MAIN_BINARY,"wine-freebsd")
AC_SUBST(EXTRA_BINARIES,"wine-pthread") ;;
esac
=== modified file 'debian/libwine.install'
--- debian/libwine.install 2011-08-11 09:04:24 +0000
+++ debian/libwine.install 2011-08-11 11:47:01 +0000
@@ -12,9 +12,7 @@ debian/tmp/usr/lib/wine/*.drv16
debian/tmp/usr/lib/wine/*.exe16
debian/tmp/usr/lib/wine/*.mod16
debian/tmp/usr/lib/wine/wine.bin
-debian/tmp/usr/lib/wine/wine-kthread
-debian/tmp/usr/lib/wine/wine-pthread
-debian/tmp/usr/lib/wine/wine-preloader
+debian/tmp/usr/lib/wine/wine-*
debian/tmp/usr/lib/wine/wineserver
debian/tmp/usr/share/wine/generic.ppd
debian/tmp/usr/share/wine/fonts
=== modified file 'debian/rules'
--- debian/rules 2011-08-11 09:04:24 +0000
+++ debian/rules 2011-08-11 11:47:01 +0000
@@ -195,9 +195,11 @@ install-arch32-stamp: build-arch32-stamp
$(MAKE) -C build32 install prefix=`pwd`/debian/tmp/usr libdir=`pwd`/debian/tmp/usr/lib
# move the real binaries into /usr/lib/wine
mv debian/tmp/usr/bin/wine debian/tmp/usr/lib/wine/wine.bin
- mv debian/tmp/usr/bin/wine-kthread debian/tmp/usr/lib/wine/wine-kthread
mv debian/tmp/usr/bin/wine-pthread debian/tmp/usr/lib/wine/wine-pthread
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
+ mv debian/tmp/usr/bin/wine-kthread debian/tmp/usr/lib/wine/wine-kthread
mv debian/tmp/usr/bin/wine-preloader debian/tmp/usr/lib/wine/wine-preloader
+endif
mv debian/tmp/usr/bin/wineserver debian/tmp/usr/lib/wine/wineserver
# install manpages
$(MAKE) -C build32/documentation install prefix=`pwd`/debian/tmp/usr
=== modified file 'dlls/kernel32/cpu.c'
--- dlls/kernel32/cpu.c 2011-08-11 09:04:24 +0000
+++ dlls/kernel32/cpu.c 2011-08-11 12:22:19 +0000
@@ -630,7 +630,7 @@ VOID WINAPI GetSystemInfo(
}
}
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
{
int ret, num;
unsigned len;
=== modified file 'dlls/ntdll/cdrom.c'
--- dlls/ntdll/cdrom.c 2011-08-11 09:04:24 +0000
+++ dlls/ntdll/cdrom.c 2011-08-11 12:22:19 +0000
@@ -438,7 +438,7 @@ static NTSTATUS CDROM_SyncCache(int dev,
cdrom_cache[dev].toc_good = 1;
return STATUS_SUCCESS;
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
int i, tsz;
struct ioc_toc_header hdr;
@@ -602,7 +602,7 @@ static int CDROM_GetInterfaceInfo(int fd
return 1;
}
return 0;
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
FIXME("not implemented for BSD\n");
return 0;
#else
@@ -717,7 +717,7 @@ static NTSTATUS CDROM_ResetAudio(int fd)
{
#if defined(linux)
return CDROM_GetStatusCode(ioctl(fd, CDROMRESET));
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
return CDROM_GetStatusCode(ioctl(fd, CDIOCRESET, NULL));
#else
return STATUS_NOT_SUPPORTED;
@@ -733,7 +733,7 @@ static NTSTATUS CDROM_SetTray(int fd, BO
{
#if defined(linux)
return CDROM_GetStatusCode(ioctl(fd, doEject ? CDROMEJECT : CDROMCLOSETRAY));
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
return CDROM_GetStatusCode((ioctl(fd, CDIOCALLOW, NULL)) ||
(ioctl(fd, doEject ? CDIOCEJECT : CDIOCCLOSE, NULL)) ||
(ioctl(fd, CDIOCPREVENT, NULL)));
@@ -754,7 +754,7 @@ static NTSTATUS CDROM_ControlEjection(in
{
#if defined(linux)
return CDROM_GetStatusCode(ioctl(fd, CDROM_LOCKDOOR, rmv->PreventMediaRemoval));
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
return CDROM_GetStatusCode(ioctl(fd, (rmv->PreventMediaRemoval) ? CDIOCPREVENT : CDIOCALLOW, NULL));
#else
return STATUS_NOT_SUPPORTED;
@@ -908,7 +908,7 @@ static NTSTATUS CDROM_ReadQChannel(int d
end:
ret = CDROM_GetStatusCode(io);
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
SUB_Q_HEADER* hdr = (SUB_Q_HEADER*)data;
int io;
struct ioc_read_subchannel read_sc;
@@ -1033,7 +1033,7 @@ static NTSTATUS CDROM_Verify(int dev, in
return STATUS_SUCCESS;
else
return STATUS_NO_MEDIA_IN_DEVICE;
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
int ret;
ret = ioctl(fd, CDIOCSTART, NULL);
if(ret == 0)
@@ -1082,7 +1082,7 @@ static NTSTATUS CDROM_PlayAudioMSF(int f
msf.cdmsf_min1, msf.cdmsf_sec1, msf.cdmsf_frame1);
end:
ret = CDROM_GetStatusCode(io);
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
struct ioc_play_msf msf;
int io;
@@ -1127,7 +1127,7 @@ static NTSTATUS CDROM_SeekAudioMSF(int d
#if defined(linux)
struct cdrom_msf0 msf;
struct cdrom_subchnl sc;
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
struct ioc_play_msf msf;
struct ioc_read_subchannel read_sc;
struct cd_sub_channel_info sc;
@@ -1180,7 +1180,7 @@ static NTSTATUS CDROM_SeekAudioMSF(int d
return CDROM_GetStatusCode(ioctl(fd, CDROMSEEK, &msf));
}
return STATUS_SUCCESS;
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
read_sc.address_format = CD_MSF_FORMAT;
read_sc.track = 0;
read_sc.data_len = sizeof(sc);
@@ -1220,7 +1220,7 @@ static NTSTATUS CDROM_PauseAudio(int fd)
{
#if defined(linux)
return CDROM_GetStatusCode(ioctl(fd, CDROMPAUSE));
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
return CDROM_GetStatusCode(ioctl(fd, CDIOCPAUSE, NULL));
#else
return STATUS_NOT_SUPPORTED;
@@ -1236,7 +1236,7 @@ static NTSTATUS CDROM_ResumeAudio(int fd
{
#if defined(linux)
return CDROM_GetStatusCode(ioctl(fd, CDROMRESUME));
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
return CDROM_GetStatusCode(ioctl(fd, CDIOCRESUME, NULL));
#else
return STATUS_NOT_SUPPORTED;
@@ -1252,7 +1252,7 @@ static NTSTATUS CDROM_StopAudio(int fd)
{
#if defined(linux)
return CDROM_GetStatusCode(ioctl(fd, CDROMSTOP));
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
return CDROM_GetStatusCode(ioctl(fd, CDIOCSTOP, NULL));
#else
return STATUS_NOT_SUPPORTED;
@@ -1279,7 +1279,7 @@ static NTSTATUS CDROM_GetVolume(int fd,
vc->PortVolume[3] = volc.channel3;
}
return CDROM_GetStatusCode(io);
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
struct ioc_vol volc;
int io;
@@ -1313,7 +1313,7 @@ static NTSTATUS CDROM_SetVolume(int fd,
volc.channel3 = vc->PortVolume[3];
return CDROM_GetStatusCode(ioctl(fd, CDROMVOLCTRL, &volc));
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
struct ioc_vol volc;
volc.vol[0] = vc->PortVolume[0];
@@ -1757,7 +1757,7 @@ static NTSTATUS DVD_StartSession(int fd,
ret =CDROM_GetStatusCode(ioctl(fd, DVD_AUTH, &auth_info));
*sid_out = auth_info.lsa.agid;
return ret;
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
return STATUS_NOT_SUPPORTED;
#else
return STATUS_NOT_SUPPORTED;
@@ -1780,7 +1780,7 @@ static NTSTATUS DVD_EndSession(int fd, c
TRACE("\n");
return CDROM_GetStatusCode(ioctl(fd, DVD_AUTH, &auth_info));
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
return STATUS_NOT_SUPPORTED;
#else
return STATUS_NOT_SUPPORTED;
@@ -1910,7 +1910,7 @@ static NTSTATUS DVD_ReadKey(int fd, PDVD
FIXME("Unknown keytype 0x%x\n",key->KeyType);
}
return ret;
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
TRACE("bsd\n");
return STATUS_NOT_SUPPORTED;
#else
=== modified file 'dlls/ntdll/signal_i386.c'
--- dlls/ntdll/signal_i386.c 2011-08-11 09:04:24 +0000
+++ dlls/ntdll/signal_i386.c 2011-08-11 12:22:19 +0000
@@ -345,10 +345,14 @@ static int fpux_support; /* whether the
extern void DECLSPEC_NORETURN __wine_call_from_32_restore_regs( const CONTEXT *context );
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#include <machine/trap.h> /* T_DIVIDE, etc */
+#endif
+
enum i386_trap_code
{
TRAP_x86_UNKNOWN = -1, /* Unknown fault (TRAP_sig not defined) */
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
TRAP_x86_DIVIDE = T_DIVIDE, /* Division by zero exception */
TRAP_x86_TRCTRAP = T_TRCTRAP, /* Single-step exception */
TRAP_x86_NMI = T_NMI, /* NMI interrupt */
=== modified file 'libs/wine/ldt.c'
--- libs/wine/ldt.c 2011-08-11 09:04:24 +0000
+++ libs/wine/ldt.c 2011-08-12 14:18:23 +0000
@@ -416,6 +416,8 @@ unsigned short wine_ldt_alloc_fs(void)
}
else global_fs_sel = (ldt_info.entry_number << 3) | 3;
#elif defined(__FreeBSD__)
+ /* FIXME: enabling this may cause regression on GNU/kFreeBSD, see
+ Debian bug #637528 */
global_fs_sel = GSEL( GUFS_SEL, SEL_UPL );
#endif
}
@@ -444,6 +446,8 @@ void wine_ldt_init_fs( unsigned short se
fill_modify_ldt_struct( &ldt_info, entry );
if ((ret = set_thread_area( &ldt_info ) < 0)) perror( "set_thread_area" );
#elif defined(__FreeBSD__)
+ /* FIXME: enabling this may cause regression on GNU/kFreeBSD, see
+ Debian bug #637528 */
i386_set_fsbase( wine_ldt_get_base( entry ));
#endif
}
-------------- next part --------------
=== modified file 'debian/changelog'
--- debian/changelog 2011-08-11 09:04:24 +0000
+++ debian/changelog 2011-08-13 12:26:18 +0000
@@ -1,3 +1,15 @@
+wine (1.0.1-3.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add `libgl1-mesa-dev' as primary option for `xlibmesa-gl-dev', and
+ `libglu1-mesa-dev' as primary option for `libglu1-xorg-dev' build
+ dependencies. (Closes: #623923)
+ * Fix FTBFS with gcc-4.6 (keep using gcc-4.4; proper gcc-4.6 support
+ is likely to be available with new upstream release).
+ * Fix GNU/kFreeBSD support. (Closes: #591837)
+
+ -- Robert Millan <rmh at debian.org> Sat, 13 Aug 2011 00:10:11 +0000
+
wine (1.0.1-3.1) unstable; urgency=low
* Non-maintainer upload.
More information about the pkg-wine-party
mailing list