summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2018-10-06 23:09:01 +0300
committerMart Raudsepp <leio@gentoo.org>2018-10-06 23:22:13 +0300
commit6d59c1f4f1eb664736e9b79dee18e42689f9029f (patch)
tree56ee466605f4c09df053edf11d24a55b5dc90c2e /mate-extra/mate-utils/files
parentmate-extra/mate-user-share: remove old (diff)
downloadgentoo-6d59c1f4f1eb664736e9b79dee18e42689f9029f.tar.gz
gentoo-6d59c1f4f1eb664736e9b79dee18e42689f9029f.tar.bz2
gentoo-6d59c1f4f1eb664736e9b79dee18e42689f9029f.zip
mate-extra/mate-utils: remove old
Signed-off-by: Mart Raudsepp <leio@gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11
Diffstat (limited to 'mate-extra/mate-utils/files')
-rw-r--r--mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch53
-rw-r--r--mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch25
2 files changed, 0 insertions, 78 deletions
diff --git a/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch b/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch
deleted file mode 100644
index dff6dbe5582f..000000000000
--- a/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 5ab184661ff38baca3ea2709d81932a578654392 Mon Sep 17 00:00:00 2001
-From: Kir Kolyshkin <kir@openvz.org>
-Date: Mon, 16 May 2016 14:52:28 -0700
-Subject: [PATCH] mate-dict.pc: depend upon proper gtk version
-
-If the package is built against gtk-3.0 (as in
-./configure --with-gtk=3.0), mate-dict.pc still wants gtk-2.0
-since it's hardcoded it there. This can lead to improper builds
-of packages using libmatedict (although I can't find any now),
-as well as improper RPM dependencies, like this:
-
- $ rpm -e gtk2-devel
- error: Failed dependencies:
- ...
- pkgconfig(gtk+-2.0) is needed by (installed) mate-utils-devel-1.14.0-1gtk3.fc23.x86_64
-
-Fortunately, the file is already generated, so it's trivial to add
-a proper substitution.
-
-[v2: also add min GTK version required]
-
-Signed-off-by: Kir Kolyshkin <kir@openvz.org>
----
- configure.ac | 2 ++
- mate-dictionary/libgdict/mate-dict.pc.in | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 64aba70..39cc6f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -89,6 +89,8 @@ case "$with_gtk" in
- LIBCANBERRA_GTK_REQUIRED=0.4
- ;;
- esac
-+AC_SUBST(GTK_API_VERSION)
-+AC_SUBST(GTK_REQUIRED)
-
- # common checks
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-diff --git a/mate-dictionary/libgdict/mate-dict.pc.in b/mate-dictionary/libgdict/mate-dict.pc.in
-index e409a0c..8168de2 100644
---- a/mate-dictionary/libgdict/mate-dict.pc.in
-+++ b/mate-dictionary/libgdict/mate-dict.pc.in
-@@ -5,7 +5,7 @@ includedir=@includedir@
-
- Name: gdict-1.0
- Description: MATE Dictionary Protocol client library
--Requires: gtk+-2.0
-+Requires: gtk+-@GTK_API_VERSION@ >= @GTK_REQUIRED@
- Version: @GDICT_VERSION@
- Libs: -L${libdir} -lmatedict
- Cflags: -I${includedir}/mate-dict
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
deleted file mode 100644
index 09d201763f69..000000000000
--- a/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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))