1 |
commit: 21c3d9ba810ae35fe90b7a5c5ba0ebdb6b502f70 |
2 |
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jun 29 21:38:48 2020 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 28 17:46:40 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c3d9ba |
7 |
|
8 |
app-misc/rox-filer: fix compilation with GCC10 |
9 |
|
10 |
Updated ebuild to EAPI7, fixed compilation with -fno-common. |
11 |
Closes: https://bugs.gentoo.org/710330 |
12 |
Package-Manager: Portage-2.3.99, Repoman-2.3.23 |
13 |
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> |
14 |
Closes: https://github.com/gentoo/gentoo/pull/16499 |
15 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
16 |
|
17 |
.../rox-filer/files/rox-filer-2.11-gcc10.patch | 27 ++++++++++++++++++++++ |
18 |
app-misc/rox-filer/metadata.xml | 1 + |
19 |
app-misc/rox-filer/rox-filer-2.11.ebuild | 26 ++++++++++++--------- |
20 |
3 files changed, 43 insertions(+), 11 deletions(-) |
21 |
|
22 |
diff --git a/app-misc/rox-filer/files/rox-filer-2.11-gcc10.patch b/app-misc/rox-filer/files/rox-filer-2.11-gcc10.patch |
23 |
new file mode 100644 |
24 |
index 00000000000..d969757eb7d |
25 |
--- /dev/null |
26 |
+++ b/app-misc/rox-filer/files/rox-filer-2.11-gcc10.patch |
27 |
@@ -0,0 +1,27 @@ |
28 |
+From 86b0bb9144186d51ea9b898905111bd8b143b552 Mon Sep 17 00:00:00 2001 |
29 |
+From: "Azamat H. Hackimov" <azamat.hackimov@×××××.com> |
30 |
+Date: Tue, 30 Jun 2020 00:22:06 +0300 |
31 |
+Subject: [PATCH] Fix compilation with GCC10 |
32 |
+ |
33 |
+Fixed compilation when -fno-common enabled (in GCC10 by default). See |
34 |
+https://bugs.gentoo.org/710330. |
35 |
+--- |
36 |
+ ROX-Filer/src/session.h | 2 +- |
37 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
38 |
+ |
39 |
+diff --git a/session.h b/session.h |
40 |
+index 7734996a..31341bc4 100644 |
41 |
+--- a/session.h |
42 |
++++ b/session.h |
43 |
+@@ -10,7 +10,7 @@ |
44 |
+ #include <gtk/gtk.h> |
45 |
+ #include <X11/SM/SMlib.h> |
46 |
+ |
47 |
+-gboolean session_auto_respawn; |
48 |
++extern gboolean session_auto_respawn; |
49 |
+ |
50 |
+ void session_init(const gchar *client_id); |
51 |
+ |
52 |
+-- |
53 |
+2.26.2 |
54 |
+ |
55 |
|
56 |
diff --git a/app-misc/rox-filer/metadata.xml b/app-misc/rox-filer/metadata.xml |
57 |
index 65dec56d638..740d871edf3 100644 |
58 |
--- a/app-misc/rox-filer/metadata.xml |
59 |
+++ b/app-misc/rox-filer/metadata.xml |
60 |
@@ -16,6 +16,7 @@ |
61 |
</maintainer> |
62 |
<bugs-to>http://rox.sourceforge.net/desktop/lists</bugs-to> |
63 |
<remote-id type="sourceforge">rox</remote-id> |
64 |
+ <remote-id type="github">rox-desktop/rox-filer</remote-id> |
65 |
</upstream> |
66 |
<longdescription lang="en"> |
67 |
ROX-Filer is a fast and powerful graphical file manager for the |
68 |
|
69 |
diff --git a/app-misc/rox-filer/rox-filer-2.11.ebuild b/app-misc/rox-filer/rox-filer-2.11.ebuild |
70 |
index 6b9abf2b53d..966f2750cf9 100644 |
71 |
--- a/app-misc/rox-filer/rox-filer-2.11.ebuild |
72 |
+++ b/app-misc/rox-filer/rox-filer-2.11.ebuild |
73 |
@@ -1,18 +1,17 @@ |
74 |
-# Copyright 1999-2019 Gentoo Authors |
75 |
+# Copyright 1999-2020 Gentoo Authors |
76 |
# Distributed under the terms of the GNU General Public License v2 |
77 |
|
78 |
-EAPI=5 |
79 |
+EAPI=7 |
80 |
|
81 |
-inherit desktop epatch virtualx |
82 |
+inherit desktop virtualx |
83 |
|
84 |
DESCRIPTION="ROX-Filer a drag and drop spatial file manager" |
85 |
-HOMEPAGE="http://rox.sourceforge.net/desktop" |
86 |
-SRC_URI="mirror://sourceforge/rox/${P}.tar.bz2" |
87 |
+HOMEPAGE="http://rox.sourceforge.net/desktop/ROX-Filer.html" |
88 |
+SRC_URI="https://download.sourceforge.net/rox/${P}.tar.bz2" |
89 |
|
90 |
-LICENSE="GPL-2 LGPL-2" |
91 |
+LICENSE="GPL-2+ LGPL-2+" |
92 |
SLOT="0" |
93 |
KEYWORDS="amd64 ~arm x86" |
94 |
-IUSE="" |
95 |
|
96 |
COMMON_DEPEND="dev-lang/perl |
97 |
dev-libs/libxml2:2 |
98 |
@@ -22,13 +21,18 @@ RDEPEND="${COMMON_DEPEND} |
99 |
x11-misc/shared-mime-info" |
100 |
DEPEND="${COMMON_DEPEND} |
101 |
dev-util/intltool |
102 |
- sys-devel/gettext |
103 |
- virtual/pkgconfig" |
104 |
+ sys-devel/gettext" |
105 |
+BDEPEND="virtual/pkgconfig" |
106 |
|
107 |
-S="${WORKDIR}/${P}"/ROX-Filer/src |
108 |
+S="${WORKDIR}/${P}/ROX-Filer/src" |
109 |
+ |
110 |
+PATCHES=( |
111 |
+ "${FILESDIR}/${P}-in-source-build.patch" |
112 |
+ "${FILESDIR}/${P}-gcc10.patch" |
113 |
+) |
114 |
|
115 |
src_prepare() { |
116 |
- epatch "${FILESDIR}/${P}-in-source-build.patch" |
117 |
+ default |
118 |
|
119 |
sed -i -e 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":' \ |
120 |
main.c || die "sed failed" |