CVS commit: pkgsrc/net/syncthing-gtk

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/syncthing-gtk
From: Frédéric Fauberteau <triaxx%netbsd.org@localhost>
Date: Fri, 16 Apr 2021 11:39:24 +0000

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Apr 16 11:39:24 UTC 2021

Modified Files:
        pkgsrc/net/syncthing-gtk: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/syncthing-gtk/patches:
            patch-locale_fr_LC__MESSAGES_syncthing-gtk.po

Log Message:
syncthing-gtk: Update to 0.9.4.4

pkgsrc changes:
---------------
  * Change the GitHub master site.
  * Temporarily add a patch to fix typos since the pull requests have not
    been yet merged and the development seems to be paused. The patch
    can be deleted if a new version is released upstream.
  * Add dependency to net/glib-networking to enable HTTPS communication
    with the daemon (GIO GnuTLS support).
upstream changes:
-----------------
No changelog is provided. The list of commits is at:
https://github.com/kozec/syncthing-gtk/commits/v0.9.4.4


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/syncthing-gtk/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/syncthing-gtk/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/syncthing-gtk/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/syncthing-gtk/patches/patch-locale_fr_LC__MESSAGES_syncthing-gtk.po

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/syncthing-gtk/Makefile
diff -u pkgsrc/net/syncthing-gtk/Makefile:1.22 pkgsrc/net/syncthing-gtk/Makefile:1.23
--- pkgsrc/net/syncthing-gtk/Makefile:1.22      Thu Nov  5 09:08:56 2020
+++ pkgsrc/net/syncthing-gtk/Makefile   Fri Apr 16 11:39:24 2021
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2020/11/05 09:08:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.23 2021/04/16 11:39:24 triaxx Exp $
 
-DISTNAME=      syncthing-gtk-0.9.2.3
-PKGREVISION=   15
+DISTNAME=      syncthing-gtk-0.9.4.4
 CATEGORIES=    net
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=syncthing/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=kozec/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -12,6 +11,7 @@ COMMENT=      GTK3 & Python based GUI for Syn
 LICENSE=       gnu-gpl-v2
 
 DEPENDS+=      syncthing>=0.13.0:../../net/syncthing
+DEPENDS+=      glib-networking-[0-9]*:../../net/glib-networking # GIO GnuTLS support
 DEPENDS+=      psmisc-[0-9]*:../../sysutils/psmisc # for killall
 DEPENDS+=      ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
@@ -28,19 +28,28 @@ SUBST_FILES.path_s= scripts/syncthing-gt
 SUBST_FILES.path_s+=   syncthing_gtk/app.py
 SUBST_FILES.path_s+=   syncthing_gtk/uisettingsdialog.py
 SUBST_FILES.path_s+=   syncthing_gtk/wizard.py
-SUBST_SED.path_s=      -e 's|/usr/share/syncthing-gtk|${PREFIX}/share/syncthing-gtk|'
+SUBST_SED.path_s=      -e 's|/usr/share/icons|${PREFIX}/share/icons|'
+SUBST_SED.path_s+=     -e 's|/usr/share/syncthing-gtk|${PREFIX}/share/syncthing-gtk|'
 
 SUBST_CLASSES+=                path_b
 SUBST_STAGE.path_b=    pre-build
 SUBST_MESSAGE.path_b=  Fixing hard-coded paths to /usr/bin
-SUBST_FILES.path_b=    syncthing-gtk.desktop
+SUBST_FILES.path_b=    syncthing_gtk/app.py
 SUBST_FILES.path_b+=   syncthing_gtk/configuration.py
-SUBST_SED.path_b=      -e 's|/usr/bin/syncthing|${PREFIX}/bin/syncthing|'
-# \todo Extend to /usr/bin for command paths in app.py
+SUBST_FILES.path_b+=   syncthing_gtk/uisettingsdialog.py
+SUBST_SED.path_b=      -e 's|/usr/bin/%s|${PREFIX}/bin/%s|'
+SUBST_SED.path_b+=     -e 's|/usr/bin/syncthing|${PREFIX}/bin/syncthing|'
+SUBST_SED.path_b+=     -e 's|"/usr/bin"|"${PREFIX}/bin"|'
+
+SUBST_CLASSES+=                int
+SUBST_STAGE.int=       pre-build
+SUBST_MESSAGE.int=     Replacing hard-coded python interpreter
+SUBST_FILES.int=       syncthing_gtk/tools.py
+SUBST_SED.int=         -e 's|/usr/bin/env python2|${PYTHONBIN}|'
 
