From 097fe091a36e71c17bf4ccf7b536a8b731b4039c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 22 May 2021 03:51:24 -0300 Subject: [PATCH 1/4] ldc: update to 1.26.0. Also move to llvm12. Forcing linking against libunwind from llvm is necessary, otherwise the resulting runtime is underlinked and fails to find the unw_* symbols it needs. Argument taken from Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/blob/aaaa982c682d6c5655d8b89538c18e05bd6443e6/community/ldc/APKBUILD --- common/shlibs | 10 +++++----- srcpkgs/ldc/template | 17 +++++++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/common/shlibs b/common/shlibs index 79808cb76273..b0e3073f714d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2146,11 +2146,11 @@ 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.94 ldc-runtime-1.24.0_1 -libdruntime-ldc-shared.so.94 ldc-runtime-1.24.0_1 -libphobos2-ldc-shared.so.94 ldc-runtime-1.24.0_1 -libphobos2-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1 -libldc-jit.so.94 ldc-runtime-1.24.0_1 +libdruntime-ldc-debug-shared.so.96 ldc-runtime-1.26.0_1 +libdruntime-ldc-shared.so.96 ldc-runtime-1.26.0_1 +libphobos2-ldc-shared.so.96 ldc-runtime-1.26.0_1 +libphobos2-ldc-debug-shared.so.96 ldc-runtime-1.26.0_1 +libldc-jit.so.96 ldc-runtime-1.26.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/template b/srcpkgs/ldc/template index 45d5c7f7be07..60af34f57395 100644 --- a/srcpkgs/ldc/template +++ b/srcpkgs/ldc/template @@ -1,27 +1,32 @@ # Template file for 'ldc' pkgname=ldc -version=1.24.0 -revision=2 +version=1.26.0 +revision=1 wrksrc="ldc-${version}-src" build_style=cmake configure_args=" -DINCLUDE_INSTALL_DIR=/usr/include/dlang/ldc -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo - -DBASH_COMPLETION_COMPLETIONSDIR=/usr/share/bash-completion" + -DBASH_COMPLETION_COMPLETIONSDIR=/usr/share/bash-completion + -DC_SYSTEM_LIBS='unwind;m;pthread;rt;dl'" conf_files="/etc/ldc2.conf" -hostmakedepends="dmd llvm11 perl pkg-config" -makedepends="libcurl-devel libffi-devel ncurses-devel zlib-devel" +hostmakedepends="dmd llvm12 perl pkg-config" +makedepends="libcurl-devel libffi-devel ncurses-devel zlib-devel + llvm-libunwind-devel" depends="ldc-runtime" +checkdepends="python3 tzdata" short_desc="Portable D programming language compiler based on LLVM" maintainer="Auri " 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=fd9561ade916e9279bdcc166cf0e4836449c24e695ab4470297882588adbba3c +checksum=c18f4c76869f0196b459dcd6196c7eaea1b097cc422cf3771de394f6c0ef7474 nopie=yes nocross="dmd compilation fails on cross" +# tests timeout on musl; also require unpackaged python3-lit +make_check=no post_install() { vlicense LICENSE From b8faf1cf29a6b2e5b434652db86f6833b42d4bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 22 May 2021 23:49:22 -0300 Subject: [PATCH 2/4] gtkd: revbump for ldc-1.26.0. --- srcpkgs/gtkd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template index ab6f17ea1e76..7f280b488703 100644 --- a/srcpkgs/gtkd/template +++ b/srcpkgs/gtkd/template @@ -1,7 +1,7 @@ # Template file for 'gtkd' pkgname=gtkd version=3.9.0 -revision=4 +revision=5 wrksrc="GtkD-${version}" build_style=gnu-makefile make_build_args="LDFLAGS='-linker=bfd' DC=ldc2" From d3f85b0edfadb42d2ecd269fcaa717562b10dc8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 22 May 2021 23:49:22 -0300 Subject: [PATCH 3/4] onedrive: revbump for ldc-1.26.0. --- srcpkgs/onedrive/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/onedrive/template b/srcpkgs/onedrive/template index e8237ccf0cb2..deadd000f55b 100644 --- a/srcpkgs/onedrive/template +++ b/srcpkgs/onedrive/template @@ -1,7 +1,7 @@ # Template file for 'onedrive' pkgname=onedrive version=2.4.10 -revision=1 +revision=2 build_style=gnu-configure configure_args="DC=ldc2" hostmakedepends="ldc pkg-config" From 9e9e287dcfc98b4e7762c1e87159af35c8f26b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 22 May 2021 23:49:22 -0300 Subject: [PATCH 4/4] tilix: revbump for ldc-1.26.0. --- srcpkgs/tilix/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tilix/template b/srcpkgs/tilix/template index 9383a1ce436d..ecaa0e58d5e4 100644 --- a/srcpkgs/tilix/template +++ b/srcpkgs/tilix/template @@ -1,7 +1,7 @@ # Template file for 'tilix' pkgname=tilix version=1.9.4 -revision=1 +revision=2 build_style=meson hostmakedepends="automake gettext-devel gdk-pixbuf glib-devel ldc po4a pkg-config librsvg tar AppStream"