gentoo resync : 18.08.2019

4 files changed, 38 insertions, 2 deletions

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 7dbcf179edb2..11fa1d9acd0a 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,3 +1,4 @@
+AUX 0.54.4-vala-0.44-compat.patch 883 BLAKE2B ecf653b7d37d731eace38d8bd1b52d9b6420fa46c67ce0090e0d0e2d4c48aa03f1951438db6bfe62a5e0094d080605d0cb51d71247d133307d47c98b6bd45f7a SHA512 9aa4961497931d7d18f7107b6101aa04dbbc034e45313272154e7e685166e565022e025e407ff56a95661e7c1bf135d68023ed0d513ceb0a6b6f83a43292d161
 AUX vte-0.28.2-interix.patch 1566 BLAKE2B 1d6b4b7cfc1fee464779e3efb8de09554c9e52f562d90d280e03493f01d8f44e468260b4c92327006a2358688414cf04d9639eea1162808597c590eeb6c21af0 SHA512 f02574f96355c6cedde05d0877d3bf50e7777d210484a80b6e95e597b0bb225f5968649e67f67d7f112f50302ae6566e4f3d8c59d7a5b65fc95601cac00868d7
 AUX vte-0.28.2-limit-arguments.patch 1477 BLAKE2B 329e8eb93156244526ebe3ccb3c2a75234da7a57a994c2c1b42e283a65011d6245133f858778571efefec18bf18bc7db9afe5aeded0df0cec35a72a31507671b SHA512 e5639d94fd455195c354d03cab04bbb73eff98bc540c813cccf4ab5eb793f4c8ae645fcf2bd502924ed4d38412101341deaf2d28ea8aaea3530a98ffbba8256d
 AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 BLAKE2B d57f20415193bf9bc283399bcae4e3c2a23ff7f2f8ffee08e8a67c3af2956b137f788322e26bf2537e785c0d0ce6266b56269abe5a18e2e881ea548b5c1b4625 SHA512 46a54c96889c3a0c5a293a097f777dd2e24e5a3025b808d7fb0bbfe71e8938f7d30ba26a05e67cb6b63ad59719eace57d0f6e0ff9f2860fbe9f12c36e022b8ec
@@ -8,6 +9,6 @@ DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b2
 DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
 DIST vte-0.54.4.tar.xz 1087748 BLAKE2B 65fb762414e832930ce1519dc99fe306b3c9c3860bf8116c29e66b758178d1f0a52705cd6f7ab1be30374fb2956a01aaccc8f6859d0af971f2037809421bb502 SHA512 7e0f4140a4c474fad9a48eaf0e4c29f83e7bf50719087983c238b362c6303824836c34485eb2ca135be0961fa4b83a318d08ef70d4cf0dab0d37dc2e36710c41
 EBUILD vte-0.28.2-r208.ebuild 2962 BLAKE2B 7004c56381a05ed2c0c309736581f2e03478faae88903ca6eb2b74acfefaf37464fc8b1f1a077d3bff1344ad6a60383f4338b0a27ce2521bb0f68727eb252da6 SHA512 bf607001b0dd305cef30e4f1ae3389b73ae30c747a52915e4dd3df9bb051c44f29317c591a2d47add9bc0e95559ead75155338a69acd31fea9fb79c57f18577d
