Re: [PR PATCH] [Updated] ldc: update to 1.31.0

[subnut <subnut@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]

There is an updated pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages ldc
https://github.com/void-linux/void-packages/pull/42554

ldc: update to 1.31.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42554.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ldc-42554.patch --]
[-- Type: text/x-diff, Size: 9498 bytes --]

From 83913c6ee9f9e4e657207221bef2225d70be5802 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Fri, 3 Mar 2023 02:22:31 +0530
Subject: [PATCH 1/4] ldc: update to 1.31.0

---
 common/shlibs                                 |  8 +--
 ...4260a848c8ebad5582e27ac1e09627cdfb17.patch | 57 -------------------
 srcpkgs/ldc/template                          |  6 +-
 3 files changed, 7 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/ldc/patches/54544260a848c8ebad5582e27ac1e09627cdfb17.patch

diff --git a/common/shlibs b/common/shlibs
index 0f9c75af44bc..8a258cd1a005 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2195,10 +2195,10 @@ libFcitx5Config.so.6 libfcitx5-5.0.5_1
 libFcitx5GClient.so.2 fcitx5-gtk-5.0.4_1
 libFcitx5Qt5DBusAddons.so.1 fcitx5-qt5-5.0.3_1
 libFcitx5Qt5WidgetsAddons.so.2 fcitx5-qt5-5.0.3_1
-libdruntime-ldc-debug-shared.so.100 ldc-runtime-1.30.0_1
-libdruntime-ldc-shared.so.100 ldc-runtime-1.30.0_1
-libphobos2-ldc-shared.so.100 ldc-runtime-1.30.0_1
-libphobos2-ldc-debug-shared.so.100 ldc-runtime-1.30.0_1
+libdruntime-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
+libdruntime-ldc-shared.so.101 ldc-runtime-1.31.0_1
+libphobos2-ldc-shared.so.101 ldc-runtime-1.31.0_1
+libphobos2-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
 libmarblewidget-qt5.so.28 marble5-17.12.2_1
 libastro.so.2 marble5-17.12.2_1
 libparrot.so.6.9.0 parrot-6.9.0_1
