* Re: [PR PATCH] [Updated] syncthing-gtk: switch to debian python3 fork
2021-11-07 18:34 [PR PATCH] syncthing-gtk: switch to debian python3 fork paper42
@ 2021-11-07 18:39 ` paper42
2021-11-07 18:40 ` paper42
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2021-11-07 18:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages syncthing-gtk-py3
https://github.com/void-linux/void-packages/pull/33943
syncthing-gtk: switch to debian python3 fork
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
@steinex
A patch file from https://github.com/void-linux/void-packages/pull/33943.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-syncthing-gtk-py3-33943.patch --]
[-- Type: text/x-diff, Size: 4335 bytes --]
From 57c0082cfe02f2a7abe400b907734bd608c886bf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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, 11 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index 90e9f21cf4ae..38189e94395b 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -2,14 +2,16 @@
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"
+_ver=$version+ds+git20201209+c46fbd8-1
+wrksrc="$pkgname-debian-$_ver"
+revision=4
+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 <steinex@nognu.de>"
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="https://salsa.debian.org/debian/syncthing-gtk/-/archive/debian/$_ver/syncthing-gtk-debian-$_ver.tar.gz"
+checksum=dd0787b9aab697387a37cc11995b168e97719f4179406e4c4ed3db10006ee577
From f1ba2849cd3083e5668760ef236ccf22b9943b46 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <al3hex@gmail.com>"
-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 <al3hex@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/pyca/bcrypt"
+distfiles="${PYPI_SITE}/b/bcrypt/bcrypt-${version}.tar.gz"
+checksum=5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] syncthing-gtk: switch to debian python3 fork
2021-11-07 18:34 [PR PATCH] syncthing-gtk: switch to debian python3 fork paper42
2021-11-07 18:39 ` [PR PATCH] [Updated] " paper42
@ 2021-11-07 18:40 ` paper42
2021-11-08 1:02 ` [PR REVIEW] " sgn
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2021-11-07 18:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages syncthing-gtk-py3
https://github.com/void-linux/void-packages/pull/33943
syncthing-gtk: switch to debian python3 fork
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
@steinex
A patch file from https://github.com/void-linux/void-packages/pull/33943.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-syncthing-gtk-py3-33943.patch --]
[-- Type: text/x-diff, Size: 4335 bytes --]
From dfbb548c6a6df73d5a0caf75237c632d1e054227 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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, 11 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index 90e9f21cf4ae..5ea4dcac9d34 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -2,14 +2,16 @@
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"
+revision=4
+_ver=$version+ds+git20201209+c46fbd8-1
+wrksrc="$pkgname-debian-$_ver"
+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 <steinex@nognu.de>"
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="https://salsa.debian.org/debian/syncthing-gtk/-/archive/debian/$_ver/syncthing-gtk-debian-$_ver.tar.gz"
+checksum=dd0787b9aab697387a37cc11995b168e97719f4179406e4c4ed3db10006ee577
From 97df2d79a4f75a31b2ddf9b96f3313bc6577549d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <al3hex@gmail.com>"
-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 <al3hex@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/pyca/bcrypt"
+distfiles="${PYPI_SITE}/b/bcrypt/bcrypt-${version}.tar.gz"
+checksum=5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR REVIEW] syncthing-gtk: switch to debian python3 fork
2021-11-07 18:34 [PR PATCH] syncthing-gtk: switch to debian python3 fork paper42
2021-11-07 18:39 ` [PR PATCH] [Updated] " paper42
2021-11-07 18:40 ` paper42
@ 2021-11-08 1:02 ` sgn
2021-11-12 1:04 ` [PR PATCH] [Updated] " paper42
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2021-11-08 1:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 302 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/33943#discussion_r744347835
Comment:
```suggestion
distfiles="$DEBIAN_SITE/main/s/syncthing-gtk/syncthing-gtk_${version}.orig.tar.xz"
```
With version change to `0.9.4.4+ds+git20201209+c46fbd8`
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] syncthing-gtk: switch to debian python3 fork
2021-11-07 18:34 [PR PATCH] syncthing-gtk: switch to debian python3 fork paper42
` (2 preceding siblings ...)
2021-11-08 1:02 ` [PR REVIEW] " sgn
@ 2021-11-12 1:04 ` paper42
2021-11-12 1:09 ` paper42
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2021-11-12 1:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages syncthing-gtk-py3
https://github.com/void-linux/void-packages/pull/33943
syncthing-gtk: switch to debian python3 fork
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
@steinex
A patch file from https://github.com/void-linux/void-packages/pull/33943.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-syncthing-gtk-py3-33943.patch --]
[-- Type: text/x-diff, Size: 4293 bytes --]
From e4de89badd16e3185cb34db312c079f154b1f7f9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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, 11 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index 90e9f21cf4ae..a2a544b1527a 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -2,14 +2,16 @@
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"
+revision=4
+_ver=$version+ds+git20201209+c46fbd8
+wrksrc="$pkgname-$_ver"
+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 <steinex@nognu.de>"
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_${_ver}.orig.tar.xz"
+checksum=850ac6fb937e71827b23011f5a7783110d982cd072a3e48810b266a904a853fb
From 922fccb43c2a2f0f1cdfb5927a7cc2885c3d1de2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <al3hex@gmail.com>"
-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 <al3hex@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/pyca/bcrypt"
+distfiles="${PYPI_SITE}/b/bcrypt/bcrypt-${version}.tar.gz"
+checksum=5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] syncthing-gtk: switch to debian python3 fork
2021-11-07 18:34 [PR PATCH] syncthing-gtk: switch to debian python3 fork paper42
` (3 preceding siblings ...)
2021-11-12 1:04 ` [PR PATCH] [Updated] " paper42
@ 2021-11-12 1:09 ` paper42
2021-11-12 1:09 ` [PR REVIEW] " paper42
2021-11-13 19:45 ` [PR PATCH] [Merged]: " paper42
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2021-11-12 1:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages syncthing-gtk-py3
https://github.com/void-linux/void-packages/pull/33943
syncthing-gtk: switch to debian python3 fork
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
@steinex
A patch file from https://github.com/void-linux/void-packages/pull/33943.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-syncthing-gtk-py3-33943.patch --]
[-- Type: text/x-diff, Size: 4311 bytes --]
From 345427b328f7ba9d856d86b7653b09cfd0de1398 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <steinex@nognu.de>"
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 <michal@vasilek.cz>
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 <al3hex@gmail.com>"
-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 <al3hex@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/pyca/bcrypt"
+distfiles="${PYPI_SITE}/b/bcrypt/bcrypt-${version}.tar.gz"
+checksum=5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR REVIEW] syncthing-gtk: switch to debian python3 fork
2021-11-07 18:34 [PR PATCH] syncthing-gtk: switch to debian python3 fork paper42
` (4 preceding siblings ...)
2021-11-12 1:09 ` paper42
@ 2021-11-12 1:09 ` paper42
2021-11-13 19:45 ` [PR PATCH] [Merged]: " paper42
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2021-11-12 1:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 486 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/33943#discussion_r747913813
Comment:
The version change is a bit ugly:
```
shellcheck update 0.7.2_2 0.8.0_1 2712KB
soundtouch update 2.2_1 2.3.1_1 81KB
syncthing-gtk update 0.9.4.4_4 0.9.4.4+ds+git20201209+c46fbd8_1 -
vscode update 1.62.0_1 1.62.1_1 19MB
```
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Merged]: syncthing-gtk: switch to debian python3 fork
2021-11-07 18:34 [PR PATCH] syncthing-gtk: switch to debian python3 fork paper42
` (5 preceding siblings ...)
2021-11-12 1:09 ` [PR REVIEW] " paper42
@ 2021-11-13 19:45 ` paper42
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2021-11-13 19:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1465 bytes --]
There's a merged pull request on the void-packages repository
syncthing-gtk: switch to debian python3 fork
https://github.com/void-linux/void-packages/pull/33943
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
@steinex
^ permalink raw reply [flat|nested] 8+ messages in thread