-BUILDLINK_ABI_DEPENDS.libnotify+=      libnotify>=0.7.6nb4
+BUILDLINK_API_DEPENDS.libnotify+=      libnotify>=0.7.8
 .include "../../sysutils/libnotify/buildlink3.mk"
-BUILDLINK_API_DEPENDS.librsvg+=        librsvg>=2.40.9nb2      # for introspection
+BUILDLINK_API_DEPENDS.librsvg+=        librsvg>=2.42.2         # for introspection
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"

Index: pkgsrc/net/syncthing-gtk/PLIST
diff -u pkgsrc/net/syncthing-gtk/PLIST:1.4 pkgsrc/net/syncthing-gtk/PLIST:1.5
--- pkgsrc/net/syncthing-gtk/PLIST:1.4  Mon Oct 31 16:35:24 2016
+++ pkgsrc/net/syncthing-gtk/PLIST      Fri Apr 16 11:39:24 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2016/10/31 16:35:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/04/16 11:39:24 triaxx Exp $
 bin/syncthing-gtk
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/syncthing_gtk/__init__.py
@@ -79,9 +79,6 @@ ${PYSITELIB}/syncthing_gtk/uibuilder.pyo
 ${PYSITELIB}/syncthing_gtk/uisettingsdialog.py
 ${PYSITELIB}/syncthing_gtk/uisettingsdialog.pyc
 ${PYSITELIB}/syncthing_gtk/uisettingsdialog.pyo
-${PYSITELIB}/syncthing_gtk/watcher.py
-${PYSITELIB}/syncthing_gtk/watcher.pyc
-${PYSITELIB}/syncthing_gtk/watcher.pyo
 ${PYSITELIB}/syncthing_gtk/windows.py
 ${PYSITELIB}/syncthing_gtk/windows.pyc
 ${PYSITELIB}/syncthing_gtk/windows.pyo
@@ -118,8 +115,10 @@ share/icons/hicolor/16x16/status/si-sync
 share/icons/hicolor/16x16/status/si-syncthing-black-9.png
 share/icons/hicolor/16x16/status/si-syncthing-black-idle.png
 share/icons/hicolor/16x16/status/si-syncthing-black-unknown.png
+share/icons/hicolor/16x16/status/si-syncthing-black-warning.png
 share/icons/hicolor/16x16/status/si-syncthing-idle.png
 share/icons/hicolor/16x16/status/si-syncthing-unknown.png
+share/icons/hicolor/16x16/status/si-syncthing-warning.png
 share/icons/hicolor/16x16/status/si-syncthing-white-0.png
 share/icons/hicolor/16x16/status/si-syncthing-white-1.png
 share/icons/hicolor/16x16/status/si-syncthing-white-10.png
@@ -134,6 +133,7 @@ share/icons/hicolor/16x16/status/si-sync
 share/icons/hicolor/16x16/status/si-syncthing-white-9.png
 share/icons/hicolor/16x16/status/si-syncthing-white-idle.png
 share/icons/hicolor/16x16/status/si-syncthing-white-unknown.png
+share/icons/hicolor/16x16/status/si-syncthing-white-warning.png
 share/icons/hicolor/24x24/apps/syncthing-gtk.png
 share/icons/hicolor/24x24/status/si-syncthing-0.png
 share/icons/hicolor/24x24/status/si-syncthing-1.png
@@ -161,8 +161,10 @@ share/icons/hicolor/24x24/status/si-sync
 share/icons/hicolor/24x24/status/si-syncthing-black-9.png
 share/icons/hicolor/24x24/status/si-syncthing-black-idle.png
 share/icons/hicolor/24x24/status/si-syncthing-black-unknown.png
+share/icons/hicolor/24x24/status/si-syncthing-black-warning.png
 share/icons/hicolor/24x24/status/si-syncthing-idle.png
 share/icons/hicolor/24x24/status/si-syncthing-unknown.png
+share/icons/hicolor/24x24/status/si-syncthing-warning.png
 share/icons/hicolor/24x24/status/si-syncthing-white-0.png
 share/icons/hicolor/24x24/status/si-syncthing-white-1.png
 share/icons/hicolor/24x24/status/si-syncthing-white-10.png
@@ -177,6 +179,7 @@ share/icons/hicolor/24x24/status/si-sync
 share/icons/hicolor/24x24/status/si-syncthing-white-9.png
 share/icons/hicolor/24x24/status/si-syncthing-white-idle.png
 share/icons/hicolor/24x24/status/si-syncthing-white-unknown.png
