1 |
commit: ac40df4823d30e3be6a5a39a5908ad2852f9e041 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 27 10:38:18 2020 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 27 10:44:03 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac40df48 |
7 |
|
8 |
x11-misc/grsync: fix build with -fno-common |
9 |
|
10 |
Closes: https://bugs.gentoo.org/710874 |
11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
13 |
|
14 |
x11-misc/grsync/files/grsync-1.2.6-gcc-10.patch | 36 +++++++++++++++++++++++++ |
15 |
x11-misc/grsync/grsync-1.2.6.ebuild | 4 ++- |
16 |
2 files changed, 39 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/x11-misc/grsync/files/grsync-1.2.6-gcc-10.patch b/x11-misc/grsync/files/grsync-1.2.6-gcc-10.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..4460f1ac94a |
21 |
--- /dev/null |
22 |
+++ b/x11-misc/grsync/files/grsync-1.2.6-gcc-10.patch |
23 |
@@ -0,0 +1,36 @@ |
24 |
+diff -Naur grsync-1.2.6.orig/src/callbacks.h grsync-1.2.6/src/callbacks.h |
25 |
+--- grsync-1.2.6.orig/src/callbacks.h 2013-04-30 13:48:54.000000000 +0200 |
26 |
++++ grsync-1.2.6/src/callbacks.h 2020-02-27 11:34:50.861824303 +0100 |
27 |
+@@ -7,11 +7,11 @@ |
28 |
+ #define ICON_PACKAGE PACKAGE_DATA_DIR "/" ICON_SOURCE |
29 |
+ #define ICON_PACKAGE_BUSY PACKAGE_DATA_DIR "/" ICON_SOURCE_BUSY |
30 |
+ |
31 |
+-GtkBuilder *builder; |
32 |
+-GtkWidget *main_window; |
33 |
+-gchar *argv_session, *argv_filename, *icon, *icon_busy; |
34 |
+-gboolean cmdline_session, cmdline_execute, cmdline_stayopen, cmdline_import; |
35 |
+-GtkListStore *liststore_session; |
36 |
++extern GtkBuilder *builder; |
37 |
++extern GtkWidget *main_window; |
38 |
++extern gchar *argv_session, *argv_filename, *icon, *icon_busy; |
39 |
++extern gboolean cmdline_session, cmdline_execute, cmdline_stayopen, cmdline_import; |
40 |
++extern GtkListStore *liststore_session; |
41 |
+ |
42 |
+ void save_settings(gchar *session, gchar *filename); |
43 |
+ gboolean load_groups(gchar *session); |
44 |
+diff -Naur grsync-1.2.6.orig/src/main.c grsync-1.2.6/src/main.c |
45 |
+--- grsync-1.2.6.orig/src/main.c 2013-04-30 13:48:54.000000000 +0200 |
46 |
++++ grsync-1.2.6/src/main.c 2020-02-27 11:35:08.548834429 +0100 |
47 |
+@@ -10,6 +10,12 @@ |
48 |
+ # include <libosso.h> |
49 |
+ #endif |
50 |
+ |
51 |
++GtkBuilder *builder; |
52 |
++GtkWidget *main_window; |
53 |
++gchar *argv_session, *argv_filename, *icon, *icon_busy; |
54 |
++gboolean cmdline_session, cmdline_execute, cmdline_stayopen, cmdline_import; |
55 |
++GtkListStore *liststore_session; |
56 |
++ |
57 |
+ int main (int argc, char *argv[]) { |
58 |
+ #ifdef ENABLE_NLS |
59 |
+ bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); |
60 |
|
61 |
diff --git a/x11-misc/grsync/grsync-1.2.6.ebuild b/x11-misc/grsync/grsync-1.2.6.ebuild |
62 |
index 4115d15bc3b..53875ffebda 100644 |
63 |
--- a/x11-misc/grsync/grsync-1.2.6.ebuild |
64 |
+++ b/x11-misc/grsync/grsync-1.2.6.ebuild |
65 |
@@ -1,4 +1,4 @@ |
66 |
-# Copyright 1999-2019 Gentoo Authors |
67 |
+# Copyright 1999-2020 Gentoo Authors |
68 |
# Distributed under the terms of the GNU General Public License v2 |
69 |
|
70 |
EAPI=6 |
71 |
@@ -19,6 +19,8 @@ DEPEND="${RDEPEND} |
72 |
|
73 |
DOCS="AUTHORS NEWS README" |
74 |
|
75 |
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch ) |
76 |
+ |
77 |
src_configure() { |
78 |
econf --disable-unity |
79 |
} |