gentoo resync : 31.01.2018

4 files changed, 32 insertions, 3 deletions

diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index ba9d6ef7894f..3a1bc5971d42 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
index e94d2c3e0c7e..d4c899eeed8d 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,9 +1,10 @@
 AUX mate-utils-1.12.0-dict-gtk3.patch 1780 BLAKE2B 9f852c4531437a1868d69f7b62b7dbe0b21283fd7446262cb329f882e71297b46e62b2da3f825b61c10ad1fb116084ceb9da399b2d608b9b8f7e5e20ede84153 SHA512 758eb7b3734852553df9a7c064370241ab3c3b1ba6eaf56a28021ebd7c61b92f1b4c354d4ef05d6647d3549ca518e9c576bd478c6dbcd96bed818dc63522ad7a
+AUX mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch 1029 BLAKE2B d8c2860cd94625d29d02286795e78b4720ac3a439ae044797383bc59acf95e36e1896431f82f2f60e38c20bf8bb58ac4c6bd27ebae38d493360d856718f5482c SHA512 55bea637bfb20995c8bcb2d346fe1a6caadc57bc1cfd2b95c521e9d4e767ae8cf55a2e1e864c28a355928b534ce59bd16be284df25f2a1910cf056128bc12353
 DIST mate-utils-1.12.0.tar.xz 6482900 BLAKE2B a9922a2cd4cb15f5d561c4e07528c265ef759f65fc306490a8f1aebbfd077ece481c6d69485c7df639611b61cbe9ab2789cccd32edc2800be36429718526acca SHA512 fe1db5c04b3adc616fdd0f76ddfb1291bbbfb6fb7d2f9ab11c5ffc33e19e0487ba3581babdfe74dd64553fd07f7d986fbac08fe2b14bcb79fca315e365069e47
 DIST mate-utils-1.14.1.tar.xz 6498448 BLAKE2B 21809b5bfe4e624c9aaafeda2f161acbd5648b237d013ba4098c8a421dcb22e474caeac5148e3b902e9f869655928a619d5282957d508856f909592944881125 SHA512 7c95fe390f83ee90405929025039ccef186ebf268f85e45a0dda0483b5de9bb67a6d3bbbe1a55315787996118c6bdf6a4fb29ad7236428eef89750c058b886e4
 DIST mate-utils-1.16.1.tar.xz 6517092 BLAKE2B 3a9fa4b12d29038872a90841eff36310aeac2834797ad8b4a1cde41c97b4c1f815546a379028ba4559c3dbaf4f6aa91102fd0b80418a0f60d9501da2b7915dbb SHA512 d902362b23b8b26377fa6741e8b96230ee224ef6dc9c4b02dc50e6bd43d87a28c266d2a1bb9c4c7be48cc43162988240257be40a4fb8b7f2569a2520f35b7aa0
 DIST mate-utils-1.18.2.tar.xz 6442576 BLAKE2B bb146bdae4a9579fe700751679ef10efe149df9b4e6c27df67e88137c664a674e052cebb6c8af137bb2fd1da8f8b15b3e754c884c74aa81a6ab35f7d7e54e447 SHA512 4db4dd0ad986c52978a9fe7f893a0e1d8086b1685d8b162df9b7e7b33c9d8e47a85efc45f2db4cf45058cc91df3f909ece1b44e46c16a1a389070d8cd022348d
