Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (01d0c58540ea7b6e60a1a0571ad553ee3760df87)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (01d0c58540ea7b6e60a1a0571ad553ee3760df87)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (01d0c58540ea7b6e60a1a0571ad553ee3760df87)
  • Date: Sat, 18 Mar 2023 15:31:51 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

x11-libs/wine/DETAILS | 2
x11-libs/wine/HISTORY | 5
x11-libs/wine/PRE_BUILD | 7
x11-libs/wine/patches-devel/0001-Fix-run-time-linking-issue.patch | 76
++++++++++
x11-libs/wine/patches-stable/rpath.patch | 59
+++++++
x11-libs/wine/patches/rpath.patch | 59
-------
6 files changed, 143 insertions(+), 65 deletions(-)

New commits:
commit 01d0c58540ea7b6e60a1a0571ad553ee3760df87
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

wine 8.4 (devel)

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index b64feec..0a4e76a 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -1,7 +1,7 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=wine
case "$WINE_BRANCH" in
-(devel) VERSION=8.2;;
+(devel) VERSION=8.4;;
(stable) VERSION=8.0;;
esac; case "$WINE_BRANCH" in
(scm)
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 38f58f7..272a58c 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,8 @@
+2023-03-18 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated to 8.4 (devel)
+ * PRE_BUILD, patches-devel/0001-Fix-run-time-linking-issue.patch,
+ patches-stable/rpath.patch: updated patch
+
2023-02-23 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated to 8.2 (devel)

diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
index 80e65c0..24ce32e 100755
--- a/x11-libs/wine/PRE_BUILD
+++ b/x11-libs/wine/PRE_BUILD
@@ -1,7 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches &&
-case "$WINE_BRANCH" in
- stable)
- apply_patch_dir patches-stable ;;
-esac
+apply_patch_dir patches-common &&
+apply_patch_dir "patches-$WINE_BRANCH"
diff --git
a/x11-libs/wine/patches-devel/0001-Fix-run-time-linking-issue.patch
b/x11-libs/wine/patches-devel/0001-Fix-run-time-linking-issue.patch
new file mode 100644
index 0000000..67c7441
--- /dev/null
+++ b/x11-libs/wine/patches-devel/0001-Fix-run-time-linking-issue.patch
@@ -0,0 +1,76 @@
+From 0a777847ecb63df3a89f595e6033af7d56364081 Mon Sep 17 00:00:00 2001
+From: "Alex Xu (Hello71)" <alex_y_xu AT yahoo.ca>
+Date: Sat, 4 Mar 2023 02:02:35 +0100
+Subject: [PATCH] Fix run-time linking issue
+
+Add $ORIGIN to rpath to fix finding of libraries at /usr/lib/wine/...
+
+Origin: Alpine Linux
+Ref: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13249
+Ref: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/27930
+[ismael AT sourcemage.org: Added commit message and ported to wine 8.3]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ configure | 31 +++++++++++++++++++++++++++++++
+ configure.ac | 2 ++
+ 2 files changed, 33 insertions(+)
+
+diff --git a/configure b/configure
+index 647a12374691..c8140dea6986 100755
+--- a/configure
++++ b/configure
+@@ -10325,6 +10325,37 @@ then :
+ fi
+ ;;
+ esac
++ # do this at the end because it needs double dollar for makefile
++ as_ac_var=`printf "%s\n" "ac_cv_cflags_-Wl,-rpath,\\\\\\$ORIGIN" |
$as_tr_sh`
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler
supports -Wl,-rpath,\\\$ORIGIN" >&5
++printf %s "checking whether the compiler supports -Wl,-rpath,\\\$ORIGIN...
" >&6; }
++if eval test \${$as_ac_var+y}
++then :
++ printf %s "(cached) " >&6
++else $as_nop
++ ac_wine_try_cflags_saved=$CFLAGS
++CFLAGS="$CFLAGS -Wl,-rpath,\\\$ORIGIN"
++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 :
++ eval "$as_ac_var=yes"
++else $as_nop
++ eval "$as_ac_var=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
++eval ac_res=\$$as_ac_var
++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res"
>&5
++printf "%s\n" "$ac_res" >&6; }
++if eval test \"x\$"$as_ac_var"\" = x"yes"
++then :
++ UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"
++fi
+ ;;
+ esac
+
+diff --git a/configure.ac b/configure.ac
+index 5ff1bb093f44..4e9d63568288 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -785,6 +785,8 @@ case $host_os in
+ [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS
-Wl,-z,max-page-size=0x1000"])
+ ;;
+ esac
++ # do this at the end because it needs double dollar for makefile
++ WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS
'-Wl,-rpath,\$\$ORIGIN'"])
+ ;;
+ esac
+
+--
+2.39.2
+
diff --git a/x11-libs/wine/patches-stable/rpath.patch
b/x11-libs/wine/patches-stable/rpath.patch
new file mode 100644
index 0000000..515a1f0
--- /dev/null
+++ b/x11-libs/wine/patches-stable/rpath.patch
@@ -0,0 +1,59 @@
+Origin: Alpine Linux
+
+diff --git a/configure b/configure
+index 774a95ce003..d408e77cc78 100755
+--- a/configure
++++ b/configure
+@@ -11137,6 +11137,38 @@ fi
+ LIBWINE_DEPENDS="wine.map"
+
+ TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version
libs/wine/libwine.so.$libwine_soversion"
++
++ # do this at the end because it needs double dollar for makefile
++ as_ac_var=`printf "%s\n" "ac_cv_cflags_-Wl,-rpath,\\\\\\$ORIGIN" |
$as_tr_sh`
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler
supports -Wl,-rpath,\\\$ORIGIN" >&5
++printf %s "checking whether the compiler supports -Wl,-rpath,\\\$ORIGIN...
" >&6; }
++if eval test \${$as_ac_var+y}
++then :
++ printf %s "(cached) " >&6
++else $as_nop
++ ac_wine_try_cflags_saved=$CFLAGS
++CFLAGS="$CFLAGS -Wl,-rpath,\\\$ORIGIN"
++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 :
++ eval "$as_ac_var=yes"
++else $as_nop
++ eval "$as_ac_var=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
++eval ac_res=\$$as_ac_var
++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res"
>&5
++printf "%s\n" "$ac_res" >&6; }
++if eval test \"x\$"$as_ac_var"\" = x"yes"
++then :
++ UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"
++fi
+ ;;
+ esac
+
+diff --git a/configure.ac b/configure.ac
+index 8c5066a3de6..01ede86df1e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -916,6 +916,9 @@ case $host_os in
+ AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
+ AC_SUBST(LIBWINE_DEPENDS,"wine.map")
+ TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version
libs/wine/libwine.so.$libwine_soversion"
++
++ # do this at the end because it needs double dollar for makefile
++ WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS
'-Wl,-rpath,\$\$ORIGIN'"])
+ ;;
+ esac
+
diff --git a/x11-libs/wine/patches/rpath.patch
b/x11-libs/wine/patches/rpath.patch
deleted file mode 100644
index 515a1f0..0000000
--- a/x11-libs/wine/patches/rpath.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Origin: Alpine Linux
-
-diff --git a/configure b/configure
-index 774a95ce003..d408e77cc78 100755
---- a/configure
-+++ b/configure
-@@ -11137,6 +11137,38 @@ fi
- LIBWINE_DEPENDS="wine.map"
-
- TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version
libs/wine/libwine.so.$libwine_soversion"
-+
-+ # do this at the end because it needs double dollar for makefile
-+ as_ac_var=`printf "%s\n" "ac_cv_cflags_-Wl,-rpath,\\\\\\$ORIGIN" |
$as_tr_sh`
-+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler
supports -Wl,-rpath,\\\$ORIGIN" >&5
-+printf %s "checking whether the compiler supports -Wl,-rpath,\\\$ORIGIN...
" >&6; }
-+if eval test \${$as_ac_var+y}
-+then :
-+ printf %s "(cached) " >&6
-+else $as_nop
-+ ac_wine_try_cflags_saved=$CFLAGS
-+CFLAGS="$CFLAGS -Wl,-rpath,\\\$ORIGIN"
-+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 :
-+ eval "$as_ac_var=yes"
-+else $as_nop
-+ eval "$as_ac_var=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
-+eval ac_res=\$$as_ac_var
-+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res"
>&5
-+printf "%s\n" "$ac_res" >&6; }
-+if eval test \"x\$"$as_ac_var"\" = x"yes"
-+then :
-+ UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"
-+fi
- ;;
- esac
-
-diff --git a/configure.ac b/configure.ac
-index 8c5066a3de6..01ede86df1e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -916,6 +916,9 @@ case $host_os in
- AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
- AC_SUBST(LIBWINE_DEPENDS,"wine.map")
- TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version
libs/wine/libwine.so.$libwine_soversion"
-+
-+ # do this at the end because it needs double dollar for makefile
-+ WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS
'-Wl,-rpath,\$\$ORIGIN'"])
- ;;
- esac
-


  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (01d0c58540ea7b6e60a1a0571ad553ee3760df87), Ismael Luceno, 03/18/2023

Archive powered by MHonArc 2.6.24.

Top of Page