diff --git a/srcpkgs/ldc/patches/54544260a848c8ebad5582e27ac1e09627cdfb17.patch b/srcpkgs/ldc/patches/54544260a848c8ebad5582e27ac1e09627cdfb17.patch
deleted file mode 100644
index 79694372bfaa..000000000000
--- a/srcpkgs/ldc/patches/54544260a848c8ebad5582e27ac1e09627cdfb17.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 54544260a848c8ebad5582e27ac1e09627cdfb17 Mon Sep 17 00:00:00 2001
-From: Razvan Nitu <razvan.nitu1305@gmail.com>
-Date: Wed, 24 Aug 2022 13:54:15 +0300
-Subject: [PATCH] Port the fix for issue 23157 (#14378)
-
----
- druntime/src/core/sys/posix/sys/socket.d | 36 ++++++++++++++++++++++--
- 1 file changed, 33 insertions(+), 3 deletions(-)
-
-diff --git a/druntime/src/core/sys/posix/sys/socket.d b/druntime/src/core/sys/posix/sys/socket.d
-index 3a7b753adff..fc5dc5d1684 100644
---- a/runtime/druntime/src/core/sys/posix/sys/socket.d
-+++ b/runtime/druntime/src/core/sys/posix/sys/socket.d
-@@ -188,10 +188,40 @@ version (linux)
- 
-     extern (D) inout(ubyte)*   CMSG_DATA( return scope inout(cmsghdr)* cmsg ) pure nothrow @nogc { return cast(ubyte*)( cmsg + 1 ); }
- 
--    private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
--    extern (D)  inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
-+    version (CRuntime_Musl)
-     {
--        return __cmsg_nxthdr(msg, cmsg);
-+        extern (D)
-+        {
-+            private size_t __CMSG_LEN(inout(cmsghdr)* cmsg) pure nothrow @nogc
-+            {
-+                return (cmsg.cmsg_len + size_t.sizeof -1) & cast(size_t)(~(size_t.sizeof - 1));
-+            }
-+
-+            private inout(cmsghdr)* __CMSG_NEXT(inout(cmsghdr)* cmsg) pure nothrow @nogc
-+            {
-+                return cmsg + __CMSG_LEN(cmsg);
-+            }
-+
-+            private inout(msghdr)* __MHDR_END(inout(msghdr)* mhdr) pure nothrow @nogc
-+            {
-+                return cast(inout(msghdr)*)(mhdr.msg_control + mhdr.msg_controllen);
-+            }
-+
-+            inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
-+            {
-+                return cmsg.cmsg_len < cmsghdr.sizeof ||
-+                    __CMSG_LEN(cmsg) + cmsghdr.sizeof >= __MHDR_END(msg) - cast(inout(msghdr)*)(cmsg)
-+                        ? cast(inout(cmsghdr)*) null : cast(inout(cmsghdr)*) __CMSG_NEXT(cmsg);
-+            }
-+        }
-+    }
-+    else
-+    {
-+        private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
-+        extern (D)  inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
-+        {
-+            return __cmsg_nxthdr(msg, cmsg);
-+        }
-     }
- 
-     extern (D) inout(cmsghdr)* CMSG_FIRSTHDR( inout(msghdr)* mhdr ) pure nothrow @nogc
diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template
index 99d22682ce7a..5d63c90ec0ec 100644
--- a/srcpkgs/ldc/template
+++ b/srcpkgs/ldc/template
@@ -1,6 +1,6 @@
 # Template file for 'ldc'
 pkgname=ldc
-version=1.30.0
+version=1.31.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,7 @@ conf_files="/etc/ldc2.conf"
 hostmakedepends="dmd llvm12 perl pkg-config"
 makedepends="libcurl-devel libffi-devel ncurses-devel zlib-devel
  llvm-libunwind-devel"
-depends="ldc-runtime llvm-libunwind-devel"
+depends="ldc-runtime>=$version llvm-libunwind-devel"
 checkdepends="python3"
 short_desc="Portable D programming language compiler based on LLVM"
 maintainer="Auri <me@aurieh.me>"
@@ -22,7 +22,7 @@ license="BSD-3-Clause, BSL-1.0"
 homepage="https://wiki.dlang.org/LDC"
 changelog="https://raw.githubusercontent.com/ldc-developers/ldc/master/CHANGELOG.md"
 distfiles="https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"
-checksum=fdbb376f08242d917922a6a22a773980217fafa310046fc5d6459490af23dacd
+checksum=f1c8ece9e1e35806c3441bf24fbe666cddd8eef375592c19cd8fee4701cd5458
 nopie=yes
 nocross="dmd compilation fails on cross"
 # tests timeout on musl; also require unpackaged python3-lit

From 367595a1b16713ab0ff56e37429e132946a0413e Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Fri, 3 Mar 2023 02:22:52 +0530
Subject: [PATCH 2/4] onedrive: revbump for ldc-1.31.0

---
 srcpkgs/onedrive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/onedrive/template b/srcpkgs/onedrive/template
index 28163f334552..63e4f43a7fbd 100644
--- a/srcpkgs/onedrive/template
+++ b/srcpkgs/onedrive/template
@@ -1,7 +1,7 @@
 # Template file for 'onedrive'
 pkgname=onedrive
 version=2.4.13
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="DC=ldc2"
 hostmakedepends="ldc pkg-config"

From d3db76d321b85ce54d0c610ec22f772521a8e3f5 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Fri, 3 Mar 2023 02:23:33 +0530
Subject: [PATCH 3/4] gtkd: revbump for ldc-1.31.0

---
 srcpkgs/gtkd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template
index e64a1f54fb96..6a75d69e19ce 100644
--- a/srcpkgs/gtkd/template
+++ b/srcpkgs/gtkd/template
@@ -1,7 +1,7 @@
 # Template file for 'gtkd'
 pkgname=gtkd
 version=3.9.0
-revision=9
+revision=10
 build_style=gnu-makefile
 make_build_args="LDFLAGS='-linker=bfd' DC=ldc2"
 make_build_target="shared-libs shared-gstreamer shared-vte shared-peas shared-gtkdgl"

From 442530c6ad99232ef271c00e30ba4fa0f8dab430 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Fri, 3 Mar 2023 02:23:49 +0530
Subject: [PATCH 4/4] tilix: patch and revbump for ldc-1.31.0

---
 .../std.xml-unavailable-use-undead.patch      | 21 +++++++++++++++++++
 srcpkgs/tilix/template                        | 16 +++++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/tilix/patches/std.xml-unavailable-use-undead.patch

diff --git a/srcpkgs/tilix/patches/std.xml-unavailable-use-undead.patch b/srcpkgs/tilix/patches/std.xml-unavailable-use-undead.patch
new file mode 100644
index 000000000000..b06cab75222f
--- /dev/null
+++ b/srcpkgs/tilix/patches/std.xml-unavailable-use-undead.patch
@@ -0,0 +1,21 @@
+--- a/source/gx/tilix/prefeditor/prefdialog.d
++++ b/source/gx/tilix/prefeditor/prefdialog.d
+@@ -957,7 +957,7 @@ private:
+             return;
+         }
+ 
+-        import std.xml: DocumentParser, ElementParser, Element, XMLException;
++        import undead.xml: DocumentParser, ElementParser, Element, XMLException;
+ 
+         try {
+             DocumentParser parser = new DocumentParser(ui);
+--- a/meson.build
++++ b/meson.build
+@@ -30,6 +30,7 @@
+ appdir = datadir / 'applications'
+ 
+ tilix_sources = [
++    'undead/xml.d',
+     'source/gx/gtk/actions.d',
+     'source/gx/gtk/cairo.d',
+     'source/gx/gtk/clipboard.d',
diff --git a/srcpkgs/tilix/template b/srcpkgs/tilix/template
index 5689948babaa..21687cb1a564 100644
--- a/srcpkgs/tilix/template
+++ b/srcpkgs/tilix/template
@@ -1,7 +1,8 @@
 # Template file for 'tilix'
 pkgname=tilix
 version=1.9.4
-revision=6
+revision=7
+_undead_ver=1.1.7
 build_style=meson
 configure_args="-Db_lto=false"
 hostmakedepends="automake gettext-devel gdk-pixbuf glib-devel ldc po4a pkg-config
@@ -13,8 +14,17 @@ short_desc="Tiling terminal emulator for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://gnunn1.github.io/tilix-web/"
-distfiles="https://github.com/gnunn1/${pkgname}/archive/${version}.tar.gz"
-checksum=2a9482770391d11d5edc8351d426c700c2cc6c194a30391ef2ae25bb7095b59b
+distfiles="https://github.com/gnunn1/${pkgname}/archive/${version}.tar.gz
+ https://github.com/dlang/undeaD/archive/refs/tags/v${_undead_ver}.tar.gz"
+checksum="2a9482770391d11d5edc8351d426c700c2cc6c194a30391ef2ae25bb7095b59b
+ 684052f5d9b116fc58717a2fe6c9af9bf3e4c23a9efdc48888484efcc209b69a"
+
+post_extract() {
+	mkdir undead
+	mv undeaD-$_undead_ver/src/undead/xml.d undead
+	mv tilix-$version/* .
+	rm -rf tilix-$version undeaD-$_undead_ver
+}
 
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in