Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 x11-libs/wine/DETAILS                                              |    8 -
 x11-libs/wine/HISTORY                                              |    3 
 x11-libs/wine/patches-devel/0001-Fix-run-time-linking-issue.patch  |   41 
+++---
 x11-libs/wine/patches-stable/0001-Fix-run-time-linking-issue.patch |    1 
 x11-libs/wine/patches-stable/rpath.patch                           |   59 
----------
 5 files changed, 30 insertions(+), 82 deletions(-)

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

    wine 9.0 (stable) / 9.10 (devel)

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 7824de3..150842d 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -1,10 +1,10 @@
 . "$GRIMOIRE/FUNCTIONS"
            SPELL=wine
 case "$WINE_BRANCH" in
-(devel)  VERSION=8.20
-     
SOURCE_HASH=sha512:86dffc3c9e01506ff2ff75663f48bb3b18a6afaf6381fc3c43c476481cb5c0570129550d2047059f528855e454a629c63e8beb85d5c591d1fdb7a066fbca2623;;
-(stable) VERSION=8.0.2
-     
SOURCE_HASH=sha512:e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f;;
+(stable) VERSION=9.0
+     
SOURCE_HASH=sha512:838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4;;
+(devel)  VERSION=9.10
+     
SOURCE_HASH=sha512:f76e62b40e72af241c6f88dbcdb767720c36496b9deb9cc1246cea967573bbafd46b7000117d3c64f499d175ac1c7299ebba3f476574bf9b18f6d9744ba7a3e2;;
 esac; case "$WINE_BRANCH" in
   (scm)
          VERSION=$(get_scm_version)
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 2151d35..2d6e499 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2024-06-01 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated to 9.0 (stable) and 9.10 (devel)
+
 2023-11-14 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: updated to 8.20 (devel)
 
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
index 67c7441..982376c 100644
--- 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
@@ -12,27 +12,27 @@ Ref: 
https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/27930
 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(+)
+ configure    | 33 +++++++++++++++++++++++++++++++++
+ configure.ac |  3 +++
+ 2 files changed, 36 insertions(+)
 
 diff --git a/configure b/configure
-index 647a12374691..c8140dea6986 100755
+index 4f4c37756c10..9eee210221e6 100755
 --- a/configure
 +++ b/configure
-@@ -10325,6 +10325,37 @@ then :
- fi
+@@ -10295,6 +10295,39 @@ fi
+         esac
          ;;
      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`
++    # Allow to find dependencies in the same directory
++    as_ac_var=`printf "%s\n" "ac_cv_cflags_-Wl,-rpath,\\\\\\$ORIGIN" | sed 
"$as_sed_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
++else case e in #(
++  e) ac_wine_try_cflags_saved=$CFLAGS
 +CFLAGS="$CFLAGS -Wl,-rpath,\\\$ORIGIN"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
@@ -41,12 +41,14 @@ index 647a12374691..c8140dea6986 100755
 +if ac_fn_c_try_link "$LINENO"
 +then :
 +  eval "$as_ac_var=yes"
-+else $as_nop
-+  eval "$as_ac_var=no"
++else case e in #(
++  e) eval "$as_ac_var=no" ;;
++esac
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.beam \
 +    conftest$ac_exeext conftest.$ac_ext
-+CFLAGS=$ac_wine_try_cflags_saved
++CFLAGS=$ac_wine_try_cflags_saved ;;
++esac
 +fi
 +eval ac_res=\$$as_ac_var
 +             { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" 
>&5
@@ -59,18 +61,19 @@ index 647a12374691..c8140dea6986 100755
  esac
  
 diff --git a/configure.ac b/configure.ac
-index 5ff1bb093f44..4e9d63568288 100644
+index 3f54230b46bb..34feb05b8265 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"])
+@@ -762,6 +762,9 @@ case $host_os in
+         esac
          ;;
      esac
-+    # do this at the end because it needs double dollar for makefile
-+    WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS 
'-Wl,-rpath,\$\$ORIGIN'"])
++    # Allow to find dependencies in the same directory
++    WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],
++        [UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"])
      ;;
  esac
  
 -- 
-2.39.2
+2.44.0
 
diff --git 
a/x11-libs/wine/patches-stable/0001-Fix-run-time-linking-issue.patch 
b/x11-libs/wine/patches-stable/0001-Fix-run-time-linking-issue.patch
new file mode 120000
index 0000000..05af620
--- /dev/null
+++ b/x11-libs/wine/patches-stable/0001-Fix-run-time-linking-issue.patch
@@ -0,0 +1 @@
+../patches-devel/0001-Fix-run-time-linking-issue.patch
\ No newline at end of file
diff --git a/x11-libs/wine/patches-stable/rpath.patch 
b/x11-libs/wine/patches-stable/rpath.patch
deleted file mode 100644
index 515a1f0..0000000
--- a/x11-libs/wine/patches-stable/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
-