summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEttore Di Giacinto <mudler@gentoo.org>2018-01-27 18:59:47 +0100
committerEttore Di Giacinto <mudler@gentoo.org>2018-01-27 19:04:24 +0100
commit812b726d2eb3cb85372ab11a4087ff9eaab9c5ad (patch)
treed4f1f885c7d8e9a7acd32a23d8d0a345157bd713 /mate-extra
parentnet-print/cnijfilter2: Bump to 5.40. Bug #645854 (diff)
downloadgentoo-812b726d2eb3cb85372ab11a4087ff9eaab9c5ad.tar.gz
gentoo-812b726d2eb3cb85372ab11a4087ff9eaab9c5ad.tar.bz2
gentoo-812b726d2eb3cb85372ab11a4087ff9eaab9c5ad.zip
mate-extra/mate-utils: Backport patch to fix build, bug #639600
Closes: https://bugs.gentoo.org/639600 Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'mate-extra')
-rw-r--r--mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch25
-rw-r--r--mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild7
2 files changed, 30 insertions, 2 deletions
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.