From 345427b328f7ba9d856d86b7653b09cfd0de1398 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 7 Nov 2021 19:27:44 +0100 Subject: [PATCH 1/2] syncthing-gtk: switch to debian python3 fork --- srcpkgs/syncthing-gtk/template | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template index 90e9f21cf4ae..39a9076bc82e 100644 --- a/srcpkgs/syncthing-gtk/template +++ b/srcpkgs/syncthing-gtk/template @@ -1,15 +1,15 @@ # Template file for 'syncthing-gtk' pkgname=syncthing-gtk reverts="0.14.36_1" -version=0.9.4.4 -revision=3 -build_style=python2-module -hostmakedepends="python-setuptools" -depends="syncthing python-dateutil libnotify librsvg python-bcrypt - python-cairo gtk+3 python-gobject" -short_desc="GTK3 and python based GUI for Syncthing" +version=0.9.4.4+ds+git20201209+c46fbd8 +revision=1 +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="syncthing python3-dateutil libnotify librsvg python3-bcrypt + python3-cairo gtk+3 python3-gobject" +short_desc="GTK based GUI for Syncthing" maintainer="Frank Steinborn " license="GPL-2.0-or-later" -homepage="https://github.com/syncthing/syncthing-gtk" -distfiles="https://github.com/syncthing/syncthing-gtk/archive/v${version}.tar.gz" -checksum=896ddaaba4ad0b8f090c5a381a28b3da759932314562cdd50ca288543b03ddcc +homepage="https://salsa.debian.org/debian/syncthing-gtk/" +distfiles="${DEBIAN_SITE}/main/s/syncthing-gtk/syncthing-gtk_${version}.orig.tar.xz" +checksum=850ac6fb937e71827b23011f5a7783110d982cd072a3e48810b266a904a853fb From c35d53e8c9d2ab6ff5bdf88f7502f98a7b7dcda7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 7 Nov 2021 19:38:56 +0100 Subject: [PATCH 2/2] python-bcrypt: drop package --- srcpkgs/python-bcrypt/template | 25 ------------------------- srcpkgs/python3-bcrypt | 1 - srcpkgs/python3-bcrypt/template | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/python-bcrypt/template delete mode 120000 srcpkgs/python3-bcrypt create mode 100644 srcpkgs/python3-bcrypt/template diff --git a/srcpkgs/python-bcrypt/template b/srcpkgs/python-bcrypt/template deleted file mode 100644 index fdb27f491892..000000000000 --- a/srcpkgs/python-bcrypt/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'python-bcrypt' -pkgname=python-bcrypt -version=3.2.0 -revision=2 -wrksrc="bcrypt-${version}" -build_style=python-module -pycompile_module="bcrypt" -hostmakedepends="python-setuptools python3-setuptools python-cffi python3-cffi" -makedepends="python-devel python3-devel python-cffi python3-cffi" -depends="python-cffi python-six" -short_desc="Modern password hashing for software and servers (Python2)" -maintainer="Alessio Sergi " -license="Apache-2.0" -homepage="https://github.com/pyca/bcrypt" -distfiles="${PYPI_SITE}/b/bcrypt/bcrypt-${version}.tar.gz" -checksum=5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29 - -python3-bcrypt_package() { - pycompile_module="bcrypt" - depends="python3-cffi python3-six" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/lib/python3* - } -} diff --git a/srcpkgs/python3-bcrypt b/srcpkgs/python3-bcrypt deleted file mode 120000 index 37f57fe961e8..000000000000 --- a/srcpkgs/python3-bcrypt +++ /dev/null @@ -1 +0,0 @@ -python-bcrypt \ No newline at end of file diff --git a/srcpkgs/python3-bcrypt/template b/srcpkgs/python3-bcrypt/template new file mode 100644 index 000000000000..6f70ab52044d --- /dev/null +++ b/srcpkgs/python3-bcrypt/template @@ -0,0 +1,16 @@ +# Template file for 'python3-bcrypt' +pkgname=python3-bcrypt +version=3.2.0 +revision=3 +wrksrc="bcrypt-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools python3-cffi" +makedepends="python3-devel" +depends="python3-cffi python3-six" +checkdepends="python3-pytest $depends" +short_desc="Modern password hashing for software and servers" +maintainer="Alessio Sergi " +license="Apache-2.0" +homepage="https://github.com/pyca/bcrypt" +distfiles="${PYPI_SITE}/b/bcrypt/bcrypt-${version}.tar.gz" +checksum=5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29