From ec00f787cd84d1a6c8063177d6e7207bef437eff Mon Sep 17 00:00:00 2001
From: Simeon Simeonov
Date: Thu, 4 Jun 2020 19:21:47 +0200
Subject: Add terminator patches as well

---
 x11-terms/terminator/Manifest                      |  2 ++
 .../files/terminator-1.92-make-tests-fail.patch    | 25 +++++++++++++++++
 .../files/terminator-1.92-metainfo.patch           | 32 ++++++++++++++++++++++
 3 files changed, 59 insertions(+)
 create mode 100644 x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch
 create mode 100644 x11-terms/terminator/files/terminator-1.92-metainfo.patch

diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index d5c53b0..87e5021 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,5 +1,7 @@
 AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381c6b66389e1ca8e82ebd961d970b84543133b098166008310fc035a591eb26e93c10fcc1bbb02ebc66752bb26145cbd SHA512 8944e27a6ab20f7f74c7dac9e2e93877a156ee5082c617dc7de84298bec303c7a0cf57fc1dd3cad4ae76ce2e15c50aacb8fe5587fe977727c10a6a3c48cca880
 AUX terminator-1.91-without-icon-cache.patch 567 BLAKE2B 72ebaa0eaee27491d0f93982b84c56009fd327108cb8e0b3a8e88a95a781dc324f11f6f8290e7082919a7753a1419777e7e028bafcc1437cc62e51eda465f3f3 SHA512 36f5f08f1724b6cd4bd43d37a27e5161feec66f03a9dd1de973e50eb557f5fe171329903a8074343b5fc816bcaa0fec2642060001c727c35792680a8007a7c50
+AUX terminator-1.92-make-tests-fail.patch 734 BLAKE2B c42414858614cda0480d69563ffc8ce2fef182eab5022a9b243203b1c663e191b7d66e7a09dbcf6d85bf7f302f3d25b8e182b7a3bd4af89697668fa6e0571e6a SHA512 594b5f9f4c9f7debe5cc8c343a0ba35429f1230595eefa1b343fbdd9b9c5931760658cd62736d0c2c6684182a4881e087ae9673ede6b63b86c9eba49ba849c40
+AUX terminator-1.92-metainfo.patch 1490 BLAKE2B 4d041053c3dd166a9ed2ea7cb53c64df6f3539dd94f00f560d30c7609b513e40abd5073b43a1f27d594661c21e1bb26699ea1dfefdcb99708774de9213a57c76 SHA512 de55463c02d6f7a63a17c12379ac145ed447d201bc2fdb066abe01763d50da92bfaf466ee945b8046eca3b69954282a9154a1455ae452c65cfebeda98e39481d
 AUX terminator-1.92-single-tab.patch 1024 BLAKE2B 4611e9275573233bb3c9f618f13348fbc36f880e4a9e239a8d1ee20e2795e90bdbb41c61f5126e166f39008d7b9d917708bc66a73c0fe1445145e74da43b967d SHA512 fda7d93d015d9a8a7847f9ebff222c15372437763b823194e5502be0d592d1ecad54f9050464bdfbda786fcbcc0e9e9f1feac5ee3b2097b3823e3096a31d3be4
 DIST terminator-1.92.tar.gz 910613 BLAKE2B d7a665f81011b21da14837492f04204158e95d846aaf876d2393fe4a236113d9718be9b3946f38e1385168bbcec72fd65b895b5f476727c8a67bbc6e51016a63 SHA512 9a63d1993582d94711b7be6cad0ecde3969b3a5d297ab388677b485161fae308a93d559f84bc4cb7ff71c8755cac6c2511b3677a8ab1da3da6427c53c68529f1
 EBUILD terminator-1.92-r1.ebuild 1481 BLAKE2B 6c6f69263e2262a03bf604228b801c4f30d95b19a749fb353e8b74948245b1ea4fe97492958bf54fe8ae424b79ae8f7a1516e94408908e7c67684163812da609 SHA512 da1cddac602b19c354a58b1394f2d279490e9428b2911fc827dac315de5c645a1cc6109d083f9ee2f0e730e3e8f5d8e7aae5fc58d8abc6c3d42ecd38c0bd97a2
diff --git a/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch b/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch
new file mode 100644
index 0000000..ae722cb
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch
@@ -0,0 +1,25 @@
+commit 9f855d41f3e6d610bd01df9688467fdbb341917c
+Author: Alexey Sokolov <sokolov@google.com>
+Date:   Fri May 1 08:36:09 2020 +0100
+
+    Make failed tests fail the test
+
+diff --git a/run_tests b/run_tests
+index 3bf51e4a..cc7fb56a 100755
+--- a/run_tests
++++ b/run_tests
+@@ -4,10 +4,10 @@ for t in tests/test*; do
+     echo $t
+     file_type=$(file -b $t)
+     case ${file_type} in
+-        *[Pp]ython*) python ${t} ;;
+-        *Bourne*) bash ${t} ;;
+-        *bash*)   bash ${t} ;;
+-        *perl*)   perl ${t} ;;
++        *[Pp]ython*) python ${t} || exit 1 ;;
++        *Bourne*) bash ${t} || exit 1 ;;
++        *bash*)   bash ${t} || exit 1 ;;
++        *perl*)   perl ${t} || exit 1 ;;
+         *) echo "Unknown" ;;
+     esac
+     echo
diff --git a/x11-terms/terminator/files/terminator-1.92-metainfo.patch b/x11-terms/terminator/files/terminator-1.92-metainfo.patch
new file mode 100644
index 0000000..ae2fed5
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.92-metainfo.patch
@@ -0,0 +1,32 @@
+commit 39fb5fb9586e9974c2bf4772e18c86b07e3a4a41
+Author: Alexey Sokolov <sokolov@google.com>
+Date:   Fri May 1 20:38:00 2020 +0100
+
+    Install AppStream data as .metainfo.xml
+    
+    Following advice from https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
+
+diff --git a/setup.py b/setup.py
+index 7c54977e..38a819a9 100755
+--- a/setup.py
++++ b/setup.py
+@@ -72,7 +72,7 @@ class BuildData(build):
+           [file_data.write(line.lstrip('_')) for line in file_in]
+ 
+       appdata_in='data/terminator.appdata.xml.in'
+-      appdata_data='data/terminator.appdata.xml'
++      appdata_data='data/terminator.metainfo.xml'
+       rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -x -u -c " + TOP_BUILDDIR +
+                  "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " +
+                  appdata_in + " " + appdata_data)
+@@ -205,9 +205,9 @@ setup(name=APP_NAME,
+       license='GNU GPL v2',
+       scripts=['terminator', 'remotinator'],
+       data_files=[
+                   ('bin', ['terminator.wrapper']),
+-                  ('share/appdata', ['data/terminator.appdata.xml']),
+                   ('share/applications', ['data/terminator.desktop']),
++                  ('share/metainfo', ['data/terminator.metainfo.xml']),
+                   (os.path.join(man_dir, 'man1'), ['doc/terminator.1']),
+                   (os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']),
+                   ('share/pixmaps', ['data/icons/hicolor/48x48/apps/terminator.png']),
-- 
cgit v1.3