pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/syncthing-gtk
Module Name: pkgsrc
Committed By: wiz
Date: Thu Nov 16 12:16:04 UTC 2023
Modified Files:
pkgsrc/net/syncthing-gtk: Makefile PLIST distinfo
pkgsrc/net/syncthing-gtk/patches: patch-setup.py
Log Message:
syncthing-gtk: update to 0.9.4.5.
Switch to a maintained fork.
Changes:
This is the first version of Syncthing-GTK maintained by a new team
at https://github.com/syncthing-gtk.
Changes:
Port to Python3. Python2 is not supported anymore.
Miscelaneous fixes about icons
Miscelaneous fixes about app indicators on KDE, Gnome.
Translation updates
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/syncthing-gtk/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/syncthing-gtk/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/syncthing-gtk/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/syncthing-gtk/patches/patch-setup.py
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.39 pkgsrc/net/syncthing-gtk/Makefile:1.40
--- pkgsrc/net/syncthing-gtk/Makefile:1.39 Tue Nov 14 14:02:41 2023
+++ pkgsrc/net/syncthing-gtk/Makefile Thu Nov 16 12:16:04 2023
@@ -1,28 +1,30 @@
-# $NetBSD: Makefile,v 1.39 2023/11/14 14:02:41 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2023/11/16 12:16:04 wiz Exp $
-DISTNAME= syncthing-gtk-0.9.4.4
-PKGREVISION= 15
+DISTNAME= syncthing-gtk-0.9.4.5
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_GITHUB:=kozec/}
-GITHUB_TAG= v${PKGVERSION_NOREV}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=syncthing-gtk/}
+GITHUB_TAG= ${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://github.com/syncthing/syncthing-gtk
+HOMEPAGE= https://github.com/syncthing-gtk/syncthing-gtk
COMMENT= GTK3 & Python based GUI for Syncthing
LICENSE= gnu-gpl-v2
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
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+= glib-networking-[0-9]*:../../net/glib-networking
+DEPENDS+= psmisc-[0-9]*:../../sysutils/psmisc
+DEPENDS+= ${PYPKGPREFIX}-bcrypt-[0-9]*:../../security/py-bcrypt
DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
-DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject32
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-PYTHON_VERSIONS_ACCEPTED= 27
-
-EGG_NAME= ${DISTNAME:S/0/v0/:S/-/_/}
+PYTHON_VERSIONS_INCOMPATIBLE= 27
REPLACE_PYTHON+= *.py scripts/*.py syncthing_gtk/*.py
+INSTALLATION_DIRS+= ${PKGMANDIR}/man1
+
SUBST_CLASSES+= path_s
SUBST_STAGE.path_s= pre-build
SUBST_MESSAGE.path_s= Fixing hard-coded paths to /usr/share
@@ -43,18 +45,15 @@ SUBST_SED.path_b= -e 's|/usr/bin/%s|${PR
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}|'
+post-install:
+ cd ${DESTDIR}${PREFIX} && ${MV} share/man/man1/* ${PKGMANDIR}/man1
BUILDLINK_API_DEPENDS.libnotify+= libnotify>=0.7.8
.include "../../sysutils/libnotify/buildlink3.mk"
BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.42.2 # for introspection
.include "../../graphics/librsvg/buildlink3.mk"
.include "../../lang/python/application.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/syncthing-gtk/PLIST
diff -u pkgsrc/net/syncthing-gtk/PLIST:1.7 pkgsrc/net/syncthing-gtk/PLIST:1.8
--- pkgsrc/net/syncthing-gtk/PLIST:1.7 Fri Jan 14 15:01:36 2022
+++ pkgsrc/net/syncthing-gtk/PLIST Thu Nov 16 12:16:04 2023
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 2022/01/14 15:01:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2023/11/16 12:16:04 wiz Exp $
bin/syncthing-gtk
-${PYSITELIB}/${EGG_INFODIR}
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
${PYSITELIB}/syncthing_gtk/__init__.py
${PYSITELIB}/syncthing_gtk/__init__.pyc
${PYSITELIB}/syncthing_gtk/__init__.pyo
@@ -40,6 +44,9 @@ ${PYSITELIB}/syncthing_gtk/finddaemondia
${PYSITELIB}/syncthing_gtk/foldereditor.py
${PYSITELIB}/syncthing_gtk/foldereditor.pyc
${PYSITELIB}/syncthing_gtk/foldereditor.pyo
+${PYSITELIB}/syncthing_gtk/http.py
+${PYSITELIB}/syncthing_gtk/http.pyc
+${PYSITELIB}/syncthing_gtk/http.pyo
${PYSITELIB}/syncthing_gtk/iddialog.py
${PYSITELIB}/syncthing_gtk/iddialog.pyc
${PYSITELIB}/syncthing_gtk/iddialog.pyo
@@ -233,21 +240,6 @@ share/icons/hicolor/64x64/emblems/emblem
share/icons/hicolor/64x64/emblems/emblem-syncthing-error.png
share/icons/hicolor/64x64/emblems/emblem-syncthing-offline.png
share/icons/hicolor/64x64/emblems/emblem-syncthing.png
-share/locale/cs/LC_MESSAGES/syncthing-gtk.mo
-share/locale/de/LC_MESSAGES/syncthing-gtk.mo
-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_CN/LC_MESSAGES/syncthing-gtk.mo
share/metainfo/me.kozec.syncthingtk.appdata.xml
share/pixmaps/syncthing-gtk.png
share/syncthing-gtk/about.glade
Index: pkgsrc/net/syncthing-gtk/distinfo
diff -u pkgsrc/net/syncthing-gtk/distinfo:1.8 pkgsrc/net/syncthing-gtk/distinfo:1.9
--- pkgsrc/net/syncthing-gtk/distinfo:1.8 Tue Oct 26 11:06:59 2021
+++ pkgsrc/net/syncthing-gtk/distinfo Thu Nov 16 12:16:04 2023
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:06:59 nia Exp $
+$NetBSD: distinfo,v 1.9 2023/11/16 12:16:04 wiz Exp $
-BLAKE2s (syncthing-gtk-0.9.4.4.tar.gz) = 7e258f2088faa9356bd1128316b823e74428c814341c499484ae076ce0217024
-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
+BLAKE2s (syncthing-gtk-0.9.4.5.tar.gz) = 577b8d287d6f60e6499cc2bd0f015b792128d637ff5b7fe969e65bab96a1f8de
+SHA512 (syncthing-gtk-0.9.4.5.tar.gz) = 25d3c111651c02a5d6d281ae04710b3c54f50d944cc1a72d3d94493e897b9bd432ae2e6dc782d7f0c17b12b3ba86ff30f8654bd46161a3a832d14e8c86c9cba7
+Size (syncthing-gtk-0.9.4.5.tar.gz) = 755007 bytes
+SHA1 (patch-setup.py) = 4d71f7aec015176f7ef56ac358245d326a0cc737
Index: pkgsrc/net/syncthing-gtk/patches/patch-setup.py
diff -u pkgsrc/net/syncthing-gtk/patches/patch-setup.py:1.2 pkgsrc/net/syncthing-gtk/patches/patch-setup.py:1.3
--- pkgsrc/net/syncthing-gtk/patches/patch-setup.py:1.2 Thu Sep 1 17:30:21 2016
+++ pkgsrc/net/syncthing-gtk/patches/patch-setup.py Thu Nov 16 12:16:04 2023
@@ -1,30 +1,15 @@
-$NetBSD: patch-setup.py,v 1.2 2016/09/01 17:30:21 wiz Exp $
+$NetBSD: patch-setup.py,v 1.3 2023/11/16 12:16:04 wiz Exp $
-Avoid calling git.
-Install man page in proper directory for pkgsrc.
+Accept a missing git binary.
---- setup.py.orig 2016-08-29 04:05:55.000000000 +0000
+--- setup.py.orig 2023-11-16 12:08:01.063349216 +0000
+++ setup.py
-@@ -12,13 +12,6 @@ def get_version():
- Returns current package version using git-describe or examining
- path. If both methods fails, returns 'unknown'.
- """
-- try:
-- p = Popen(['git', 'describe', '--tags', '--match', 'v*'], stdout=PIPE)
-- version = p.communicate()[0].strip("\n\r \t")
-- if p.returncode != 0:
-- raise Exception("git-describe failed")
-- return version
-- except: pass
- # Git-describe method failed, try to guess from working directory name
- path = os.getcwd().split(os.path.sep)
- version = 'unknown'
-@@ -82,7 +75,7 @@ if __name__ == "__main__" :
- "icons/%s.png" % x for x in (
- 'restart', 'settings', 'shutdown', "st-gtk-logo"
- )]),
-- ('share/man/man1', glob.glob("doc/*") ),
-+ (os.environ['PKGMANDIR'] + '/man1', glob.glob("doc/*") ),
- ('share/icons/hicolor/64x64/emblems', glob.glob("icons/emblem-*.png") ),
- ('share/pixmaps', ["icons/syncthing-gtk.png"]),
- ('share/applications', ['syncthing-gtk.desktop'] ),
+@@ -19,7 +19,7 @@ def get_version():
+ try:
+ version = subprocess.check_output(["git", "describe", "--tags"])
+ version = version.decode("utf-8").strip("\n\r \t")
+- except subprocess.CalledProcessError:
++ except (subprocess.CalledProcessError, FileNotFoundError):
+ # Git-describe method failed, try to guess from working directory name
+ project_dir_name = Path(__file__).parent.name
+ result = re.match(r"syncthing-gtk-(.*)", project_dir_name)
Home |
Main Index |
Thread Index |
Old Index