mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
tilix: update to 1.9.6.
This commit is contained in:
parent
8818a53e62
commit
30b1fe11d8
4 changed files with 9 additions and 72 deletions
|
@ -2,16 +2,16 @@ Use find_library instead of dependency so llvm-libunwind can be used,
|
||||||
since it doesn't ship a pkg-config file.
|
since it doesn't ship a pkg-config file.
|
||||||
|
|
||||||
diff --git a/meson.build b/meson.build
|
diff --git a/meson.build b/meson.build
|
||||||
index 448e262..1a8ebfb 100644
|
index fdf63f57..8c4515d0 100644
|
||||||
--- a/meson.build
|
--- a/meson.build
|
||||||
+++ b/meson.build
|
+++ b/meson.build
|
||||||
@@ -1,11 +1,12 @@
|
@@ -1,11 +1,12 @@
|
||||||
project(
|
project(
|
||||||
- 'Tilix', 'd',
|
- 'Tilix', 'd',
|
||||||
+ 'Tilix', ['c','d'],
|
+ 'Tilix', ['c', 'd'],
|
||||||
version: '1.9.4',
|
version: '1.9.6',
|
||||||
license: 'MPL-2.0',
|
license: 'MPL-2.0',
|
||||||
meson_version: '>= 0.52'
|
meson_version: '>= 0.56'
|
||||||
)
|
)
|
||||||
|
|
||||||
compiler = meson.get_compiler('d')
|
compiler = meson.get_compiler('d')
|
||||||
|
@ -19,7 +19,7 @@ index 448e262..1a8ebfb 100644
|
||||||
if compiler.get_id() == 'llvm'
|
if compiler.get_id() == 'llvm'
|
||||||
d_extra_args = ['-vcolumns']
|
d_extra_args = ['-vcolumns']
|
||||||
d_link_args = []
|
d_link_args = []
|
||||||
@@ -100,7 +101,7 @@ sources_dir = include_directories('source/')
|
@@ -99,7 +100,7 @@ sources_dir = include_directories('source/')
|
||||||
gtkd_dep = dependency('gtkd-3', version: '>=3.8.5')
|
gtkd_dep = dependency('gtkd-3', version: '>=3.8.5')
|
||||||
vted_dep = dependency('vted-3', version: '>=3.8.5')
|
vted_dep = dependency('vted-3', version: '>=3.8.5')
|
||||||
xlib_dep = dependency('x11')
|
xlib_dep = dependency('x11')
|
||||||
|
|
|
@ -1,33 +0,0 @@
|
||||||
From 7cb2c59a31891f6463d1b181f1ec461c9352d782 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jan Beich <jbeich@FreeBSD.org>
|
|
||||||
Date: Tue, 22 Feb 2022 12:06:23 +0000
|
|
||||||
Subject: [PATCH] meson: drop unused argument for i18n.merge_file() (#2081)
|
|
||||||
|
|
||||||
Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
|
|
||||||
|
|
||||||
data/meson.build:13:0: ERROR: Function does not take positional arguments.
|
|
||||||
data/meson.build:46:0: ERROR: Function does not take positional arguments.
|
|
||||||
---
|
|
||||||
data/meson.build | 2 --
|
|
||||||
1 file changed, 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/data/meson.build b/data/meson.build
|
|
||||||
index 81e9b410..c8b23e1b 100644
|
|
||||||
--- a/data/meson.build
|
|
||||||
+++ b/data/meson.build
|
|
||||||
@@ -11,7 +11,6 @@ install_data(
|
|
||||||
|
|
||||||
# Install the desktop file
|
|
||||||
desktop_file = i18n.merge_file(
|
|
||||||
- '@0@.desktop'.format(project_id),
|
|
||||||
output: '@BASENAME@',
|
|
||||||
input: 'pkg/desktop/@0@.desktop.in'.format(project_id),
|
|
||||||
po_dir: meson.source_root() / 'po',
|
|
||||||
@@ -44,7 +43,6 @@ metainfo_with_releases = custom_target('metainfo-news-merge',
|
|
||||||
|
|
||||||
# Install the MetaInfo file
|
|
||||||
metainfo_file = i18n.merge_file(
|
|
||||||
- tilix_metainfo_name,
|
|
||||||
output: tilix_metainfo_name,
|
|
||||||
input: metainfo_with_releases,
|
|
||||||
po_dir: meson.source_root() / 'po',
|
|
|
@ -1,21 +0,0 @@
|
||||||
--- 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
|
|
||||||
@@ -91,6 +91,7 @@ tilix_sources = [
|
|
||||||
'source/secretc/secrettypes.d',
|
|
||||||
'source/x11/X.d',
|
|
||||||
'source/x11/Xlib.d',
|
|
||||||
+ 'source/undead/xml.d',
|
|
||||||
'source/app.d'
|
|
||||||
]
|
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
# Template file for 'tilix'
|
# Template file for 'tilix'
|
||||||
pkgname=tilix
|
pkgname=tilix
|
||||||
version=1.9.4
|
version=1.9.6
|
||||||
revision=7
|
revision=1
|
||||||
_undead_version=1.1.8
|
|
||||||
build_wrksrc="${pkgname}-${version}"
|
|
||||||
build_style=meson
|
build_style=meson
|
||||||
configure_args="-Db_lto=false"
|
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
|
||||||
|
@ -15,15 +13,8 @@ short_desc="Tiling terminal emulator for Linux"
|
||||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||||
license="MPL-2.0"
|
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"
|
||||||
https://github.com/dlang/undeaD/archive/refs/tags/v${_undead_version}.tar.gz"
|
checksum=be389d199a6796bd871fc662f8a37606a1f84e5429f24e912d116f16c5f0a183
|
||||||
checksum="2a9482770391d11d5edc8351d426c700c2cc6c194a30391ef2ae25bb7095b59b
|
|
||||||
36a59b4740b147f4345caa26908f40a97fc7cc67dac6983c226369c59f909e92"
|
|
||||||
patch_args="-d ${build_wrksrc} -Np1"
|
|
||||||
|
|
||||||
post_extract() {
|
|
||||||
mv undeaD-${_undead_version}/src/undead ${build_wrksrc}/source/
|
|
||||||
}
|
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
|
Loading…
Add table
Reference in a new issue