wine: patch into $build_wrksrc
This commit is contained in:
parent
15f5a8668b
commit
c96d298aac
|
@ -1,5 +1,5 @@
|
||||||
--- a/wine-7.6/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200
|
--- a/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200
|
||||||
+++ b/wine-7.6/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200
|
+++ b/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200
|
||||||
@@ -29,7 +29,8 @@
|
@@ -29,7 +29,8 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
diff --git a/configure b/configure
|
diff --git a/configure b/configure
|
||||||
index 774a95ce003..d408e77cc78 100755
|
index 774a95ce003..d408e77cc78 100755
|
||||||
--- a/wine-7.6/configure
|
--- a/configure
|
||||||
+++ b/wine-7.6/configure
|
+++ b/configure
|
||||||
@@ -11137,6 +11137,38 @@ fi
|
@@ -11137,6 +11137,38 @@ fi
|
||||||
LIBWINE_DEPENDS="wine.map"
|
LIBWINE_DEPENDS="wine.map"
|
||||||
|
|
||||||
|
@ -43,8 +43,13 @@ index 774a95ce003..d408e77cc78 100755
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
diff --git a/configure.ac b/configure.ac
|
||||||
index 8c5066a3de6..01ede86df1e 100644
|
index 8c5066a3de6..01ede86df1e 100644
|
||||||
|
<<<<<<< HEAD
|
||||||
--- a/wine-7.6/configure.ac
|
--- a/wine-7.6/configure.ac
|
||||||
+++ b/wine-7.6/configure.ac
|
+++ b/wine-7.6/configure.ac
|
||||||
|
=======
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
>>>>>>> 6dccb4ef9c (wine: patch into $build_wrksrc)
|
||||||
@@ -916,6 +916,9 @@ case $host_os in
|
@@ -916,6 +916,9 @@ case $host_os in
|
||||||
AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
|
AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
|
||||||
AC_SUBST(LIBWINE_DEPENDS,"wine.map")
|
AC_SUBST(LIBWINE_DEPENDS,"wine.map")
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- a/wine-7.6/server/security.h 2022-01-29 08:23:43.759508270 +0100
|
--- a/server/security.h 2022-01-29 08:23:43.759508270 +0100
|
||||||
+++ b/wine-7.6/server/security.h 2022-01-29 08:24:07.976443565 +0100
|
+++ b/server/security.h 2022-01-29 08:24:07.976443565 +0100
|
||||||
@@ -22,6 +22,7 @@
|
@@ -22,6 +22,7 @@
|
||||||
#define __WINE_SERVER_SECURITY_H
|
#define __WINE_SERVER_SECURITY_H
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,8 @@ desc_option_xshm="Enable support for the X Shared Memory Extension"
|
||||||
lib32mode=full
|
lib32mode=full
|
||||||
archs="i686* x86_64*"
|
archs="i686* x86_64*"
|
||||||
|
|
||||||
|
patch_args="-Np1 --directory=${build_wrksrc}"
|
||||||
|
|
||||||
_nopie=no
|
_nopie=no
|
||||||
if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
|
if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
|
||||||
# build system adds -fno-PIC for 32bit builds, which,
|
# build system adds -fno-PIC for 32bit builds, which,
|
||||||
|
@ -48,6 +50,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
|
||||||
depends="libXi libXinerama libXcomposite libXcursor libOSMesa
|
depends="libXi libXinerama libXcomposite libXcursor libOSMesa
|
||||||
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
|
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
|
||||||
gnutls SDL2 wine-common>=${version}_${revision} libwine>=${version}_${revision}"
|
gnutls SDL2 wine-common>=${version}_${revision} libwine>=${version}_${revision}"
|
||||||
|
# This testsuite might hang indefinitely
|
||||||
make_check=extended
|
make_check=extended
|
||||||
|
|
||||||
case $XBPS_TARGET_MACHINE in
|
case $XBPS_TARGET_MACHINE in
|
||||||
|
|
Loading…
Reference in New Issue