+share/icons/hicolor/24x24/status/si-syncthing-white-warning.png
 share/icons/hicolor/256x256/apps/syncthing-gtk.png
 share/icons/hicolor/32x32/apps/syncthing-gtk.png
 share/icons/hicolor/32x32/status/si-syncthing-0.png
@@ -205,8 +208,10 @@ share/icons/hicolor/32x32/status/si-sync
 share/icons/hicolor/32x32/status/si-syncthing-black-9.png
 share/icons/hicolor/32x32/status/si-syncthing-black-idle.png
 share/icons/hicolor/32x32/status/si-syncthing-black-unknown.png
+share/icons/hicolor/32x32/status/si-syncthing-black-warning.png
 share/icons/hicolor/32x32/status/si-syncthing-idle.png
 share/icons/hicolor/32x32/status/si-syncthing-unknown.png
+share/icons/hicolor/32x32/status/si-syncthing-warning.png
 share/icons/hicolor/32x32/status/si-syncthing-white-0.png
 share/icons/hicolor/32x32/status/si-syncthing-white-1.png
 share/icons/hicolor/32x32/status/si-syncthing-white-10.png
@@ -221,6 +226,7 @@ share/icons/hicolor/32x32/status/si-sync
 share/icons/hicolor/32x32/status/si-syncthing-white-9.png
 share/icons/hicolor/32x32/status/si-syncthing-white-idle.png
 share/icons/hicolor/32x32/status/si-syncthing-white-unknown.png
+share/icons/hicolor/32x32/status/si-syncthing-white-warning.png
 share/icons/hicolor/64x64/apps/syncthing-gtk-error.png
 share/icons/hicolor/64x64/apps/syncthing-gtk.png
 share/icons/hicolor/64x64/emblems/emblem-syncthing-active.png
@@ -232,12 +238,17 @@ share/locale/de/LC_MESSAGES/syncthing-gt
 share/locale/en/LC_MESSAGES/syncthing-gtk.mo
 share/locale/es/LC_MESSAGES/syncthing-gtk.mo
 share/locale/fr/LC_MESSAGES/syncthing-gtk.mo
+share/locale/hu/LC_MESSAGES/syncthing-gtk.mo
+share/locale/it/LC_MESSAGES/syncthing-gtk.mo
 share/locale/lt/LC_MESSAGES/syncthing-gtk.mo
+share/locale/nl/LC_MESSAGES/syncthing-gtk.mo
+share/locale/pl/LC_MESSAGES/syncthing-gtk.mo
 share/locale/pt/LC_MESSAGES/syncthing-gtk.mo
 share/locale/ru/LC_MESSAGES/syncthing-gtk.mo
 share/locale/sk/LC_MESSAGES/syncthing-gtk.mo
 share/locale/vi/LC_MESSAGES/syncthing-gtk.mo
-share/locale/zh/LC_MESSAGES/syncthing-gtk.mo
+share/locale/zh_CN/LC_MESSAGES/syncthing-gtk.mo
+share/metainfo/me.kozec.syncthingtk.appdata.xml
 share/pixmaps/syncthing-gtk.png
 share/syncthing-gtk/about.glade
 share/syncthing-gtk/app.glade

Index: pkgsrc/net/syncthing-gtk/distinfo
diff -u pkgsrc/net/syncthing-gtk/distinfo:1.5 pkgsrc/net/syncthing-gtk/distinfo:1.6
--- pkgsrc/net/syncthing-gtk/distinfo:1.5       Mon Oct 31 16:35:24 2016
+++ pkgsrc/net/syncthing-gtk/distinfo   Fri Apr 16 11:39:24 2021
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2016/10/31 16:35:24 wiz Exp $
+$NetBSD: distinfo,v 1.6 2021/04/16 11:39:24 triaxx Exp $
 
