[PR PATCH] syncthing-gtk: restore sane versioning

[PR PATCH] syncthing-gtk: restore sane versioning

[steinex]

[-- Attachment #1: Type: text/plain, Size: 2070 bytes --]

There is a new pull request by steinex against master on the void-packages repository

https://github.com/steinex/void-packages syncthing-gtk
https://github.com/void-linux/void-packages/pull/35586

syncthing-gtk: restore sane versioning
<!-- Uncomment relevant sections and delete options which are not applicable -->

cc @paper42 

#### Testing the changes
- I tested the changes in this PR: **briefly**

The new debian version scheme did throw errors like
```
/usr/lib/python3.10/site-packages/pkg_resources/__init__.py:116: PkgResourcesDeprecationWarning: v0.9.4.4-ds-git20220108-9023143f8b93 is an invalid version and will not be supported in a future release
```

This PR restores the old versioning scheme by adding the the following precautions:
* Users on `0.9.4.4` get upgraded to this version due to revision (last in this scheme was 3)
* Users on `0.9.4.4+ds+git20220108+9023143f8b93` get reverted to the old versioning scheme but on this revision

On top of that I added some `checkdepends` to make the checks succeed atleast to a certain point. I'm totally unsure why this wasn't an issue in the past, did anything change there? However, I'm stuck with the check error as seen on CI. Help appreciated.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->


A patch file from https://github.com/void-linux/void-packages/pull/35586.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-syncthing-gtk-35586.patch --]
[-- Type: text/x-diff, Size: 1746 bytes --]

From 305604adcedbeef0435e961e0d41fd0c6aff90fa Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 13 Feb 2022 15:46:26 +0100
Subject: [PATCH] syncthing-gtk: restore sane versioning

---
 srcpkgs/syncthing-gtk/template | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index 336afea95255..5d370324e6f0 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -1,19 +1,29 @@
 # Template file for 'syncthing-gtk'
 pkgname=syncthing-gtk
 reverts="0.14.36_1"
-version=0.9.4.4+ds+git20220108+9023143f8b93
-revision=2
+reverts="0.9.4.4+ds+git20220108+9023143f8b93_1"
+reverts="0.9.4.4+ds+git20220108+9023143f8b93_2"
+version=0.9.4.4
+revision=4
+_debianver="ds+git20220108+9023143f8b93"
 build_style=python3-module
 hostmakedepends="python3-setuptools gettext"
 depends="syncthing python3-dateutil libnotify librsvg python3-bcrypt
  python3-cairo gtk+3 python3-gobject"
+checkdepends="python3-gobject python3-pip python3-wheel"
 short_desc="GTK based GUI for Syncthing"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/debian/syncthing-gtk/"
-distfiles="${DEBIAN_SITE}/main/s/syncthing-gtk/syncthing-gtk_${version}.orig.tar.xz"
+distfiles="${DEBIAN_SITE}/main/s/syncthing-gtk/syncthing-gtk_${version}+${_debianver}.orig.tar.xz"
 checksum=fc71f390a17b10ea9338a60f7ae813a6d6faa7e881b4b31ff7ea4ffdbbecf7a8
 
+# on check
+# v0.9.4.4-ds-git20220108-9023143f8b93 is an invalid version and will not be supported in a future release
+post_extract() {
+	mv ${XBPS_BUILDDIR}/syncthing* ${wrksrc}
+}
+
 pre_configure() {
 	./generate-locales.sh
 }

Re: [PR REVIEW] syncthing-gtk: restore sane versioning

[paper42]

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35586#discussion_r805416205

Comment:
```suggestion
checkdepends="$depends"
```
and we will need to remove windows.py

Re: [PR REVIEW] syncthing-gtk: restore sane versioning

[paper42]

[-- Attachment #1: Type: text/plain, Size: 258 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35586#discussion_r805416058

Comment:
All versions we want to revert need to be in one `reverts` variable, otherwise only the last one would be used.

Re: [PR PATCH] [Updated] syncthing-gtk: restore sane versioning

[steinex]

[-- Attachment #1: Type: text/plain, Size: 2075 bytes --]

There is an updated pull request by steinex against master on the void-packages repository

https://github.com/steinex/void-packages syncthing-gtk
https://github.com/void-linux/void-packages/pull/35586

syncthing-gtk: restore sane versioning
<!-- Uncomment relevant sections and delete options which are not applicable -->

cc @paper42 

#### Testing the changes
- I tested the changes in this PR: **briefly**

The new debian version scheme did throw errors like
```
/usr/lib/python3.10/site-packages/pkg_resources/__init__.py:116: PkgResourcesDeprecationWarning: v0.9.4.4-ds-git20220108-9023143f8b93 is an invalid version and will not be supported in a future release
```

This PR restores the old versioning scheme by adding the the following precautions:
* Users on `0.9.4.4` get upgraded to this version due to revision (last in this scheme was 3)
* Users on `0.9.4.4+ds+git20220108+9023143f8b93` get reverted to the old versioning scheme but on this revision

On top of that I added some `checkdepends` to make the checks succeed atleast to a certain point. I'm totally unsure why this wasn't an issue in the past, did anything change there? However, I'm stuck with the check error as seen on CI. Help appreciated.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->


A patch file from https://github.com/void-linux/void-packages/pull/35586.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-syncthing-gtk-35586.patch --]
[-- Type: text/x-diff, Size: 1794 bytes --]

From fc99c8c562169ed273638951819288682bedb1f2 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 13 Feb 2022 15:46:26 +0100
Subject: [PATCH] syncthing-gtk: restore sane versioning, fix tests

---
 srcpkgs/syncthing-gtk/template | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index 336afea95255..2a81433988b8 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -1,19 +1,31 @@
 # Template file for 'syncthing-gtk'
 pkgname=syncthing-gtk
-reverts="0.14.36_1"
-version=0.9.4.4+ds+git20220108+9023143f8b93
-revision=2
+reverts="0.14.36_1
+ 0.9.4.4+ds+git20220108+9023143f8b93_1
+ 0.9.4.4+ds+git20220108+9023143f8b93_2"
+version=0.9.4.4
+revision=4
+_debianver="ds+git20220108+9023143f8b93"
 build_style=python3-module
 hostmakedepends="python3-setuptools gettext"
 depends="syncthing python3-dateutil libnotify librsvg python3-bcrypt
  python3-cairo gtk+3 python3-gobject"
+checkdepends="$depends"
 short_desc="GTK based GUI for Syncthing"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/debian/syncthing-gtk/"
-distfiles="${DEBIAN_SITE}/main/s/syncthing-gtk/syncthing-gtk_${version}.orig.tar.xz"
+distfiles="${DEBIAN_SITE}/main/s/syncthing-gtk/syncthing-gtk_${version}+${_debianver}.orig.tar.xz"
 checksum=fc71f390a17b10ea9338a60f7ae813a6d6faa7e881b4b31ff7ea4ffdbbecf7a8
 
+# for checks
+# v0.9.4.4-ds-git20220108-9023143f8b93 is an invalid version and will not be supported in a future release
+# remove windows.py
+post_extract() {
+	mv ${XBPS_BUILDDIR}/syncthing* ${wrksrc}
+	rm ${wrksrc}/syncthing_gtk/windows.py
+}
+
 pre_configure() {
 	./generate-locales.sh
 }

Re: [PR PATCH] [Updated] syncthing-gtk: restore sane versioning, fix tests

[steinex]

[-- Attachment #1: Type: text/plain, Size: 2086 bytes --]

There is an updated pull request by steinex against master on the void-packages repository

https://github.com/steinex/void-packages syncthing-gtk
https://github.com/void-linux/void-packages/pull/35586

syncthing-gtk: restore sane versioning, fix tests
<!-- Uncomment relevant sections and delete options which are not applicable -->

cc @paper42 

#### Testing the changes
- I tested the changes in this PR: **briefly**

The new debian version scheme did throw errors like
```
/usr/lib/python3.10/site-packages/pkg_resources/__init__.py:116: PkgResourcesDeprecationWarning: v0.9.4.4-ds-git20220108-9023143f8b93 is an invalid version and will not be supported in a future release
```

This PR restores the old versioning scheme by adding the the following precautions:
* Users on `0.9.4.4` get upgraded to this version due to revision (last in this scheme was 3)
* Users on `0.9.4.4+ds+git20220108+9023143f8b93` get reverted to the old versioning scheme but on this revision

On top of that I added some `checkdepends` to make the checks succeed atleast to a certain point. I'm totally unsure why this wasn't an issue in the past, did anything change there? However, I'm stuck with the check error as seen on CI. Help appreciated.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->


A patch file from https://github.com/void-linux/void-packages/pull/35586.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-syncthing-gtk-35586.patch --]
[-- Type: text/x-diff, Size: 1788 bytes --]

From b92ac9a29b36d5c474150ec3985a58b51eb2dc0c Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 13 Feb 2022 15:46:26 +0100
Subject: [PATCH] syncthing-gtk: restore sane versioning, fix tests

---
 srcpkgs/syncthing-gtk/template | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index 336afea95255..02cb3d9eeddd 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -1,19 +1,29 @@
 # Template file for 'syncthing-gtk'
 pkgname=syncthing-gtk
-reverts="0.14.36_1"
-version=0.9.4.4+ds+git20220108+9023143f8b93
-revision=2
+reverts="0.14.36_1 0.9.4.4+ds+git20220108+9023143f8b93_1 0.9.4.4+ds+git20220108+9023143f8b93_2"
+version=0.9.4.4
+revision=4
+_debianver="ds+git20220108+9023143f8b93"
 build_style=python3-module
 hostmakedepends="python3-setuptools gettext"
 depends="syncthing python3-dateutil libnotify librsvg python3-bcrypt
  python3-cairo gtk+3 python3-gobject"
+checkdepends="$depends"
 short_desc="GTK based GUI for Syncthing"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/debian/syncthing-gtk/"
-distfiles="${DEBIAN_SITE}/main/s/syncthing-gtk/syncthing-gtk_${version}.orig.tar.xz"
+distfiles="${DEBIAN_SITE}/main/s/syncthing-gtk/syncthing-gtk_${version}+${_debianver}.orig.tar.xz"
 checksum=fc71f390a17b10ea9338a60f7ae813a6d6faa7e881b4b31ff7ea4ffdbbecf7a8
 
+# for checks
+# v0.9.4.4-ds-git20220108-9023143f8b93 is an invalid version and will not be supported in a future release
+# remove windows.py
+post_extract() {
+	mv ${XBPS_BUILDDIR}/syncthing* ${wrksrc}
+	rm ${wrksrc}/syncthing_gtk/windows.py
+}
+
 pre_configure() {
 	./generate-locales.sh
 }

Re: syncthing-gtk: restore sane versioning, fix tests

[steinex]

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New comment by steinex on void-packages repository

https://github.com/void-linux/void-packages/pull/35586#issuecomment-1038981385

Comment:
Thanks for the help. It should be ready for review again now. :)

Re: [PR REVIEW] syncthing-gtk: restore sane versioning, fix tests

[paper42]

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35586#discussion_r806208995

Comment:
```suggestion
reverts="0.14.36_1 0.9.4.4+ds+git20201209+c46fbd8_1 0.9.4.4+ds+git20220108+9023143f8b93_1 0.9.4.4+ds+git20220108+9023143f8b93_2"
```

Re: [PR PATCH] [Updated] syncthing-gtk: restore sane versioning, fix tests

[steinex]

[-- Attachment #1: Type: text/plain, Size: 2086 bytes --]

There is an updated pull request by steinex against master on the void-packages repository

https://github.com/steinex/void-packages syncthing-gtk
https://github.com/void-linux/void-packages/pull/35586

syncthing-gtk: restore sane versioning, fix tests
<!-- Uncomment relevant sections and delete options which are not applicable -->

cc @paper42 

#### Testing the changes
- I tested the changes in this PR: **briefly**

The new debian version scheme did throw errors like
```
/usr/lib/python3.10/site-packages/pkg_resources/__init__.py:116: PkgResourcesDeprecationWarning: v0.9.4.4-ds-git20220108-9023143f8b93 is an invalid version and will not be supported in a future release
```

This PR restores the old versioning scheme by adding the the following precautions:
* Users on `0.9.4.4` get upgraded to this version due to revision (last in this scheme was 3)
* Users on `0.9.4.4+ds+git20220108+9023143f8b93` get reverted to the old versioning scheme but on this revision

On top of that I added some `checkdepends` to make the checks succeed atleast to a certain point. I'm totally unsure why this wasn't an issue in the past, did anything change there? However, I'm stuck with the check error as seen on CI. Help appreciated.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->


A patch file from https://github.com/void-linux/void-packages/pull/35586.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-syncthing-gtk-35586.patch --]
[-- Type: text/x-diff, Size: 1791 bytes --]

From 8924f03a044634853c78c9cb1a36f3cff7d31a0b Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 13 Feb 2022 15:46:26 +0100
Subject: [PATCH] syncthing-gtk: restore sane versioning, fix tests

---
 srcpkgs/syncthing-gtk/template | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index 336afea95255..fe38baae17c1 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -1,19 +1,30 @@
 # Template file for 'syncthing-gtk'
 pkgname=syncthing-gtk
-reverts="0.14.36_1"
-version=0.9.4.4+ds+git20220108+9023143f8b93
-revision=2
+reverts="0.14.36_1 0.9.4.4+ds+git20220108+9023143f8b93_1
+ 0.9.4.4+ds+git20220108+9023143f8b93_2"
+version=0.9.4.4
+revision=4
+_debianver="ds+git20220108+9023143f8b93"
 build_style=python3-module
 hostmakedepends="python3-setuptools gettext"
 depends="syncthing python3-dateutil libnotify librsvg python3-bcrypt
  python3-cairo gtk+3 python3-gobject"
+checkdepends="$depends"
 short_desc="GTK based GUI for Syncthing"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/debian/syncthing-gtk/"
-distfiles="${DEBIAN_SITE}/main/s/syncthing-gtk/syncthing-gtk_${version}.orig.tar.xz"
+distfiles="${DEBIAN_SITE}/main/s/syncthing-gtk/syncthing-gtk_${version}+${_debianver}.orig.tar.xz"
 checksum=fc71f390a17b10ea9338a60f7ae813a6d6faa7e881b4b31ff7ea4ffdbbecf7a8
 
+# for checks
+# v0.9.4.4-ds-git20220108-9023143f8b93 is an invalid version and will not be supported in a future release
+# remove windows.py
+post_extract() {
+	mv ${XBPS_BUILDDIR}/syncthing* ${wrksrc}
+	rm ${wrksrc}/syncthing_gtk/windows.py
+}
+
 pre_configure() {
 	./generate-locales.sh
 }

Re: [PR PATCH] [Merged]: syncthing-gtk: restore sane versioning, fix tests

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1924 bytes --]

There's a merged pull request on the void-packages repository

syncthing-gtk: restore sane versioning, fix tests
https://github.com/void-linux/void-packages/pull/35586

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

cc @paper42 

#### Testing the changes
- I tested the changes in this PR: **briefly**

The new debian version scheme did throw errors like
```
/usr/lib/python3.10/site-packages/pkg_resources/__init__.py:116: PkgResourcesDeprecationWarning: v0.9.4.4-ds-git20220108-9023143f8b93 is an invalid version and will not be supported in a future release
```

This PR restores the old versioning scheme by adding the the following precautions:
* Users on `0.9.4.4` get upgraded to this version due to revision (last in this scheme was 3)
* Users on `0.9.4.4+ds+git20220108+9023143f8b93` get reverted to the old versioning scheme but on this revision

On top of that I added some `checkdepends` to make the checks succeed atleast to a certain point. I'm totally unsure why this wasn't an issue in the past, did anything change there? However, I'm stuck with the check error as seen on CI. Help appreciated.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->