Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

wine-stable: bump to 9.0

This commit is contained in:
Chongyun Lee 2024-01-18 17:56:22 +08:00
parent 41235bf0dc
commit 3666cb2fd7
5 changed files with 43 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
x11-packages/wine-stable/0001-fix-paths.patch
View File

@ -24,19 +24,20 @@ diff -uNr a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c
diff -uNr a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
--- a/dlls/dbghelp/module.c
+++ b/dlls/dbghelp/module.c
@@ -658,9 +658,9 @@
@@ -671,10 +671,10 @@
fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link));
if (!fmap_link) return FALSE;
if (!fmap_link) return NULL;
- p = malloc(sizeof(L"/usr/lib/debug/.build-id/") +
+ p = malloc(sizeof(L"/data/data/com.termux/files/usr/lib/debug/.build-id/") +
+ p = malloc(sizeof(L"@TERMUX_PREFIX@//lib/debug/.build-id/") +
(idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug"));
if (!p) goto fail;
- wcscpy(p, L"/usr/lib/debug/.build-id/");
+ wcscpy(p, L"/data/data/com.termux/files/usr/lib/debug/.build-id/");
+ wcscpy(p, L"@TERMUX_PREFIX@//lib/debug/.build-id/");
z = p + wcslen(p);
if (idlen)
{
@@ -701,7 +701,7 @@
@@ -778,7 +778,7 @@
if (!ret)
{
dst = HeapAlloc(GetProcessHeap(), 0,
@ -45,7 +46,7 @@ diff -uNr a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
if (dst)
{
WCHAR* p;
@@ -711,7 +711,7 @@
@@ -788,7 +788,7 @@
* where the alternate file is...
* so try both
*/
@ -70,46 +71,19 @@ diff -uNr a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c
diff -uNr a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
--- a/dlls/ntdll/unix/server.c
+++ b/dlls/ntdll/unix/server.c
@@ -1113,15 +1113,15 @@
char *p, *dir;
size_t len = sizeof("/server-") + 2 * sizeof(dev) + 2 * sizeof(ino) + 2;
@@ -1257,10 +1257,10 @@
else
snprintf( tmp + p, sizeof(tmp) - p, "%lx", (unsigned long)ino );
-#ifdef __ANDROID__ /* there's no /tmp dir on Android */
+#if defined(__ANDROID__) && ! defined(__TERMUX__) /* there's no /tmp dir on Android */
len += strlen( config_dir ) + sizeof("/.wineserver");
dir = malloc( len );
strcpy( dir, config_dir );
strcat( dir, "/.wineserver/server-" );
asprintf( &dir, "%s/.wineserver/server-%s", config_dir, tmp );
#else
- len += sizeof("/tmp/.wine-") + 12;
+ len += sizeof("@TERMUX_PREFIX@/tmp/.wine-") + 12;
dir = malloc( len );
- sprintf( dir, "/tmp/.wine-%u/server-", getuid() );
+ sprintf( dir, "@TERMUX_PREFIX@/tmp/.wine-%u/server-", getuid() );
- asprintf( &dir, "/tmp/.wine-%u/server-%s", getuid(), tmp );
+ asprintf( &dir, "@TERMUX_PREFIX@/tmp/.wine-%u/server-%s", getuid(), tmp );
#endif
p = dir + strlen( dir );
if (dev != (unsigned long)dev)
diff -uNr a/libs/wine/config.c b/libs/wine/config.c
--- a/libs/wine/config.c
+++ b/libs/wine/config.c
@@ -342,7 +342,7 @@
return dir;
}
static const char server_config_dir[] = "/.wine"; /* config dir relative to $HOME */
-static const char server_root_prefix[] = "/tmp/.wine"; /* prefix for server root dir */
+static const char server_root_prefix[] = "@TERMUX_PREFIX@/tmp/.wine"; /* prefix for server root dir */
static const char server_dir_prefix[] = "/server-"; /* prefix for server dir */
static char *config_dir;
@@ -382,7 +382,7 @@
{
char *p, *root;
-#ifdef __ANDROID__ /* there's no /tmp dir on Android */
+#if defined(__ANDROID__) && ! defined(__TERMUX__) /* there's no /tmp dir on Android */
root = build_path( config_dir, ".wineserver" );
#else
root = xmalloc( sizeof(server_root_prefix) + 12 );
diff -uNr a/programs/winebrowser/main.c b/programs/winebrowser/main.c
--- a/programs/winebrowser/main.c
+++ b/programs/winebrowser/main.c

51
x11-packages/wine-stable/0003-fix-socket-ipx.patch
View File

@ -1,49 +1,32 @@
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -53,7 +53,7 @@
@@ -54,7 +54,7 @@
# include <linux/types.h>
# endif
# include <linux/ipx.h>
-# ifdef SOL_IPX
+# if defined(SOL_IPX) && !defined(__ANDROID__)
# define HAS_IPX
# endif
#endif
-#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS)
+#if (defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS)) && !defined(__ANDROID__)
# define HAS_IPX
#endif
@@ -2104,6 +2104,7 @@
break;
}
+#ifdef HAS_IPX
#ifdef SOL_IPX
case IOCTL_AFD_WINE_GET_IPX_PTYPE:
return do_getsockopt( handle, io, SOL_IPX, IPX_TYPE, out_buffer, out_size );
@@ -2142,6 +2143,7 @@
return do_setsockopt( handle, io, 0, SO_DEFAULT_HEADERS, &value, sizeof(value) );
}
#endif
+#endif
#ifdef HAS_IRDA
#define MAX_IRDA_DEVICES 10
--- a/dlls/ws2_32/unixlib.c
+++ b/dlls/ws2_32/unixlib.c
@@ -75,7 +75,7 @@
# include <linux/types.h>
# endif
# include <linux/ipx.h>
-# ifdef SOL_IPX
+# if defined(SOL_IPX) && !defined(__ANDROID__)
# define HAS_IPX
# endif
#endif
-#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS)
+#if (defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS)) && !defined(__ANDROID__)
# define HAS_IPX
#endif
--- a/server/sock.c
+++ b/server/sock.c
@@ -68,7 +68,7 @@
@@ -71,7 +71,7 @@
# include <linux/types.h>
# endif
# include <linux/ipx.h>
-# ifdef SOL_IPX
+# if defined(SOL_IPX) && !defined(__ANDROID__)
# define HAS_IPX
# endif
#endif
-#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS)
+#if (defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS)) && !defined(__ANDROID__)
# define HAS_IPX
#endif

0
x11-packages/wine-stable/0005-no-pthread_mutexattr_setprotocol.patch → x11-packages/wine-stable/0004-no-pthread_mutexattr_setprotocol.patch
View File

83
x11-packages/wine-stable/0004-stash-host-ldflags-when-configuring-cross-compilers.patch
View File

@ -1,83 +0,0 @@
https://github.com/wine-mirror/wine/commit/c29336fa781a7cf34379c1e38dea7a7cd04f92af
From c29336fa781a7cf34379c1e38dea7a7cd04f92af Mon Sep 17 00:00:00 2001
From: Billy Laws <blaws05@gmail.com>
Date: Sat, 3 Jun 2023 21:35:45 +0100
Subject: [PATCH] configure: Stash host LDFLAGS when configuring
cross-compilers.
---
configure | 6 +++++-
configure.ac | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 4cab5e67e43c..000776267b17 100755
--- a/configure
+++ b/configure
@@ -10591,11 +10591,13 @@ fi
saved_CC=$CC
saved_CFLAGS=$CFLAGS
+ saved_LDFLAGS=$LDFLAGS
CFLAGS=${CROSSCFLAGS:-"-g -O2"}
+ LDFLAGS=$CROSSLDFLAGS
eval CC=\$${wine_arch}_CC
eval ${wine_arch}_CFLAGS=\$CFLAGS
- eval ${wine_arch}_LDFLAGS=\$CROSSLDFLAGS
+ eval ${wine_arch}_LDFLAGS=\$LDFLAGS
eval "${wine_arch}_EXTRACFLAGS=\"-D__WINE_PE_BUILD -Wall\""
target=""
@@ -10699,6 +10701,7 @@ fi
then
CC=$saved_CC
CFLAGS=$saved_CFLAGS
+ LDFLAGS=$saved_LDFLAGS
continue
fi
as_fn_append PE_ARCHS " $wine_arch"
@@ -11672,6 +11675,7 @@ fi }
CC=$saved_CC
CFLAGS=$saved_CFLAGS
+ LDFLAGS=$saved_LDFLAGS
done
if test $HOST_ARCH = aarch64 -a "x$PE_ARCHS" = x
diff --git a/configure.ac b/configure.ac
index 3af0aa5fa98c..2b4c09069ac5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -842,11 +842,13 @@ do
saved_CC=$CC
saved_CFLAGS=$CFLAGS
+ saved_LDFLAGS=$LDFLAGS
CFLAGS=${CROSSCFLAGS:-"-g -O2"}
+ LDFLAGS=$CROSSLDFLAGS
AS_VAR_COPY([CC],[${wine_arch}_CC])
AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS])
- AS_VAR_COPY([${wine_arch}_LDFLAGS],[CROSSLDFLAGS])
+ AS_VAR_COPY([${wine_arch}_LDFLAGS],[LDFLAGS])
AS_VAR_SET([${wine_arch}_EXTRACFLAGS],["-D__WINE_PE_BUILD -Wall"])
target=""
@@ -892,6 +894,7 @@ do
then
CC=$saved_CC
CFLAGS=$saved_CFLAGS
+ LDFLAGS=$saved_LDFLAGS
continue
fi
AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"])
@@ -982,6 +985,7 @@ do
CC=$saved_CC
CFLAGS=$saved_CFLAGS
+ LDFLAGS=$saved_LDFLAGS
done
if test $HOST_ARCH = aarch64 -a "x$PE_ARCHS" = x

15
x11-packages/wine-stable/build.sh
View File

@ -6,12 +6,12 @@ LICENSE
LICENSE.OLD
COPYING.LIB"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=8.0.2
TERMUX_PKG_VERSION=9.0
TERMUX_PKG_SRCURL=https://dl.winehq.org/wine/source/${TERMUX_PKG_VERSION:0:3}/wine-$TERMUX_PKG_VERSION.tar.xz
TERMUX_PKG_SHA256=6ec8fb6f2c72d576cb11f52b2f8d59af64404802154651d122b98466d91dc847
TERMUX_PKG_DEPENDS="fontconfig, freetype, krb5, libc++, libgmp, libgnutls, libxcb, libxcomposite, libxcursor, libxfixes, libxrender, mesa, opengl, pulseaudio, sdl2, vulkan-loader, xorg-xrandr"
TERMUX_PKG_SHA256=7cfd090a5395f5b76d95bb5defac8a312c8de4c070c1163b8b58da38330ca6ee
TERMUX_PKG_DEPENDS="fontconfig, freetype, krb5, libandroid-spawn, libc++, libgmp, libgnutls, libxcb, libxcomposite, libxcursor, libxfixes, libxrender, mesa, opengl, pulseaudio, sdl2, vulkan-loader, xorg-xrandr"
TERMUX_PKG_ANTI_BUILD_DEPENDS="vulkan-loader"
TERMUX_PKG_BUILD_DEPENDS="vulkan-loader-generic"
TERMUX_PKG_BUILD_DEPENDS="libandroid-spawn-static, vulkan-loader-generic"
TERMUX_PKG_NO_STATICSPLIT=true
TERMUX_PKG_HOSTBUILD=true
TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="
@ -73,6 +73,11 @@ if [ "$TERMUX_ARCH_BITS" = 64 ]; then
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-win64"
fi
# Enable new WoW64 support on x86_64.
if [ "$TERMUX_ARCH" = "x86_64" ]; then
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-archs=i386,x86_64"
fi
TERMUX_PKG_BLACKLISTED_ARCHES="arm"
_setup_llvm_mingw_toolchain() {
@ -116,6 +121,8 @@ termux_step_pre_configure() {
CFLAGS="${CFLAGS/-fstack-protector-strong/}"
CXXFLAGS="${CXXFLAGS/-fstack-protector-strong/}"
LDFLAGS="${LDFLAGS/-Wl,-z,relro,-z,now/}"
LDFLAGS+=" -landroid-spawn"
}
termux_step_make_install() {