Attachment 14463 Details for Bug 32972 – wine.spec patch to fix mingw dependencies

[patch] wine.spec patch to fix mingw dependencies

002-wine-mingw-m10.patch (text/plain), 4.71 KB, created by Aurelian R on 2024-03-15 22:16:49 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelian R

Created: 2024-03-15 22:16:49 CET

Size: 4.71 KB

patch

obsolete

>--- wine-mga10-SVN-P1.spec	2024-03-10 23:29:04.641854506 +0200
>+++ wine-mga10-SVN-P1+P2.spec	2024-03-15 10:58:05.030258860 +0200
>@@ -1,19 +1,22 @@
> %ifarch x86_64 aarch64
> %define	wine	wine64
> %define	mark64	()(64bit)
>+%define umingw  mingw64
> %else
> %define	wine	wine
> %define	mark64	%{nil}
>+%define umingw  mingw32
> %endif
> %define	lib_name_orig	lib%{name}
> %define	lib_major	1
> %define	lib_name	%mklibname %{name} %{lib_major}
> %define	lib_name_devel	%mklibname wine -d
> 
>-%define have_mingw 0
>-# Mingw can only be used on x86 (aarch64 listed just for filelist conditional):
>-%ifarch %{ix86} x86_64 aarch64
>-%define have_mingw 1
>+# Mingw can only be used on x86
>+%ifarch %{ix86} x86_64
>+%bcond_without  mingw
>+%else
>+%bcond_with  mingw
> %endif
> 
> # On 32-bit we have
>@@ -79,6 +82,8 @@ Source900:	https://github.com/wine-stagi
> 
> # Autoconf 2.72 support - https://bugzilla.redhat.com/show_bug.cgi?id=2143724
> Patch100:       wine-7.22-autoconf-2.72.patch
>+# Force the use of system mingw libraries instead of the bundled ones.
>+Patch101:       wine-8.10-cross.patch
> 
> # https://bugs.winehq.org/show_bug.cgi?id=45277
> #Patch100:      wine-6.0-vulkan-child-window.patch
>@@ -102,25 +107,18 @@ BuildRequires:  llvm
> %else
> BuildRequires:  gcc
> %endif
>-%if %have_mingw
>-BuildRequires:  mingw32-FAudio
>-BuildRequires:  mingw64-FAudio
>-BuildRequires:  mingw32-gcc
>-BuildRequires:  mingw64-gcc
>-BuildRequires:  mingw32-lcms2
>-BuildRequires:  mingw64-lcms2
>-BuildRequires:  mingw32-libpng
>-BuildRequires:  mingw64-libpng
>-BuildRequires:  mingw32-libxml2
>-BuildRequires:  mingw64-libxml2
>-BuildRequires:  mingw32-libxslt
>-BuildRequires:  mingw64-libxslt
>-BuildRequires:  mingw32-vkd3d
>-BuildRequires:  mingw64-vkd3d
>-BuildRequires:  mingw32-vulkan-headers
>-BuildRequires:  mingw64-vulkan-headers
>-BuildRequires:  mingw32-zlib
>-BuildRequires:  mingw64-zlib
>+%if %{with mingw}
>+BuildRequires:  %{umingw}-FAudio
>+BuildRequires:  %{umingw}-gcc
>+BuildRequires:  %{umingw}-lcms2
>+BuildRequires:  %{umingw}-libpng
>+BuildRequires:  %{umingw}-libxml2
>+BuildRequires:  %{umingw}-libxslt
>+BuildRequires:  %{umingw}-vkd3d
>+BuildRequires:  %{umingw}-vulkan-headers
>+BuildRequires:  %{umingw}-zlib
>+BuildRequires:  %{umingw}-libjpeg-turbo
>+BuildRequires:  %{umingw}-libtiff
> %endif
> BuildRequires:  desktop-file-utils
> BuildRequires:  docbook-dtd-sgml
>@@ -268,22 +266,16 @@ Requires:       %dlopenreq Xxf86vm
> Recommends:	wine-mono = %mono_version
> # (tv) needed by games:
> Requires:  %{mklibname dri-drivers}
>-%ifnarch x86_64 aarch64
>-Requires:  mingw32-FAudio
>-Requires:  mingw32-lcms2
>-Requires:  mingw32-libpng
>-Requires:  mingw32-libxml2
>-Requires:  mingw32-libxslt
>-Requires:  mingw32-vkd3d
>-Requires:  mingw32-zlib
>-%else
>-Requires:  mingw64-FAudio
>-Requires:  mingw64-lcms2
>-Requires:  mingw64-libpng
>-Requires:  mingw64-libxml2
>-Requires:  mingw64-libxslt
>-Requires:  mingw64-vkd3d
>-Requires:  mingw64-zlib
>+%if %{with mingw}
>+Requires:  %{umingw}-FAudio
>+Requires:  %{umingw}-lcms2
>+Requires:  %{umingw}-libpng
>+Requires:  %{umingw}-libxml2
>+Requires:  %{umingw}-libxslt
>+Requires:  %{umingw}-vkd3d
>+Requires:  %{umingw}-zlib
>+Requires:  %{umingw}-libjpeg-turbo
>+Requires:  %{umingw}-libtiff
> %endif
> 
> %description
>@@ -330,7 +322,8 @@ Wine is a program which allows running M
> develop programs which make use of wine.
> 
> %prep
>-%autosetup -p1 -n %{name}-%{version}%{?prerel:-%{prerel}}
>+%setup -q -n %{name}-%{version}%{?prerel:-%{prerel}}
>+%patch -p1 -P100 %{?with_mingw:-P101} -P108
> 
> %if 0%{?wine_staging}
> # setup and apply wine-staging patches
>@@ -393,14 +386,11 @@ unset PKG_CONFIG_PATH
> %endif
> %ifarch x86_64 aarch64
> 		--enable-win64 \
>-%ifarch x86_64
>- --with-system-dllpath=%{mingw64_bindir} \
>-%endif
>+%{?with_mingw:--with-system-dllpath=%{mingw64_bindir} }\
>+%else
>+%{?with_mingw:--with-system-dllpath=%{mingw32_bindir} }\
> %endif
>-%ifarch %{ix86}
>- --with-system-dllpath=%{mingw32_bindir} \
>- %endif
>- %{?wine_staging: --with-xattr} \
>+%{?wine_staging: --with-xattr} \
> 		--disable-tests
> 
> %make_build depend
>@@ -600,7 +590,6 @@ EOF
> %{_libdir}/%{name}/%{winesodir}/ws2_32.so
> 
> # PE format objects.
>-%if %have_mingw
> %{_libdir}/%{name}/*/light.msstyles*
> %{_libdir}/%{name}/%{winepedir}/*.acm
> %{_libdir}/%{name}/%{winepedir}/*.ax
>@@ -613,7 +602,6 @@ EOF
> %{_libdir}/%{name}/%{winepedir}/*.ocx
> %{_libdir}/%{name}/%{winepedir}/*.sys
> %{_libdir}/%{name}/%{winepedir}/*.tlb
>-%endif
> %ifarch %{ix86}
> %{_libdir}/%{name}/%{winepedir}/*.dll16
> %{_libdir}/%{name}/%{winepedir}/*.drv16
>@@ -623,12 +611,12 @@ EOF
> %endif
> 
> %files -n %{wine}-devel
>-%ifarch %{ix86} x86_64 aarch64
>+%ifarch aarch64
> %{_libdir}/%{name}/%{winepedir}/*.a
>-%endif
>-%ifarch %{ix86} x86_64
>+%else
> %{_libdir}/%{name}/%{winesodir}/*.a
> %endif
>+%{?with_mingw:%{_libdir}/%{name}/%{winepedir}/*.a}
> %{_includedir}/*
> %{_bindir}/msidb
> %{_bindir}/wmc

--- wine-mga10-SVN-P1.spec	2024-03-10 23:29:04.641854506 +0200
+++ wine-mga10-SVN-P1+P2.spec	2024-03-15 10:58:05.030258860 +0200
@@ -1,19 +1,22 @@
 %ifarch x86_64 aarch64
 %define	wine	wine64
 %define	mark64	()(64bit)
+%define umingw  mingw64
 %else
 %define	wine	wine
 %define	mark64	%{nil}
+%define umingw  mingw32
 %endif
 %define	lib_name_orig	lib%{name}
 %define	lib_major	1
 %define	lib_name	%mklibname %{name} %{lib_major}
 %define	lib_name_devel	%mklibname wine -d
 
-%define have_mingw 0
-# Mingw can only be used on x86 (aarch64 listed just for filelist conditional):
-%ifarch %{ix86} x86_64 aarch64
-%define have_mingw 1
+# Mingw can only be used on x86
+%ifarch %{ix86} x86_64
+%bcond_without  mingw
+%else
+%bcond_with  mingw
 %endif
 
 # On 32-bit we have
@@ -79,6 +82,8 @@ Source900:	https://github.com/wine-stagi
 
 # Autoconf 2.72 support - https://bugzilla.redhat.com/show_bug.cgi?id=2143724
 Patch100:       wine-7.22-autoconf-2.72.patch
+# Force the use of system mingw libraries instead of the bundled ones.
+Patch101:       wine-8.10-cross.patch
 
 # https://bugs.winehq.org/show_bug.cgi?id=45277
 #Patch100:      wine-6.0-vulkan-child-window.patch
@@ -102,25 +107,18 @@ BuildRequires:  llvm
 %else
 BuildRequires:  gcc
 %endif
-%if %have_mingw
-BuildRequires:  mingw32-FAudio
-BuildRequires:  mingw64-FAudio
-BuildRequires:  mingw32-gcc
-BuildRequires:  mingw64-gcc
-BuildRequires:  mingw32-lcms2
-BuildRequires:  mingw64-lcms2
-BuildRequires:  mingw32-libpng
-BuildRequires:  mingw64-libpng
-BuildRequires:  mingw32-libxml2
-BuildRequires:  mingw64-libxml2
-BuildRequires:  mingw32-libxslt
-BuildRequires:  mingw64-libxslt
-BuildRequires:  mingw32-vkd3d
-BuildRequires:  mingw64-vkd3d
-BuildRequires:  mingw32-vulkan-headers
-BuildRequires:  mingw64-vulkan-headers
-BuildRequires:  mingw32-zlib
-BuildRequires:  mingw64-zlib
+%if %{with mingw}
+BuildRequires:  %{umingw}-FAudio
+BuildRequires:  %{umingw}-gcc
+BuildRequires:  %{umingw}-lcms2
+BuildRequires:  %{umingw}-libpng
+BuildRequires:  %{umingw}-libxml2
+BuildRequires:  %{umingw}-libxslt
+BuildRequires:  %{umingw}-vkd3d
+BuildRequires:  %{umingw}-vulkan-headers
+BuildRequires:  %{umingw}-zlib
+BuildRequires:  %{umingw}-libjpeg-turbo
+BuildRequires:  %{umingw}-libtiff
 %endif
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-dtd-sgml
@@ -268,22 +266,16 @@ Requires:       %dlopenreq Xxf86vm
 Recommends:	wine-mono = %mono_version
 # (tv) needed by games:
 Requires:  %{mklibname dri-drivers}
-%ifnarch x86_64 aarch64
-Requires:  mingw32-FAudio
-Requires:  mingw32-lcms2
-Requires:  mingw32-libpng
-Requires:  mingw32-libxml2
-Requires:  mingw32-libxslt
-Requires:  mingw32-vkd3d
-Requires:  mingw32-zlib
-%else
-Requires:  mingw64-FAudio
-Requires:  mingw64-lcms2
-Requires:  mingw64-libpng
-Requires:  mingw64-libxml2
-Requires:  mingw64-libxslt
-Requires:  mingw64-vkd3d
-Requires:  mingw64-zlib
+%if %{with mingw}
+Requires:  %{umingw}-FAudio
+Requires:  %{umingw}-lcms2
+Requires:  %{umingw}-libpng
+Requires:  %{umingw}-libxml2
+Requires:  %{umingw}-libxslt
+Requires:  %{umingw}-vkd3d
+Requires:  %{umingw}-zlib
+Requires:  %{umingw}-libjpeg-turbo
+Requires:  %{umingw}-libtiff
 %endif
 
 %description
@@ -330,7 +322,8 @@ Wine is a program which allows running M
 develop programs which make use of wine.
 
 %prep
-%autosetup -p1 -n %{name}-%{version}%{?prerel:-%{prerel}}
+%setup -q -n %{name}-%{version}%{?prerel:-%{prerel}}
+%patch -p1 -P100 %{?with_mingw:-P101} -P108
 
 %if 0%{?wine_staging}
 # setup and apply wine-staging patches
@@ -393,14 +386,11 @@ unset PKG_CONFIG_PATH
 %endif
 %ifarch x86_64 aarch64
 		--enable-win64 \
-%ifarch x86_64
- --with-system-dllpath=%{mingw64_bindir} \
-%endif
+%{?with_mingw:--with-system-dllpath=%{mingw64_bindir} }\
+%else
+%{?with_mingw:--with-system-dllpath=%{mingw32_bindir} }\
 %endif
-%ifarch %{ix86}
- --with-system-dllpath=%{mingw32_bindir} \
- %endif
- %{?wine_staging: --with-xattr} \
+%{?wine_staging: --with-xattr} \
 		--disable-tests
 
 %make_build depend
@@ -600,7 +590,6 @@ EOF
 %{_libdir}/%{name}/%{winesodir}/ws2_32.so
 
 # PE format objects.
-%if %have_mingw
 %{_libdir}/%{name}/*/light.msstyles*
 %{_libdir}/%{name}/%{winepedir}/*.acm
 %{_libdir}/%{name}/%{winepedir}/*.ax
@@ -613,7 +602,6 @@ EOF
 %{_libdir}/%{name}/%{winepedir}/*.ocx
 %{_libdir}/%{name}/%{winepedir}/*.sys
 %{_libdir}/%{name}/%{winepedir}/*.tlb
-%endif
 %ifarch %{ix86}
 %{_libdir}/%{name}/%{winepedir}/*.dll16
 %{_libdir}/%{name}/%{winepedir}/*.drv16
@@ -623,12 +611,12 @@ EOF
 %endif
 
 %files -n %{wine}-devel
-%ifarch %{ix86} x86_64 aarch64
+%ifarch aarch64
 %{_libdir}/%{name}/%{winepedir}/*.a
-%endif
-%ifarch %{ix86} x86_64
+%else
 %{_libdir}/%{name}/%{winesodir}/*.a
 %endif
+%{?with_mingw:%{_libdir}/%{name}/%{winepedir}/*.a}
 %{_includedir}/*
 %{_bindir}/msidb
 %{_bindir}/wmc

Actions: View | Diff

Attachments on bug 32972: 14462 | 14463 | 14464 | 14465