gentoo (leap year) resync : 29.02.2020

3 files changed, 41 insertions, 2 deletions

diff --git a/x11-misc/grsync/Manifest b/x11-misc/grsync/Manifest
index 9004430ada4b..659e2a2e95c8 100644
--- a/x11-misc/grsync/Manifest
+++ b/x11-misc/grsync/Manifest
@@ -1,3 +1,4 @@
+AUX grsync-1.2.6-gcc-10.patch 1497 BLAKE2B 7b75cb46e4f1fa4df69724441e1a67742469a28b17048a98d6eb87377a6e798a6c72138e74f13be995e414faa0058a66e8c8c591b7f302ec6c08e3cc4c9be000 SHA512 83a09c1601fa5655d3ad29414c0f31f93bd3288c0bb099c17ee5432666bc19b05ccc351dc9f345b769e7d55201788682a872ccb5c141a7b68fde806a3ca99695
 DIST grsync-1.2.6.tar.gz 333540 BLAKE2B 20719580309aba5737b74e85629b21b9715ceb8d97bd00d1840a5eda0e04316439d90999b7b787cdf8b368fff90ba489dcfc3b91992dd599f7ae05f4a565f1e7 SHA512 a7aac0cf264c968d50896156730dc0b925045def6e513adf1f2783e19fd1cdd423aa69480963479b95927fb4e863f110f3fc0439661ef7cfcacc7376fe95ff1d
-EBUILD grsync-1.2.6.ebuild 486 BLAKE2B 72ed686223e487c66f634c1ceda754a2f1013612b37257d0caba1562b60139c3dae87f41e8bc0cd670fe018513c8f74507bbb87522f48708b605d9dfbb7ad479 SHA512 e82b9210b749c08510ef6f12c4cbc332c21b3766575e16881be52e7501a9b7965a2563da576958ee7adc1c289826e6183c90e528210ccbbecb0e4f524f2bcede
+EBUILD grsync-1.2.6.ebuild 531 BLAKE2B 189975475dbb3ee82136f7abb13b9b0934ef550eede295136b3ec4d25bda3cf1494d5f24f9e9a715619f6227557ca88cc993f86083d898d9edeeda57077c9795 SHA512 9f2ab15a2ea536f07e4d12f65b7f1640ea791b54704654da9ec1a75bc0ca6178e0d2dbf777a593523f1d38dfc7a737cbd4c8f3c9aecce419ec8f456617fce448
 MISC metadata.xml 258 BLAKE2B 46e283e28202f000bdb3b2b01ac3b3e4aa25a42715e1940135cdcef61181c745865042fe44a908a5d3e83308f7f98f0eff2b8519c0a4691e3bf5637799de420e SHA512 9909d39f5a2a4d3c92d1c105ea5250603f505e9fbb0ff433c25290ac5c2b53f00d96fe8dc0a98bec2240298b3b7060503f59caf04cb47484a63e4057bcce82c6
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
new file mode 100644
index 000000000000..4460f1ac94a5
--- /dev/null
+++ b/x11-misc/grsync/files/grsync-1.2.6-gcc-10.patch
@@ -0,0 +1,36 @@
+diff -Naur grsync-1.2.6.orig/src/callbacks.h grsync-1.2.6/src/callbacks.h
+--- grsync-1.2.6.orig/src/callbacks.h	2013-04-30 13:48:54.000000000 +0200
++++ grsync-1.2.6/src/callbacks.h	2020-02-27 11:34:50.861824303 +0100
+@@ -7,11 +7,11 @@
+ #define ICON_PACKAGE PACKAGE_DATA_DIR "/" ICON_SOURCE
+ #define ICON_PACKAGE_BUSY PACKAGE_DATA_DIR "/" ICON_SOURCE_BUSY
+ 
+-GtkBuilder *builder;
+-GtkWidget *main_window;
+-gchar *argv_session, *argv_filename, *icon, *icon_busy;
+-gboolean cmdline_session, cmdline_execute, cmdline_stayopen, cmdline_import;
+-GtkListStore *liststore_session;
++extern GtkBuilder *builder;
++extern GtkWidget *main_window;
++extern gchar *argv_session, *argv_filename, *icon, *icon_busy;
++extern gboolean cmdline_session, cmdline_execute, cmdline_stayopen, cmdline_import;
++extern GtkListStore *liststore_session;
+ 
+ void save_settings(gchar *session, gchar *filename);
+ gboolean load_groups(gchar *session);
+diff -Naur grsync-1.2.6.orig/src/main.c grsync-1.2.6/src/main.c
+--- grsync-1.2.6.orig/src/main.c	2013-04-30 13:48:54.000000000 +0200
++++ grsync-1.2.6/src/main.c	2020-02-27 11:35:08.548834429 +0100
+@@ -10,6 +10,12 @@
+ #	include <libosso.h>
+ #endif
+ 
++GtkBuilder *builder;
++GtkWidget *main_window;
++gchar *argv_session, *argv_filename, *icon, *icon_busy;
++gboolean cmdline_session, cmdline_execute, cmdline_stayopen, cmdline_import;
++GtkListStore *liststore_session;
++
+ int main (int argc, char *argv[]) {
+ #ifdef ENABLE_NLS
+ 	bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
diff --git a/x11-misc/grsync/grsync-1.2.6.ebuild b/x11-misc/grsync/grsync-1.2.6.ebuild
index 4115d15bc3b3..53875ffebdac 100644
--- a/x11-misc/grsync/grsync-1.2.6.ebuild
+++ b/x11-misc/grsync/grsync-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,8 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS NEWS README"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
+
 src_configure() {
 	econf --disable-unity
 }