From 9f448d19ab30956f194ea3f96048745fca584583 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 16 Feb 2023 23:42:00 +0100 Subject: [PATCH] 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 88358c49477..ddd0a3266a3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2198,10 +2198,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 79694372bfa..00000000000 --- a/srcpkgs/ldc/patches/54544260a848c8ebad5582e27ac1e09627cdfb17.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 54544260a848c8ebad5582e27ac1e09627cdfb17 Mon Sep 17 00:00:00 2001 -From: Razvan Nitu -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 99d22682ce7..f6d8b7ffbe9 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=" @@ -11,7 +11,7 @@ configure_args=" -DCOMPILE_D_MODULES_SEPARATELY=ON -DC_SYSTEM_LIBS='unwind;m;pthread;rt;dl'" conf_files="/etc/ldc2.conf" -hostmakedepends="dmd llvm12 perl pkg-config" +hostmakedepends="dmd llvm15 perl pkg-config" makedepends="libcurl-devel libffi-devel ncurses-devel zlib-devel llvm-libunwind-devel" depends="ldc-runtime llvm-libunwind-devel" @@ -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