Date: Fri, 4 Sep 2020 10:51:08 +0000 (UTC) From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547528 - in head/net/grsync: . files Message-ID: <202009041051.084Ap84L017548@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: martymac Date: Fri Sep 4 10:51:08 2020 New Revision: 547528 URL: https://svnweb.freebsd.org/changeset/ports/547528 Log: Update to 1.2.8 and fix build with llvm11 (duplicate symbol errors) Added: head/net/grsync/files/patch-src-callbacks.h (contents, props changed) head/net/grsync/files/patch-src-main.c (contents, props changed) Modified: head/net/grsync/Makefile head/net/grsync/distinfo head/net/grsync/files/patch-po-Makefile.in.in head/net/grsync/pkg-plist Modified: head/net/grsync/Makefile ============================================================================== --- head/net/grsync/Makefile Fri Sep 4 10:46:05 2020 (r547527) +++ head/net/grsync/Makefile Fri Sep 4 10:51:08 2020 (r547528) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= grsync -PORTVERSION= 1.2.6 +PORTVERSION= 1.2.8 CATEGORIES= net MASTER_SITES= http://www.opbyte.it/release/ \ LOCAL/martymac @@ -14,15 +14,18 @@ LICENSE= GPLv2 RUN_DEPENDS= rsync:net/rsync \ bash:shells/bash +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 +USES= desktop-file-utils gettext gmake gnome \ + pkgconfig shared-mime-info shebangfix +USE_GNOME= cairo gtk20 intltool + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-unity CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USES= desktop-file-utils gettext gmake gnome \ - pkgconfig shared-mime-info shebangfix -USE_GNOME= gtk20 intltool SHEBANG_FILES= src/grsync-batch INSTALLS_ICONS= yes Modified: head/net/grsync/distinfo ============================================================================== --- head/net/grsync/distinfo Fri Sep 4 10:46:05 2020 (r547527) +++ head/net/grsync/distinfo Fri Sep 4 10:51:08 2020 (r547528) @@ -1,2 +1,3 @@ -SHA256 (grsync-1.2.6.tar.gz) = 66d5acea5e6767d6ed2082e1c6e250fe809cb1e797cbbee5c8e8a2d28a895619 -SIZE (grsync-1.2.6.tar.gz) = 333540 +TIMESTAMP = 1599161587 +SHA256 (grsync-1.2.8.tar.gz) = 94ea5faca67e3df467b5283377af3cb32b2b47631b6a32d38bc7b371209306b1 +SIZE (grsync-1.2.8.tar.gz) = 352885 Modified: head/net/grsync/files/patch-po-Makefile.in.in ============================================================================== --- head/net/grsync/files/patch-po-Makefile.in.in Fri Sep 4 10:46:05 2020 (r547527) +++ head/net/grsync/files/patch-po-Makefile.in.in Fri Sep 4 10:51:08 2020 (r547528) @@ -1,6 +1,6 @@ ---- po/Makefile.in.in.orig 2008-12-08 11:44:27.794971692 +0100 -+++ po/Makefile.in.in 2008-12-08 11:44:42.679745595 +0100 -@@ -34,7 +34,7 @@ +--- po/Makefile.in.in.orig 2013-04-30 11:48:54 UTC ++++ po/Makefile.in.in +@@ -34,7 +34,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ DATADIRNAME = @DATADIRNAME@ Added: head/net/grsync/files/patch-src-callbacks.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/grsync/files/patch-src-callbacks.h Fri Sep 4 10:51:08 2020 (r547528) @@ -0,0 +1,19 @@ +--- 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); Added: head/net/grsync/files/patch-src-main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/grsync/files/patch-src-main.c Fri Sep 4 10:51:08 2020 (r547528) @@ -0,0 +1,15 @@ +--- 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); Modified: head/net/grsync/pkg-plist ============================================================================== --- head/net/grsync/pkg-plist Fri Sep 4 10:46:05 2020 (r547527) +++ head/net/grsync/pkg-plist Fri Sep 4 10:51:08 2020 (r547528) @@ -11,6 +11,7 @@ share/pixmaps/grsync.png %%NLS%%share/locale/ca_ES/LC_MESSAGES/grsync.mo %%NLS%%share/locale/cs_CZ/LC_MESSAGES/grsync.mo %%NLS%%share/locale/de_DE/LC_MESSAGES/grsync.mo +%%NLS%%share/locale/el_GR/LC_MESSAGES/grsync.mo %%NLS%%share/locale/es_ES/LC_MESSAGES/grsync.mo %%NLS%%share/locale/fr_FR/LC_MESSAGES/grsync.mo %%NLS%%share/locale/gl_ES/LC_MESSAGES/grsync.mo @@ -21,6 +22,7 @@ share/pixmaps/grsync.png %%NLS%%share/locale/nb_NO/LC_MESSAGES/grsync.mo %%NLS%%share/locale/nl_NL/LC_MESSAGES/grsync.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/grsync.mo +%%NLS%%share/locale/pt_PT/LC_MESSAGES/grsync.mo %%NLS%%share/locale/ru_RU/LC_MESSAGES/grsync.mo %%NLS%%share/locale/sv_SE/LC_MESSAGES/grsync.mo %%NLS%%share/locale/tr_TR/LC_MESSAGES/grsync.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009041051.084Ap84L017548>