-SHA1 (syncthing-gtk-0.9.2.3.tar.gz) = e33dd72b5d13b47779e51419b7c63beae7a09e20
-RMD160 (syncthing-gtk-0.9.2.3.tar.gz) = bb6540740d0500765b75029304dcb4439c9c8de8
-SHA512 (syncthing-gtk-0.9.2.3.tar.gz) = 02cc8331e0978a21221aa9bd9787cdaf56886e8af8fd6b4a6295f92e148a62e99a4ebc4317deabafaccdd83422ef5023d1dc7ce55db1912363189bffff4d9a80
-Size (syncthing-gtk-0.9.2.3.tar.gz) = 794978 bytes
+SHA1 (syncthing-gtk-0.9.4.4.tar.gz) = e41858ca7644d2640c3d999db91fd3c03bb4da78
+RMD160 (syncthing-gtk-0.9.4.4.tar.gz) = 795ac4f258351bec1e8b480651ad74fc30329af2
+SHA512 (syncthing-gtk-0.9.4.4.tar.gz) = 71b9d96116e1f395d70059eba24fcb8df237c4f0e3027fca332013467fed318f88b26250aa3da5c23f73fa9cfce004c28b7a3a2d6f2fc6e4f424aac9661f3502
+Size (syncthing-gtk-0.9.4.4.tar.gz) = 887762 bytes
+SHA1 (patch-locale_fr_LC__MESSAGES_syncthing-gtk.po) = 15200a08aec16a502ae233097d0ed18083dda771
 SHA1 (patch-setup.py) = c7487b2b196dfbc97b25780c391234db7aa2fc15

Added files:

Index: pkgsrc/net/syncthing-gtk/patches/patch-locale_fr_LC__MESSAGES_syncthing-gtk.po
diff -u /dev/null pkgsrc/net/syncthing-gtk/patches/patch-locale_fr_LC__MESSAGES_syncthing-gtk.po:1.1
--- /dev/null   Fri Apr 16 11:39:24 2021
+++ pkgsrc/net/syncthing-gtk/patches/patch-locale_fr_LC__MESSAGES_syncthing-gtk.po      Fri Apr 16 11:39:24 2021
@@ -0,0 +1,45 @@
+$NetBSD: patch-locale_fr_LC__MESSAGES_syncthing-gtk.po,v 1.1 2021/04/16 11:39:24 triaxx Exp $
+
+The following minor fixes should be merged upstream but the development seems
+to be paused:
+* https://github.com/kozec/syncthing-gtk/pull/562
+* https://github.com/kozec/syncthing-gtk/pull/562
+
+--- locale/fr/LC_MESSAGES/syncthing-gtk.po.orig        2019-08-04 19:19:39.000000000 +0000
++++ locale/fr/LC_MESSAGES/syncthing-gtk.po
+@@ -208,7 +208,7 @@ msgstr "Débit sortant"
+ 
+ #: syncthing_gtk/app.py:836
+ msgid "Announce Server"
+-msgstr "Annoncer le serveur"
++msgstr "Serveur d'annonce"
+ 
+ #: syncthing_gtk/app.py:837 syncthing_gtk/app.py:1356
+ msgid "Version"
+@@ -1504,7 +1504,7 @@ msgstr "Priorité du processus démon"
+ msgid ""
+ "Priority will be used only if \"<i>start daemon in background</i>\" option "
+ "is checked on \"<i>Interface</i>\" page."
+-msgstr "Cette priorité sera utilisée si l'option \"<i>démarrrer en arrière-plan</i>\" a été choisie à la page \"Interface\"."
++msgstr "Cette priorité sera utilisée si l'option \"<i>démarrer en arrière-plan</i>\" a été choisie à la page \"Interface\"."
+ 
+ #: ui-settings.glade:713
+ msgid "Maximum number of CPU cores"
+@@ -1515,7 +1515,7 @@ msgid ""
+ "Sets the maximum number of CPU cores for daemon to use. This value will be "
+ "used only if \"<i>start daemon in background</i>\" option is checked on "
+ "\"<i>Interface</i>\" page."
+-msgstr "Nombre max. de processeurs utilisés par le démon. Cette valeur sera utilisée si l'option \"<i>démarrrer en arrière-plan</i>\" a été choisie à la page \"Interface\"."
++msgstr "Nombre max. de processeurs utilisés par le démon. Cette valeur sera utilisée si l'option \"<i>démarrer en arrière-plan</i>\" a été choisie à la page \"Interface\"."
+ 
+ #: ui-settings.glade:786
+ msgid "Daemon"
+@@ -1526,7 +1526,7 @@ msgid ""
+ "This binary will be started when syncthing daemon is not running and "
+ "\"<i>start daemon in background</i>\" option is checked on "
+ "\"<i>Interface</i>\" page."
+-msgstr "Cet exécutable sera démarré si le démon syncthing ne l'est pas déjà et si l'option \"<i>démarrrer en arrière-plan</i>\" a été choisie à la page \"Interface\"."
++msgstr "Cet exécutable sera démarré si le démon syncthing ne l'est pas déjà et si l'option \"<i>démarrer en arrière-plan</i>\" a été choisie à la page \"Interface\"."
+ 
+ #: ui-settings.glade:838
+ msgid "Syncthing binary location"

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index