1 |
commit: d26d0d2de4d48a81afe61dcebeda2954def0259f |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 19 18:27:57 2016 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 19 19:42:29 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d26d0d2d |
7 |
|
8 |
xfce-extra/xfce4-dict: Drop old (revdep of deprecated libxfcegui4) |
9 |
|
10 |
xfce-extra/xfce4-dict/Manifest | 1 - |
11 |
.../files/xfce4-dict-0.6.0-underlinking.patch | 21 ----------- |
12 |
xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild | 43 ---------------------- |
13 |
3 files changed, 65 deletions(-) |
14 |
|
15 |
diff --git a/xfce-extra/xfce4-dict/Manifest b/xfce-extra/xfce4-dict/Manifest |
16 |
index a334c00..c62801f 100644 |
17 |
--- a/xfce-extra/xfce4-dict/Manifest |
18 |
+++ b/xfce-extra/xfce4-dict/Manifest |
19 |
@@ -1,2 +1 @@ |
20 |
-DIST xfce4-dict-0.6.0.tar.bz2 373420 SHA256 a8188ca4c980ca2003be6bf2391589f5122830680c41d51105b10813850da0d3 SHA512 3964abe66280413f7db4617c33379144414bfc751070a24167cd3285619fce18fdf81c4fce1b3f58e6866611a79400e9ea0a56063a4fb147e3fbc7a2f6db7c4c WHIRLPOOL eb04bd1521fdbfba5d01452948f9b6cedaa4620d48b155dd5a90af77e2d62e3817bb1bdf8804feb11d9d1286a537b341eb59fc9c76395a0677fa43649ab6e3de |
21 |
DIST xfce4-dict-0.7.1.tar.bz2 493952 SHA256 d15611e75a5e9c51167f2101cb760505ff72c446ef15542183b5e0fbf9c540fc SHA512 820d77e84583ace3b809b45ecbbf16da7fbdd5d4d69762e18e940f20ea9f54a5f88332e24fe85865fe50a5ab0c31f7b9b20ce28c1179b5538d4612c2d9fe1d50 WHIRLPOOL b17ca270ac568667467bfd79ec40e40257efdeaabee06fcc3a3044832e1f3e6c03876f11583382a95939bcd7a16c0e91b40e8a35557b1b37b45c47946db52158 |
22 |
|
23 |
diff --git a/xfce-extra/xfce4-dict/files/xfce4-dict-0.6.0-underlinking.patch b/xfce-extra/xfce4-dict/files/xfce4-dict-0.6.0-underlinking.patch |
24 |
deleted file mode 100644 |
25 |
index 9366f0b..0000000 |
26 |
--- a/xfce-extra/xfce4-dict/files/xfce4-dict-0.6.0-underlinking.patch |
27 |
+++ /dev/null |
28 |
@@ -1,21 +0,0 @@ |
29 |
-http://bugzilla.xfce.org/show_bug.cgi?id=8229 |
30 |
- |
31 |
-Fix underlinking. See below. Function "floor" and math.h is used in common.c which is part of libdict. |
32 |
- |
33 |
-/path/to/ld: ../lib/.libs/libdict.a(libdict_la-common.o): undefined reference to symbol 'floor@@GLIBC_2.2.5' |
34 |
-/path/to/ld: note: 'floor@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it to the linker command line |
35 |
-/lib/libm.so.6: could not read symbols: Invalid operation |
36 |
-collect2: ld returned 1 exit status |
37 |
- |
38 |
---- lib/Makefile.am |
39 |
-+++ lib/Makefile.am |
40 |
-@@ -34,7 +34,8 @@ |
41 |
- libdict_la_LIBADD = \ |
42 |
- $(LIBXFCE4PANEL_LIBS) \ |
43 |
- $(LIBXFCEGUI4_LIBS) \ |
44 |
-- @GTHREAD_LIBS@ |
45 |
-+ @GTHREAD_LIBS@ \ |
46 |
-+ -lm |
47 |
- |
48 |
- |
49 |
- noinst_DATA = \ |
50 |
|
51 |
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild |
52 |
deleted file mode 100644 |
53 |
index 0ac66d5..0000000 |
54 |
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild |
55 |
+++ /dev/null |
56 |
@@ -1,43 +0,0 @@ |
57 |
-# Copyright 1999-2012 Gentoo Foundation |
58 |
-# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Id$ |
60 |
- |
61 |
-EAPI=5 |
62 |
-EAUTORECONF=yes |
63 |
-inherit multilib xfconf |
64 |
- |
65 |
-DESCRIPTION="A dict.org querying application and panel plug-in for the Xfce desktop" |
66 |
-HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-dict" |
67 |
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" |
68 |
- |
69 |
-LICENSE="GPL-2" |
70 |
-SLOT="0" |
71 |
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" |
72 |
-IUSE="" |
73 |
- |
74 |
-RDEPEND=">=dev-libs/glib-2.24 |
75 |
- >=x11-libs/gtk+-2.20:2 |
76 |
- >=xfce-base/libxfce4util-4.8 |
77 |
- >=xfce-base/libxfcegui4-4.8 |
78 |
- >=xfce-base/xfce4-panel-4.8" |
79 |
-DEPEND="${RDEPEND} |
80 |
- dev-util/intltool |
81 |
- virtual/pkgconfig" |
82 |
- |
83 |
-pkg_setup() { |
84 |
- PATCHES=( "${FILESDIR}"/${P}-underlinking.patch ) |
85 |
- |
86 |
- XFCONF=( |
87 |
- --libexecdir="${EPREFIX}"/usr/$(get_libdir) |
88 |
- ) |
89 |
- |
90 |
- DOCS=( AUTHORS ChangeLog README ) |
91 |
-} |
92 |
- |
93 |
-src_prepare() { |
94 |
- # xfce4-dict.desktop: (will be fatal in the future): value "Dictionary" in key |
95 |
- # "Categories" in group "Desktop Entry" requires another category to be present |
96 |
- # among the following categories: Office;TextTools |
97 |
- sed -i -e '/Categories/s:Office:&;Utility;TextTools:' src/xfce4-dict.desktop.in || die |
98 |
- xfconf_src_prepare |
99 |
-} |