-EBUILD mate-utils-1.12.0-r2.ebuild 1442 BLAKE2B 393d0e6174ed7e22e1258d1e82e17ed108d4d803a34b460c278eff2640c8bd91cf3c3560649df3ceeba6bb7265b951e6dc56fc9ea370a26af686a69b9c394981 SHA512 6c043d0124bb98c69c073aa7d8f67ef0f1c131971f0b0c82c26083b01b6517ff7c21a5a2155c8f3c8f2f10bddc6f6ef3c5d9011e9425aab0c8b8cfd3a9458b6c
+EBUILD mate-utils-1.12.0-r2.ebuild 1516 BLAKE2B 5cafbb95031cb085c256457456bf587eaa341a99d7c3356b101524882b7d6515d9ccf44680b1e7fec92ccc26211cf492cce04af5fda76936fadb7bef8242ba84 SHA512 bc9bf2114b79846041d8530fc6a1ff94da5cbda5bbeab55255b734e9392f87b031afe3f9b56d28d81cbc0fbc25f1e41f1c95eb3ea9e03d19ee0ffb57c1a30334
 EBUILD mate-utils-1.14.1.ebuild 1438 BLAKE2B 2b61060624fe937d566036f776d475af7cbbfa5f4dd9cfe1d8cc154a2ab49dd9639509cc60186fa71bba6d34e9c70c6707f75696bbae7c3bfa231c6e49de8cd9 SHA512 bc81e418c63e0c136dcbfc7efd381b9654f565e6a8ee7f8c8d84b97c740d57570a889208cad948409ba13751e77e5432a4cc832a6a1b6c8f5b90d64d713561b9
 EBUILD mate-utils-1.16.1.ebuild 1438 BLAKE2B a1fc00e2774468ec36b051608372eca86c663de38b87d52cd122653812d275bffdc12d887abcd8ca31d8faa3795fd23448edafa722d0f87819fa142d6f0ffc30 SHA512 ff1a9de5cde45d092b94c89fda2a6afb08d4542a5f29048d3a5a2b2767aae8496a345cbf9792e037b3c7a3d338c8cc18ec747d0ae886b9c71752204556ceb2e9
 EBUILD mate-utils-1.18.2.ebuild 1308 BLAKE2B 2de5cfc62d664880b73dafec60acd95095a445947c0aa4cb3a6f87c53db212c3962e73404c5f40241ae432b8c38e36881db622aaedd1e911a450226d57ed3480 SHA512 1e190f69043b31326d3fe41aa9316a61b7ee002d3ed4288f0a095466df8cbb1f11a583b9a557b88b84ae0267890d38394ffc03abb5a27b7bca0e63c1baa9b49d
diff --git a/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch b/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch
new file mode 100644
index 000000000000..09d201763f69
--- /dev/null
+++ b/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch
@@ -0,0 +1,25 @@
+From 550229e422cd88fe39473f41cebe6cef12f6c8fb Mon Sep 17 00:00:00 2001
+From: monsta <monsta@inbox.ru>
+Date: Tue, 14 Mar 2017 15:08:47 +0300
+Subject: [PATCH] mate-dictionary: include correct header to fix occasional
+ FTBFS
+
+taken from:
+https://git.gnome.org/browse/gnome-dictionary/commit/?id=d529e2dd056f05cb1115c2f68bb6f773b4b14948
+---
+ mate-dictionary/libgdict/gdict-client-context.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mate-dictionary/libgdict/gdict-client-context.h b/mate-dictionary/libgdict/gdict-client-context.h
+index 2854fed..c52bbb4 100644
+--- a/mate-dictionary/libgdict/gdict-client-context.h
++++ b/mate-dictionary/libgdict/gdict-client-context.h
+@@ -20,7 +20,7 @@
+ #ifndef __GDICT_CLIENT_CONTEXT_H__
+ #define __GDICT_CLIENT_CONTEXT_H__
+ 
+-#include <glib-object.h>
++#include "gdict-context.h"
+ 
+ #define GDICT_TYPE_CLIENT_CONTEXT		(gdict_client_context_get_type ())
+ #define GDICT_CLIENT_CONTEXT(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GDICT_TYPE_CLIENT_CONTEXT, GdictClientContext))
diff --git a/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
index 22464b1481fd..8c6fda4f20fa 100644
--- a/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext:*
 	virtual/pkgconfig:*"
 
-PATCHES=( "${FILESDIR}/${P}-dict-gtk3.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-dict-gtk3.patch"
+	"${FILESDIR}/${P}-include-correct-header-to-fix-occasional-ftbfs.patch"
+)
 
 src_prepare() {
 	# Make apps visible in all DEs.