From 8836d2dd73e8919e28735cd24f79c18d61b8eb3a3b2ffb3bf8c19d2cded851d0 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 16 Sep 2023 09:39:58 +0000 Subject: [PATCH 1/5] - Updated to 8.16 release - Beginnings of a DirectMusic revival. - Many fixes and improvements in the regression tests. - Various bug fixes. - update staging to 8.16 release OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1041 --- _service | 2 +- wine-8.15.tar.xz | 3 --- wine-8.15.tar.xz.sign | 16 ---------------- wine-8.16.tar.xz | 3 +++ wine-8.16.tar.xz.sign | 16 ++++++++++++++++ wine-staging-8.15.tar.xz | 3 --- wine.changes | 9 +++++++++ wine.spec | 6 +++--- 8 files changed, 32 insertions(+), 26 deletions(-) delete mode 100644 wine-8.15.tar.xz delete mode 100644 wine-8.15.tar.xz.sign create mode 100644 wine-8.16.tar.xz create mode 100644 wine-8.16.tar.xz.sign delete mode 100644 wine-staging-8.15.tar.xz diff --git a/_service b/_service index 31eec2b..732c488 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ @PARENT_TAG@ v(.*) https://github.com/wine-staging/wine-staging.git - refs/tags/v8.15 + refs/tags/v8.16 v*.* git diff --git a/wine-8.15.tar.xz b/wine-8.15.tar.xz deleted file mode 100644 index 11e347c..0000000 --- a/wine-8.15.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed8fae61784bca6475accc78eff26a9ec6b08001a7ae1698d52e25f9c2d422da -size 29427600 diff --git a/wine-8.15.tar.xz.sign b/wine-8.15.tar.xz.sign deleted file mode 100644 index 3c901b7..0000000 --- a/wine-8.15.tar.xz.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmTyPrQACgkQzvrI6q8X -UZ1snQ/+M4tQ9uGKoBvuN0jy4X6zM4tQaTK3aMRRmfO124luekSzqCcE2Y7fmiGG -dmHXPx5L7FlDi5YJcLwCtACw4oy5ggpWY6KMhIeMrb9fYGtVEiYR9AJiL3vXyFfG -SNif3SfJuAGdK6hOgHsrdR7HC3moxaSgvf4y/LiP/q9s4OuaMKGFucLbq+VHBQA9 -4dSmXlv23qzZzrRxDCnYVW2Uj3SkWr51rnKawFzXb2xWWHQqszVaPVy71Q8pgIfH -nCIxN0Tfm8sDHGzxvCeOQ+P4L9PFmbHl8r1CVkWSiau7M7adV4qIB0m1rE2T5MPH -QHioyrLUv0hkUKynEHsuFnASAShaI6XOOrkI3l4Po7vNPUU/yTK0PoNpTC92Rg1z -8Aj7vAgZT/txYUC94aLH1/tAL1vPse1efuT8cyjX5Sph2/GpsOb5tIFajhEoVEA2 -EKjxCXQJ74tXRk1OnpmYYGTeuDbz276vYyaAMpgZZFHKyybQDBQZpdqmxJlyT5E/ -K6+blj6er71aeN+FBFiP+nQAOiCoKdHKPVytzywiwIhZ4iq05bGeJj1h6U1wPpyF -bGDJquVpPCJcwPYhDVJwtqBDx/Wu9AbdGjXfWiUmK5kKa33z3ngmnyfe2S67sGKe -RIHcseSbtLcQzZ7RshbMqID/zVM7x8j37vqV3kcx5McTfW+BTkw= -=WsCG ------END PGP SIGNATURE----- diff --git a/wine-8.16.tar.xz b/wine-8.16.tar.xz new file mode 100644 index 0000000..982dfd2 --- /dev/null +++ b/wine-8.16.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:168266375eef23394a3147e84b41b4297fb80363db0a07921a5ed087a9c3f3fd +size 29457688 diff --git a/wine-8.16.tar.xz.sign b/wine-8.16.tar.xz.sign new file mode 100644 index 0000000..3bce792 --- /dev/null +++ b/wine-8.16.tar.xz.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmUEtN8ACgkQzvrI6q8X +UZ38ohAAr64sYePe6yMyn/Lhpbsx+ncDqBncAkmAq3dtfikLh57/876etQPaHtHi +mHfTmJPpk1hl3Lu5z1R9oOZZdOMuh/Do5QdOxPnvATtxyh4mFJYTMdExT1Ro4K9I +lbBmrvV2GNCMurvgMAWN55lvGr+KFaRVPZPt7aTy4Qm75Mj/WKZAtqQMi6knRhO4 +5Rdj2PWDjpZDqjiv1tc+KkgMQFLg+EX4YTYKregb3oCPXALV9n4HGShRqRfY9cK2 +6ntKKQu5YMVAuQdGsH8TmaBapf++N+h8oBc8695V9deAedw6YjmqwB2wpvvMI9Br +YJ8jLqilGpLikxtnzgsnSo8Ea4hfHAr/fvPKBd1ALLs0zwdSFed1HKhuUziPdWSU +7jkHlzCGbR+pHqrIT0y/bgxrKBJcyqfVKqYgQcIOeGEUTxG1l4GTLHzeyg3C02xw +F0KcjSsymlAQ2GKlyefrukQpW1WgczIWjIWkzBWZpN8GzzwNF2VMVAddtNwsCab4 +Z61CGqhbocA+ekCbIZA3OjF1OXy55gZupzHWNLTATIi3n5E7U8+n3g37HGzxKWcN +1PG/95E1x7Hmfc822EHdxZeQ8dLM2U0YU8yhSvXEFWSEUKQjL9yo1qlhQCAUWpPS +tz4p676uqhi4yYLM7R+T4bi0A4VvvxMCnYhabMlyJIxG6H4W9gY= +=O/EB +-----END PGP SIGNATURE----- diff --git a/wine-staging-8.15.tar.xz b/wine-staging-8.15.tar.xz deleted file mode 100644 index 8e649d1..0000000 --- a/wine-staging-8.15.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eedc6c0109d80b6af07c9e03404f9312d6836adbe54997a8b926745f4bc08563 -size 7457144 diff --git a/wine.changes b/wine.changes index 9d693db..c92ed20 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Sep 16 09:37:31 UTC 2023 - Marcus Meissner + +- Updated to 8.16 release + - Beginnings of a DirectMusic revival. + - Many fixes and improvements in the regression tests. + - Various bug fixes. +- update staging to 8.16 release + ------------------------------------------------------------------- Sat Sep 2 06:39:37 UTC 2023 - Marcus Meissner diff --git a/wine.spec b/wine.spec index 01def83..e6c6d4b 100644 --- a/wine.spec +++ b/wine.spec @@ -29,8 +29,8 @@ %endif # needs to be on top due to usage of %version macro below -%define realver 8.15 -Version: 8.15 +%define realver 8.16 +Version: 8.16 Release: 0 %if "%{flavor}" != "" @@ -173,7 +173,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 ppc armv7l armv7hl aarch64 %if %{staging} # upstream patch target version -%define staging_version 8.15 +%define staging_version 8.16 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel From e0f6b7c6c1b828224d309e133cd5f179e3501094fe468f1157e4b8bd199af9d2 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 16 Sep 2023 09:46:56 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1042 --- ...Build-the-preloader-as-PIE-on-64-bit.patch | 126 ----------- ...ways-build-the-main-loader-as-PIE-if.patch | 202 ------------------ ...rce-building-the-main-loader-as-PIE-.patch | 82 ------- ...ke-the-loader-position-independent-o.patch | 89 -------- wine.spec | 5 - 5 files changed, 504 deletions(-) delete mode 100644 0001-Revert-loader-Build-the-preloader-as-PIE-on-64-bit.patch delete mode 100644 0002-Revert-loader-Always-build-the-main-loader-as-PIE-if.patch delete mode 100644 0003-Revert-loader-Force-building-the-main-loader-as-PIE-.patch delete mode 100644 0004-Revert-loader-Make-the-loader-position-independent-o.patch diff --git a/0001-Revert-loader-Build-the-preloader-as-PIE-on-64-bit.patch b/0001-Revert-loader-Build-the-preloader-as-PIE-on-64-bit.patch deleted file mode 100644 index f758509..0000000 --- a/0001-Revert-loader-Build-the-preloader-as-PIE-on-64-bit.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 8da3c054568e33f682b7282dfe0cdf048960b13a Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Thu, 29 Jun 2023 09:59:30 +0200 -Subject: [PATCH 1/4] Revert "loader: Build the preloader as PIE on 64-bit." - -This reverts commit ac1761d1dae8bf114a05e28ed6886deba6c2c860. ---- - configure | 38 +------------------------------------- - configure.ac | 11 +---------- - loader/preloader.c | 7 +++---- - 3 files changed, 5 insertions(+), 51 deletions(-) - -diff --git a/configure b/configure -index d530de3ced1..635e3b7f25f 100755 ---- a/configure -+++ b/configure -@@ -10245,47 +10245,11 @@ if test "x$ac_cv_cflags__Wl___export_dynamic" = xyes - then : - WINELOADER_LDFLAGS="-Wl,--export-dynamic" - fi -- WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs" - - case $host_os in - linux*) - as_fn_append WINELOADER_LDFLAGS " -pie" -- case $HOST_ARCH in -- i386|arm) -- as_fn_append WINEPRELOADER_LDFLAGS " -static -Wl,-Ttext=0x7d400000" ;; -- *) -- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -static-pie" >&5 --printf %s "checking whether the compiler supports -static-pie... " >&6; } --if test ${ac_cv_cflags__static_pie+y} --then : -- printf %s "(cached) " >&6 --else $as_nop -- ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -static-pie" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --int main(int argc, char **argv) { return 0; } --_ACEOF --if ac_fn_c_try_link "$LINENO" --then : -- ac_cv_cflags__static_pie=yes --else $as_nop -- ac_cv_cflags__static_pie=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.beam \ -- conftest$ac_exeext conftest.$ac_ext --CFLAGS=$ac_wine_try_cflags_saved --fi --{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__static_pie" >&5 --printf "%s\n" "$ac_cv_cflags__static_pie" >&6; } --if test "x$ac_cv_cflags__static_pie" = xyes --then : -- as_fn_append WINEPRELOADER_LDFLAGS " -static-pie" --else $as_nop -- as_fn_append WINEPRELOADER_LDFLAGS " -static -Wl,-Ttext=0x7d7d00000000" --fi -- ;; -- esac -+ WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - ;; - *) - case $HOST_ARCH in -diff --git a/configure.ac b/configure.ac -index 90c95c89ffb..c8880886b1c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -769,20 +769,11 @@ case $host_os in - - WINE_TRY_CFLAGS([-Wl,-z,defs],[UNIXLDFLAGS="$UNIXLDFLAGS -Wl,-z,defs"]) - WINE_TRY_CFLAGS([-Wl,--export-dynamic],[WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) -- WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs" - - case $host_os in - linux*) - AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -pie"]) -- case $HOST_ARCH in -- i386|arm) -- AS_VAR_APPEND([WINEPRELOADER_LDFLAGS],[" -static -Wl,-Ttext=0x7d400000"]) ;; -- *) -- WINE_TRY_CFLAGS([-static-pie], -- [AS_VAR_APPEND([WINEPRELOADER_LDFLAGS],[" -static-pie"])], -- [AS_VAR_APPEND([WINEPRELOADER_LDFLAGS],[" -static -Wl,-Ttext=0x7d7d00000000"])]) -- ;; -- esac -+ WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - ;; - *) - case $HOST_ARCH in -diff --git a/loader/preloader.c b/loader/preloader.c -index 635e85ee7cb..5e1eabfa308 100644 ---- a/loader/preloader.c -+++ b/loader/preloader.c -@@ -353,7 +353,7 @@ __ASM_GLOBAL_FUNC(_start, - "movq %rsp,%rax\n\t" - "leaq -144(%rsp),%rsp\n\t" /* allocate some space for extra aux values */ - "movq %rax,(%rsp)\n\t" /* orig stack pointer */ -- "movq thread_data(%rip),%rsi\n\t" -+ "movq $thread_data,%rsi\n\t" - "movq $0x1002,%rdi\n\t" /* ARCH_SET_FS */ - "movq $158,%rax\n\t" /* SYS_arch_prctl */ - "syscall\n\t" -@@ -441,8 +441,7 @@ __ASM_GLOBAL_FUNC(_start, - "mov x0, SP\n\t" - "sub SP, SP, #144\n\t" /* allocate some space for extra aux values */ - "str x0, [SP]\n\t" /* orig stack pointer */ -- "adrp x0, thread_data\n\t" -- "add x0, x0, :lo12:thread_data\n\t" -+ "ldr x0, =thread_data\n\t" - "msr tpidr_el0, x0\n\t" - "mov x0, SP\n\t" /* ptr to orig stack pointer */ - "bl wld_start\n\t" -@@ -1401,7 +1400,7 @@ void* wld_start( void **stack ) - page_size = get_auxiliary( av, AT_PAGESZ, 4096 ); - page_mask = page_size - 1; - -- preloader_start = (char *)((unsigned long)_start & ~page_mask); -+ preloader_start = (char *)_start - ((unsigned long)_start & page_mask); - preloader_end = (char *)((unsigned long)(_end + page_mask) & ~page_mask); - - #ifdef DUMP_AUX_INFO --- -2.41.0 - diff --git a/0002-Revert-loader-Always-build-the-main-loader-as-PIE-if.patch b/0002-Revert-loader-Always-build-the-main-loader-as-PIE-if.patch deleted file mode 100644 index 95a8191..0000000 --- a/0002-Revert-loader-Always-build-the-main-loader-as-PIE-if.patch +++ /dev/null @@ -1,202 +0,0 @@ -From 374a2c3ae41efcdcd99c5c0fb2220d03ea14f372 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Thu, 29 Jun 2023 09:59:35 +0200 -Subject: [PATCH 2/4] Revert "loader: Always build the main loader as PIE if we - have a preloader." - -This reverts commit c55578f3a54c63084657e7d79c043b22b10df989. ---- - configure | 93 +++++++++++++++++++++++++++++++++------------------- - configure.ac | 31 +++++++++--------- - 2 files changed, 76 insertions(+), 48 deletions(-) - -diff --git a/configure b/configure -index 635e3b7f25f..4d00a023d18 100755 ---- a/configure -+++ b/configure -@@ -10245,77 +10245,104 @@ if test "x$ac_cv_cflags__Wl___export_dynamic" = xyes - then : - WINELOADER_LDFLAGS="-Wl,--export-dynamic" - fi -+ WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - -- case $host_os in -- linux*) -- as_fn_append WINELOADER_LDFLAGS " -pie" -- WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" -- ;; -- *) -- case $HOST_ARCH in -- i386|arm) -- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x60000000" >&5 --printf %s "checking whether the compiler supports -Wl,-Ttext-segment=0x60000000... " >&6; } --if test ${ac_cv_cflags__Wl__Ttext_segment_0x60000000+y} -+ case $host_cpu in -+ *i[3456789]86* | arm*) -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000" >&5 -+printf %s "checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000... " >&6; } -+if test ${ac_cv_cflags__Wl__Ttext_segment_0x7bc00000+y} - then : - printf %s "(cached) " >&6 - else $as_nop - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -Wl,-Ttext-segment=0x60000000" -+CFLAGS="$CFLAGS -Wl,-Ttext-segment=0x7bc00000" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO" - then : -- ac_cv_cflags__Wl__Ttext_segment_0x60000000=yes -+ ac_cv_cflags__Wl__Ttext_segment_0x7bc00000=yes - else $as_nop -- ac_cv_cflags__Wl__Ttext_segment_0x60000000=no -+ ac_cv_cflags__Wl__Ttext_segment_0x7bc00000=no - fi - rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS=$ac_wine_try_cflags_saved - fi --{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__Ttext_segment_0x60000000" >&5 --printf "%s\n" "$ac_cv_cflags__Wl__Ttext_segment_0x60000000" >&6; } --if test "x$ac_cv_cflags__Wl__Ttext_segment_0x60000000" = xyes -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&5 -+printf "%s\n" "$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&6; } -+if test "x$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" = xyes - then : -- as_fn_append WINELOADER_LDFLAGS " -Wl,-Ttext-segment=0x60000000" -+ case $host_os in -+ freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; -+ *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;; -+ esac - else $as_nop -- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x60000400" >&5 --printf %s "checking whether the compiler supports -Wl,--section-start,.interp=0x60000400... " >&6; } --if test ${ac_cv_cflags__Wl___section_start__interp_0x60000400+y} -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7d000400" >&5 -+printf %s "checking whether the compiler supports -Wl,--section-start,.interp=0x7d000400... " >&6; } -+if test ${ac_cv_cflags__Wl___section_start__interp_0x7d000400+y} - then : - printf %s "(cached) " >&6 - else $as_nop - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x60000400" -+CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7d000400" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO" - then : -- ac_cv_cflags__Wl___section_start__interp_0x60000400=yes -+ ac_cv_cflags__Wl___section_start__interp_0x7d000400=yes - else $as_nop -- ac_cv_cflags__Wl___section_start__interp_0x60000400=no -+ ac_cv_cflags__Wl___section_start__interp_0x7d000400=no - fi - rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS=$ac_wine_try_cflags_saved - fi --{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x60000400" >&5 --printf "%s\n" "$ac_cv_cflags__Wl___section_start__interp_0x60000400" >&6; } --if test "x$ac_cv_cflags__Wl___section_start__interp_0x60000400" = xyes -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7d000400" >&5 -+printf "%s\n" "$ac_cv_cflags__Wl___section_start__interp_0x7d000400" >&6; } -+if test "x$ac_cv_cflags__Wl___section_start__interp_0x7d000400" = xyes - then : -- as_fn_append WINELOADER_LDFLAGS " -Wl,--section-start,.interp=0x60000400" -+ case $host_os in -+ freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x60000400" ;; -+ *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;; -+ esac - fi - fi -- ;; -- *) -- as_fn_append WINELOADER_LDFLAGS " -pie" -- ;; -- esac -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-z,max-page-size=0x1000" >&5 -+printf %s "checking whether the compiler supports -Wl,-z,max-page-size=0x1000... " >&6; } -+if test ${ac_cv_cflags__Wl__z_max_page_size_0x1000+y} -+then : -+ printf %s "(cached) " >&6 -+else $as_nop -+ ac_wine_try_cflags_saved=$CFLAGS -+CFLAGS="$CFLAGS -Wl,-z,max-page-size=0x1000" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+int main(int argc, char **argv) { return 0; } -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_cflags__Wl__z_max_page_size_0x1000=yes -+else $as_nop -+ ac_cv_cflags__Wl__z_max_page_size_0x1000=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+CFLAGS=$ac_wine_try_cflags_saved -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__z_max_page_size_0x1000" >&5 -+printf "%s\n" "$ac_cv_cflags__Wl__z_max_page_size_0x1000" >&6; } -+if test "x$ac_cv_cflags__Wl__z_max_page_size_0x1000" = xyes -+then : -+ WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000" -+fi -+ ;; -+ *) -+ WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie" - ;; - esac - ;; -diff --git a/configure.ac b/configure.ac -index c8880886b1c..2255db13046 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -769,24 +769,25 @@ case $host_os in - - WINE_TRY_CFLAGS([-Wl,-z,defs],[UNIXLDFLAGS="$UNIXLDFLAGS -Wl,-z,defs"]) - WINE_TRY_CFLAGS([-Wl,--export-dynamic],[WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) -+ WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - -- case $host_os in -- linux*) -- AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -pie"]) -- WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" -+ case $host_cpu in -+ *i[[3456789]]86* | arm*) -+ WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], -+ [case $host_os in -+ freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; -+ *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;; -+ esac], -+ [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7d000400], -+ [case $host_os in -+ freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x60000400" ;; -+ *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;; -+ esac])]) -+ WINE_TRY_CFLAGS([-Wl,-z,max-page-size=0x1000], -+ [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) - ;; - *) -- case $HOST_ARCH in -- i386|arm) -- WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x60000000], -- [AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -Wl,-Ttext-segment=0x60000000"])], -- [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x60000400], -- [AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -Wl,--section-start,.interp=0x60000400"])])]) -- ;; -- *) -- AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -pie"]) -- ;; -- esac -+ WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie" - ;; - esac - ;; --- -2.41.0 - diff --git a/0003-Revert-loader-Force-building-the-main-loader-as-PIE-.patch b/0003-Revert-loader-Force-building-the-main-loader-as-PIE-.patch deleted file mode 100644 index 23df0d2..0000000 --- a/0003-Revert-loader-Force-building-the-main-loader-as-PIE-.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 45b2eb83cc87c8a261f78eb10058ac644d6b5556 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Thu, 29 Jun 2023 09:59:41 +0200 -Subject: [PATCH 3/4] Revert "loader: Force building the main loader as PIE on - 64-bit." - -This reverts commit 78ed343842dcd8ffb95c416420953e121959d40d. ---- - configure | 29 ++++++++++++++++++++++++++++- - configure.ac | 3 ++- - loader/Makefile.in | 1 - - 3 files changed, 30 insertions(+), 3 deletions(-) - -diff --git a/configure b/configure -index 4d00a023d18..a38400ad529 100755 ---- a/configure -+++ b/configure -@@ -10342,7 +10342,34 @@ then : - fi - ;; - *) -- WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-pie" >&5 -+printf %s "checking whether the compiler supports -Wl,-pie... " >&6; } -+if test ${ac_cv_cflags__Wl__pie+y} -+then : -+ printf %s "(cached) " >&6 -+else $as_nop -+ ac_wine_try_cflags_saved=$CFLAGS -+CFLAGS="$CFLAGS -Wl,-pie" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+int main(int argc, char **argv) { return 0; } -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_cflags__Wl__pie=yes -+else $as_nop -+ ac_cv_cflags__Wl__pie=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+CFLAGS=$ac_wine_try_cflags_saved -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__pie" >&5 -+printf "%s\n" "$ac_cv_cflags__Wl__pie" >&6; } -+if test "x$ac_cv_cflags__Wl__pie" = xyes -+then : -+ WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie" -+fi - ;; - esac - ;; -diff --git a/configure.ac b/configure.ac -index 2255db13046..b9b3ee4ffc3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -787,7 +787,8 @@ case $host_os in - [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) - ;; - *) -- WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie" -+ WINE_TRY_CFLAGS([-Wl,-pie], -+ [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie"]) - ;; - esac - ;; -diff --git a/loader/Makefile.in b/loader/Makefile.in -index 30413fc8677..7302c231915 100644 ---- a/loader/Makefile.in -+++ b/loader/Makefile.in -@@ -12,7 +12,6 @@ SOURCES = \ - - PROGRAMS = $(WINELOADER_PROGRAMS) - INSTALL_LIB = $(WINELOADER_PROGRAMS) --UNIX_CFLAGS = -fPIE - - preloader_EXTRADEFS = -fno-builtin - --- -2.41.0 - diff --git a/0004-Revert-loader-Make-the-loader-position-independent-o.patch b/0004-Revert-loader-Make-the-loader-position-independent-o.patch deleted file mode 100644 index 31f0752..0000000 --- a/0004-Revert-loader-Make-the-loader-position-independent-o.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 26027b7b84b6fa2fa3b04092c8e6201dc0cad772 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Thu, 29 Jun 2023 09:59:47 +0200 -Subject: [PATCH 4/4] Revert "loader: Make the loader position-independent on - 64-bit." - -This reverts commit cc2cfb9b792bee681b96c5859084fd6d4d0bbed7. ---- - configure | 32 +------------------------------- - configure.ac | 6 +----- - 2 files changed, 2 insertions(+), 36 deletions(-) - -diff --git a/configure b/configure -index a38400ad529..1de33458d28 100755 ---- a/configure -+++ b/configure -@@ -10248,7 +10248,7 @@ fi - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - - case $host_cpu in -- *i[3456789]86* | arm*) -+ *i[3456789]86* | x86_64 | *aarch64* | arm*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000" >&5 - printf %s "checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000... " >&6; } - if test ${ac_cv_cflags__Wl__Ttext_segment_0x7bc00000+y} -@@ -10339,36 +10339,6 @@ printf "%s\n" "$ac_cv_cflags__Wl__z_max_page_size_0x1000" >&6; } - if test "x$ac_cv_cflags__Wl__z_max_page_size_0x1000" = xyes - then : - WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000" --fi -- ;; -- *) -- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-pie" >&5 --printf %s "checking whether the compiler supports -Wl,-pie... " >&6; } --if test ${ac_cv_cflags__Wl__pie+y} --then : -- printf %s "(cached) " >&6 --else $as_nop -- ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -Wl,-pie" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --int main(int argc, char **argv) { return 0; } --_ACEOF --if ac_fn_c_try_link "$LINENO" --then : -- ac_cv_cflags__Wl__pie=yes --else $as_nop -- ac_cv_cflags__Wl__pie=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.beam \ -- conftest$ac_exeext conftest.$ac_ext --CFLAGS=$ac_wine_try_cflags_saved --fi --{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__pie" >&5 --printf "%s\n" "$ac_cv_cflags__Wl__pie" >&6; } --if test "x$ac_cv_cflags__Wl__pie" = xyes --then : -- WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie" - fi - ;; - esac -diff --git a/configure.ac b/configure.ac -index b9b3ee4ffc3..23f4250220d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -772,7 +772,7 @@ case $host_os in - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - - case $host_cpu in -- *i[[3456789]]86* | arm*) -+ *i[[3456789]]86* | x86_64 | *aarch64* | arm*) - WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], - [case $host_os in - freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; -@@ -786,10 +786,6 @@ case $host_os in - WINE_TRY_CFLAGS([-Wl,-z,max-page-size=0x1000], - [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) - ;; -- *) -- WINE_TRY_CFLAGS([-Wl,-pie], -- [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie"]) -- ;; - esac - ;; - esac --- -2.41.0 - diff --git a/wine.spec b/wine.spec index e6c6d4b..cd82a98 100644 --- a/wine.spec +++ b/wine.spec @@ -148,11 +148,6 @@ Source6: wine-msi.desktop Source5: ubuntuwine.tar.bz2 Source7: baselibs.conf Source8: wine-rpmlintrc -# PATCH-FIX-UPSTREAM (hopefully temporary reverts for https://bugs.winehq.org/show_bug.cgi?id=55139) -Patch1: 0001-Revert-loader-Build-the-preloader-as-PIE-on-64-bit.patch -Patch2: 0002-Revert-loader-Always-build-the-main-loader-as-PIE-if.patch -Patch3: 0003-Revert-loader-Force-building-the-main-loader-as-PIE-.patch -Patch4: 0004-Revert-loader-Make-the-loader-position-independent-o.patch # SUSE specific patches # - currently none, but add them here Recommends: wine-gecko >= 2.47.3 From 9d8e84c8bb765d4946d2d77b54d4f1e9d4aa750a8abcc34bc8cb0ca6db85cc4c Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 16 Sep 2023 09:48:53 +0000 Subject: [PATCH 3/5] - solved upstream: - 0001-Revert-loader-Build-the-preloader-as-PIE-on-64-bit.patch - 0002-Revert-loader-Always-build-the-main-loader-as-PIE-if.patch - 0003-Revert-loader-Force-building-the-main-loader-as-PIE-.patch - 0004-Revert-loader-Make-the-loader-position-independent-o.patch OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1043 --- wine.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wine.changes b/wine.changes index c92ed20..b74de29 100644 --- a/wine.changes +++ b/wine.changes @@ -6,6 +6,11 @@ Sat Sep 16 09:37:31 UTC 2023 - Marcus Meissner - Many fixes and improvements in the regression tests. - Various bug fixes. - update staging to 8.16 release +- solved upstream: + - 0001-Revert-loader-Build-the-preloader-as-PIE-on-64-bit.patch + - 0002-Revert-loader-Always-build-the-main-loader-as-PIE-if.patch + - 0003-Revert-loader-Force-building-the-main-loader-as-PIE-.patch + - 0004-Revert-loader-Make-the-loader-position-independent-o.patch ------------------------------------------------------------------- Sat Sep 2 06:39:37 UTC 2023 - Marcus Meissner From 238fd8fe0531d6764548c12a6d92fe98ea4cf819e1d102aa920fb4d9071f4e95 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 17 Sep 2023 08:44:44 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1044 --- wine-staging-8.16.tar.xz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 wine-staging-8.16.tar.xz diff --git a/wine-staging-8.16.tar.xz b/wine-staging-8.16.tar.xz new file mode 100644 index 0000000..0d74be9 --- /dev/null +++ b/wine-staging-8.16.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75782f8aea7cbf10778b96e003c33abac27e6e55df391038085d88d577bf8c5b +size 7463840 From aae84d442b0c1ec58b2917d06ad9ecacfa6227331c06e13c035545be2389be82 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 18 Sep 2023 07:50:21 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1045 --- wine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wine.spec b/wine.spec index cd82a98..22a68d3 100644 --- a/wine.spec +++ b/wine.spec @@ -88,6 +88,7 @@ Obsoletes: wine-mp3 < %version Recommends: wine-mp3 %endif BuildRequires: SDL2-devel +BuildRequires: git BuildRequires: ncurses-devel BuildRequires: ocl-icd-devel BuildRequires: openal-soft-devel