| 1 |
commit: 97de8ec272b6b7bea576a7c96b50264a4ca81a30 |
| 2 |
Author: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 27 17:59:47 2018 +0000 |
| 4 |
Commit: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 27 17:59:47 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=97de8ec2 |
| 7 |
|
| 8 |
mate-extra/mate-utils: Backport patch to fix build, bug #639600 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/639600 |
| 11 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 12 |
|
| 13 |
...de-correct-header-to-fix-occasional-ftbfs.patch | 25 ++++++++++++++++++++++ |
| 14 |
mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild | 7 ++++-- |
| 15 |
2 files changed, 30 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..09d2017 |
| 20 |
--- /dev/null |
| 21 |
+++ b/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch |
| 22 |
@@ -0,0 +1,25 @@ |
| 23 |
+From 550229e422cd88fe39473f41cebe6cef12f6c8fb Mon Sep 17 00:00:00 2001 |
| 24 |
+From: monsta <monsta@×××××.ru> |
| 25 |
+Date: Tue, 14 Mar 2017 15:08:47 +0300 |
| 26 |
+Subject: [PATCH] mate-dictionary: include correct header to fix occasional |
| 27 |
+ FTBFS |
| 28 |
+ |
| 29 |
+taken from: |
| 30 |
+https://git.gnome.org/browse/gnome-dictionary/commit/?id=d529e2dd056f05cb1115c2f68bb6f773b4b14948 |
| 31 |
+--- |
| 32 |
+ mate-dictionary/libgdict/gdict-client-context.h | 2 +- |
| 33 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 34 |
+ |
| 35 |
+diff --git a/mate-dictionary/libgdict/gdict-client-context.h b/mate-dictionary/libgdict/gdict-client-context.h |
| 36 |
+index 2854fed..c52bbb4 100644 |
| 37 |
+--- a/mate-dictionary/libgdict/gdict-client-context.h |
| 38 |
++++ b/mate-dictionary/libgdict/gdict-client-context.h |
| 39 |
+@@ -20,7 +20,7 @@ |
| 40 |
+ #ifndef __GDICT_CLIENT_CONTEXT_H__ |
| 41 |
+ #define __GDICT_CLIENT_CONTEXT_H__ |
| 42 |
+ |
| 43 |
+-#include <glib-object.h> |
| 44 |
++#include "gdict-context.h" |
| 45 |
+ |
| 46 |
+ #define GDICT_TYPE_CLIENT_CONTEXT (gdict_client_context_get_type ()) |
| 47 |
+ #define GDICT_CLIENT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDICT_TYPE_CLIENT_CONTEXT, GdictClientContext)) |
| 48 |
|
| 49 |
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 |
| 50 |
index 22464b1..8c6fda4 100644 |
| 51 |
--- a/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild |
| 52 |
+++ b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild |
| 53 |
@@ -1,4 +1,4 @@ |
| 54 |
-# Copyright 1999-2016 Gentoo Foundation |
| 55 |
+# Copyright 1999-2018 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
|
| 58 |
EAPI=6 |
| 59 |
@@ -49,7 +49,10 @@ DEPEND="${RDEPEND} |
| 60 |
sys-devel/gettext:* |
| 61 |
virtual/pkgconfig:*" |
| 62 |
|
| 63 |
-PATCHES=( "${FILESDIR}/${P}-dict-gtk3.patch" ) |
| 64 |
+PATCHES=( |
| 65 |
+ "${FILESDIR}/${P}-dict-gtk3.patch" |
| 66 |
+ "${FILESDIR}/${P}-include-correct-header-to-fix-occasional-ftbfs.patch" |
| 67 |
+) |
| 68 |
|
| 69 |
src_prepare() { |
| 70 |
# Make apps visible in all DEs. |
Archives