-EBUILD vte-0.48.4.ebuild 2296 BLAKE2B 1ae75d444433f1c6ea478e69968ae1a369b96e6ff7410a22a7f110d157369f15aeb0b22662da1ca4574b60b6151932823e2866596cc45394a38b76eb89009fd0 SHA512 80c270a32cf543c2bb29a534ff07179c5897505132383862cab59ec203789dda70e3c62e6cd6dffe305a3e36113510f2f5b7dfb49bf1de1e476e87a685499315
-EBUILD vte-0.54.4.ebuild 2215 BLAKE2B a5f21e683c7300ff8f92c65d8edfc9b6cf0eff19912908cb5fa225486003e372c6228e7e373cb8103be696f67c90a098945b61e7e081d7b6fe09fe9c05285f62 SHA512 ff2fb100a8ba5256d67a2112078b235e014bea274320ea42b8c7d5666c94a5bd1b8e4dd5cd7754dd99e386e8bd9bc79918dd141ec2dd35f506f3037e078b23a4
+EBUILD vte-0.48.4.ebuild 2454 BLAKE2B afa4f22fe6dc8cca9404be315b8f483ac710ca25f2b0d51077350191789fa9369f3d0683d7877117f671ec0b005caf2498e2a6f8cac325d17405d1f2c6a857c8 SHA512 177d216a4ef222f60fae1cd77aa1e0605d02e5c32f22f1726c5900728689b637637b0077fcb34144eb56d0389b82d88f642dd36ba989446cd591de0e4a436ed2
+EBUILD vte-0.54.4.ebuild 2372 BLAKE2B f06d6a983494e7e9d3f5855614c878f1823dec35cb6278c391040092237ceb5886ff1b9d73ecbd492338e8ffd26711ea15aa9ba3b35b2971ebc2f530cf390813 SHA512 5b9d03b07bb8036e9f07fee6320d974a4cf671385a6696ae65158f5839ec08d73e493c1a7b82ca2755e9a8a50f8ae687c721f26ae6d21cc9514c963108523590
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch b/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch
new file mode 100644
index 000000000000..5da32bea838a
--- /dev/null
+++ b/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch
@@ -0,0 +1,29 @@
+From 53690d5cee51bdb7c3f7680d3c22b316b1086f2c Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 1 Dec 2018 19:04:59 +0100
+Subject: [PATCH] vala: Fix build with vala 0.43+ git master due to empty
+ struct definition
+
+This should get a proper refactoring as the FIXME suggests.
+
+See https://gitlab.gnome.org/GNOME/vte/issues/76
+---
+ bindings/vala/app.vala | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
+index 8663d63c..a534e76b 100644
+--- a/bindings/vala/app.vala
++++ b/bindings/vala/app.vala
+@@ -819,6 +819,8 @@ class App : Gtk.Application
+ 
+   public struct Options
+   {
++    //FIXME Merge this struct into App class
++    public int dummy;
+     public static bool audible = false;
+     public static string? command = null;
+     private static string? cjk_ambiguous_width_string = null;
+-- 
+2.20.1
+
diff --git a/x11-libs/vte/vte-0.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
index 23c0c8fdfbdb..779dabd7b871 100644
--- a/x11-libs/vte/vte-0.48.4.ebuild
+++ b/x11-libs/vte/vte-0.48.4.ebuild
@@ -52,6 +52,9 @@ src_prepare() {
 		eapply "${WORKDIR}"/${P}-command-notify.patch
 	fi
 
+	# Fix bindings test compilation with vala:0.44 and newer - https://gitlab.gnome.org/GNOME/vte/issues/76
+	eapply "${FILESDIR}"/0.54.4-vala-0.44-compat.patch
+
 	use vala && vala_src_prepare
 
 	# build fails because of -Werror with gcc-5.x
diff --git a/x11-libs/vte/vte-0.54.4.ebuild b/x11-libs/vte/vte-0.54.4.ebuild
index 5880df276f93..e11d9d2ec6bb 100644
--- a/x11-libs/vte/vte-0.54.4.ebuild
+++ b/x11-libs/vte/vte-0.54.4.ebuild
@@ -52,6 +52,9 @@ src_prepare() {
 		eapply "${WORKDIR}"/${PN}-0.54.1-command-notify.patch
 	fi
 
+	# Fix bindings test compilation with vala:0.44 and newer - https://gitlab.gnome.org/GNOME/vte/issues/76
+	eapply "${FILESDIR}"/${PV}-vala-0.44-compat.patch
+
 	use vala && vala_src_prepare
 
 	# build fails because of -Werror with gcc-5.x