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.
This commit is contained in:
Érico Nogueira 2021-05-22 23:49:22 -03:00 committed by Érico Nogueira Rolim
parent 673f702d68
commit bbb9261480
2 changed files with 34 additions and 2 deletions

View File

@ -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')

View File

@ -1,11 +1,12 @@
# Template file for 'tilix' # Template file for 'tilix'
pkgname=tilix pkgname=tilix
version=1.9.4 version=1.9.4
revision=1 revision=2
build_style=meson build_style=meson
configure_args="-Db_lto=false"
hostmakedepends="automake gettext-devel gdk-pixbuf glib-devel ldc po4a pkg-config hostmakedepends="automake gettext-devel gdk-pixbuf glib-devel ldc po4a pkg-config
librsvg tar AppStream" 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" depends="gsettings-desktop-schemas vte3"
checkdepends="$depends" checkdepends="$depends"
short_desc="Tiling terminal emulator for Linux" short_desc="Tiling terminal emulator for Linux"
@ -14,6 +15,7 @@ license="MPL-2.0"
homepage="https://gnunn1.github.io/tilix-web/" homepage="https://gnunn1.github.io/tilix-web/"
distfiles="https://github.com/gnunn1/${pkgname}/archive/${version}.tar.gz" distfiles="https://github.com/gnunn1/${pkgname}/archive/${version}.tar.gz"
checksum=2a9482770391d11d5edc8351d426c700c2cc6c194a30391ef2ae25bb7095b59b checksum=2a9482770391d11d5edc8351d426c700c2cc6c194a30391ef2ae25bb7095b59b
patch_args=-Np1
pre_configure() { pre_configure() {
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in