Commit in tilix/trunk (PKGBUILD undeaD-xml.patch)

[Dan Printzell]

    Date: Tuesday, February 21, 2023 @ 22:02:28
  Author: wild
Revision: 1403318

upgpkg: tilix 1.9.5-5: Rebuilt against new ldc

Added:
  tilix/trunk/undeaD-xml.patch
Modified:
  tilix/trunk/PKGBUILD

------------------+
 PKGBUILD         |   12 ++++++++++--
 undeaD-xml.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-02-21 22:01:36 UTC (rev 1403317)
+++ PKGBUILD    2023-02-21 22:02:28 UTC (rev 1403318)
@@ -5,7 +5,7 @@
 
 pkgname=tilix
 pkgver=1.9.5
-pkgrel=4
+pkgrel=5
 pkgdesc="A tiling terminal emulator for Linux using GTK+ 3"
 arch=('x86_64')
 url="https://github.com/gnunn1/tilix";
@@ -17,13 +17,21 @@
 source=(
   "$url/archive/$pkgver/$pkgname-$pkgver.tar.gz"
   "Add-compatibility-with-Nautilus-43.patch::$url/pull/2115.patch"
+  
"undeaD-1.1.8.tar.gz::https://github.com/dlang/undeaD/archive/refs/tags/v1.1.8.tar.gz";
+  "undeaD-xml.patch"
 )
 sha256sums=('e25335a3f7ab06779b957d08ffaf7698c966c3b5179d002f82ce41c692fc0b89'
-            '5ad54f9627d0035f6025b684ffab831341d8bdcf597b3f4a8146b09014c418b5')
+            '5ad54f9627d0035f6025b684ffab831341d8bdcf597b3f4a8146b09014c418b5'
+            '36a59b4740b147f4345caa26908f40a97fc7cc67dac6983c226369c59f909e92'
+            '989295aadf8d3d0fa90d1b7cd01558293956bb4a753dbbdc05d92d486596bf25')
 
 prepare() {
   patch --directory="$pkgname-$pkgver" --forward --strip=1 --input 
"$srcdir"/Add-compatibility-with-Nautilus-43.patch
+  patch --directory="$pkgname-$pkgver" --forward --strip=1 --input 
"$srcdir"/undeaD-xml.patch
+
   mkdir -p build
+  cd "$srcdir"/$pkgname-$pkgver
+  ln -s "$srcdir"/undeaD-1.1.8
 }
 
 build() {

Added: undeaD-xml.patch
===================================================================
--- undeaD-xml.patch                            (rev 0)
+++ undeaD-xml.patch    2023-02-21 22:02:28 UTC (rev 1403318)
@@ -0,0 +1,34 @@
+diff --git a/meson.build b/meson.build
+index 79981a96..c7e9cc34 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,7 +7,7 @@ project(
+ 
+ compiler = meson.get_compiler('d')
+ if compiler.get_id() == 'llvm'
+-  d_extra_args = ['-vcolumns']
++  d_extra_args = ['-vcolumns', '-I=../undeaD-1.1.8/src']
+   d_link_args = []
+ else
+   d_extra_args = []
+@@ -29,6 +29,7 @@ iconsdir = datadir / 'icons' / 'hicolor'
+ appdir = datadir / 'applications'
+ 
+ tilix_sources = [
++    'undeaD-1.1.8/src/undead/xml.d',
+     'source/gx/gtk/actions.d',
+     'source/gx/gtk/cairo.d',
+     'source/gx/gtk/clipboard.d',
+diff --git a/source/gx/tilix/prefeditor/prefdialog.d 
b/source/gx/tilix/prefeditor/prefdialog.d
+index a5c3ce37..9b94042f 100644
+--- 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);