Update to 1.3.0

5 files changed, 28 insertions, 39 deletions

diff --git a/net/grsync/Makefile b/net/grsync/Makefile
index cfabf25146d2..bc4a7f08a574 100644
--- a/net/grsync/Makefile
+++ b/net/grsync/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grsync
-PORTVERSION=	1.2.8
+PORTVERSION=	1.3.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.opbyte.it/release/ \
 		LOCAL/martymac
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 
 USES=		desktop-file-utils gettext gmake gnome \
 		pkgconfig shared-mime-info shebangfix
-USE_GNOME=	cairo gtk20 intltool
+USE_GNOME=	cairo gtk30 intltool
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-unity
diff --git a/net/grsync/distinfo b/net/grsync/distinfo
index f2a4d216af07..6a006d6f1d61 100644
--- a/net/grsync/distinfo
+++ b/net/grsync/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599161587
-SHA256 (grsync-1.2.8.tar.gz) = 94ea5faca67e3df467b5283377af3cb32b2b47631b6a32d38bc7b371209306b1
-SIZE (grsync-1.2.8.tar.gz) = 352885
+TIMESTAMP = 1606340196
+SHA256 (grsync-1.3.0.tar.gz) = b7c7c6a62e05302d8317c38741e7d71ef9ab4639ee5bff2622a383b2043a35fc
+SIZE (grsync-1.3.0.tar.gz) = 304725
diff --git a/net/grsync/files/patch-src-callbacks.c b/net/grsync/files/patch-src-callbacks.c
new file mode 100644
index 000000000000..4ca6cfd293e8
--- /dev/null
+++ b/net/grsync/files/patch-src-callbacks.c
@@ -0,0 +1,23 @@
+Avoid using nested functions to fix build on LLVM
+
+--- src/callbacks.c.orig	2020-11-23 13:52:42 UTC
++++ src/callbacks.c
+@@ -40,12 +40,13 @@ GtkTreeModelFilter *filter = NULL;
+ gboolean more = FALSE, first = TRUE;
+ 
+ 
+-void dialog_set_labels_selectable(GtkWidget *dialog) {
+-	void _set_label_selectable(gpointer data, gpointer user_data) {
+-		GtkWidget *widget = GTK_WIDGET(data);
+-		if (GTK_IS_LABEL(widget)) gtk_label_set_selectable(GTK_LABEL(widget), TRUE);
+-	}
++void _set_label_selectable(gpointer data, gpointer user_data) {
++	GtkWidget *widget = GTK_WIDGET(data);
++	if (GTK_IS_LABEL(widget)) gtk_label_set_selectable(GTK_LABEL(widget), TRUE);
++}
+ 
++
++void dialog_set_labels_selectable(GtkWidget *dialog) {
+ 	GtkWidget *area = gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog));
+ 	GtkContainer *box = (GtkContainer *) area;
+ 	GList *children = gtk_container_get_children(box);
diff --git a/net/grsync/files/patch-src-callbacks.h b/net/grsync/files/patch-src-callbacks.h
deleted file mode 100644
index 1fe5a64accbb..000000000000
--- a/net/grsync/files/patch-src-callbacks.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/callbacks.h.orig	2013-04-30 11:48:54 UTC
-+++ src/callbacks.h
-@@ -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 --git a/net/grsync/files/patch-src-main.c b/net/grsync/files/patch-src-main.c
deleted file mode 100644
index e94ee7407c9e..000000000000
--- a/net/grsync/files/patch-src-main.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/main.c.orig	2013-04-30 11:48:54 UTC
-+++ src/main.c
-@@ -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);