From bbb9261480fbaeac7778d31c5422a5fb0071631a 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] tilix: revbump for ldc-1.26.0. Remove libunwind-devel so it builds with llvm-libunwind (which is already linked to the D runtime and we don't want symbol mismatches). This required patching meson.build so it could use a library without pkgconfig files. Also disable LTO, which was causing linking failures. --- srcpkgs/tilix/patches/llvm-unwind.patch | 30 +++++++++++++++++++++++++ srcpkgs/tilix/template | 6 +++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/tilix/patches/llvm-unwind.patch diff --git a/srcpkgs/tilix/patches/llvm-unwind.patch b/srcpkgs/tilix/patches/llvm-unwind.patch new file mode 100644 index 00000000000..dbc7b3eaa5c --- /dev/null +++ b/srcpkgs/tilix/patches/llvm-unwind.patch @@ -0,0 +1,30 @@ +Use find_library instead of dependency so llvm-libunwind can be used, +since it doesn't ship a pkg-config file. + +diff --git a/meson.build b/meson.build +index 448e262..1a8ebfb 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,11 +1,12 @@ + project( +- 'Tilix', 'd', ++ 'Tilix', ['c','d'], + version: '1.9.4', + license: 'MPL-2.0', + meson_version: '>= 0.52' + ) + + compiler = meson.get_compiler('d') ++cc = meson.get_compiler('c') + if compiler.get_id() == 'llvm' + d_extra_args = ['-vcolumns'] + d_link_args = [] +@@ -100,7 +101,7 @@ sources_dir = include_directories('source/') + gtkd_dep = dependency('gtkd-3', version: '>=3.8.5') + vted_dep = dependency('vted-3', version: '>=3.8.5') + xlib_dep = dependency('x11') +-libunwind_dep = dependency('libunwind') ++libunwind_dep = cc.find_library('libunwind') + libsecret_dep = dependency('libsecret-1', required: false) + + subdir('po') diff --git a/srcpkgs/tilix/template b/srcpkgs/tilix/template index 9383a1ce436..952643b213f 100644 --- a/srcpkgs/tilix/template +++ b/srcpkgs/tilix/template @@ -1,11 +1,12 @@ # Template file for 'tilix' pkgname=tilix version=1.9.4 -revision=1 +revision=2 build_style=meson +configure_args="-Db_lto=false" hostmakedepends="automake gettext-devel gdk-pixbuf glib-devel ldc po4a pkg-config librsvg tar AppStream" -makedepends="dconf-devel gtkd-devel libglib-devel libvted-devel libX11-devel libunwind-devel" +makedepends="dconf-devel gtkd-devel libglib-devel libvted-devel libX11-devel" depends="gsettings-desktop-schemas vte3" checkdepends="$depends" short_desc="Tiling terminal emulator for Linux" @@ -14,6 +15,7 @@ license="MPL-2.0" homepage="https://gnunn1.github.io/tilix-web/" distfiles="https://github.com/gnunn1/${pkgname}/archive/${version}.tar.gz" checksum=2a9482770391d11d5edc8351d426c700c2cc6c194a30391ef2ae25bb7095b59b +patch_args=-Np1 pre_configure() { case "$XBPS_TARGET_MACHINE" in