* [PR PATCH] backintime: update to 1.4.1.
@ 2023-12-22 23:28 thetredev
2023-12-22 23:38 ` Duncaen
` (45 more replies)
0 siblings, 46 replies; 47+ messages in thread
From: thetredev @ 2023-12-22 23:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1301 bytes --]
There is a new pull request by thetredev against master on the void-packages repository
https://github.com/thetredev/void-packages update-package/backintime
https://github.com/void-linux/void-packages/pull/47880
backintime: update to 1.4.1.
#### Testing the changes
- I tested the changes in this PR: **YES**. The Qt GUI launches and I can setup backup targets.
#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`
#### Questions to maintainers
- The package revision has been reset to `1`, because the minor version changed to `4`. Please tell me if this is correct.
- The function `backintime-qt_package()` has been split into `backintime_package()` and `backintime-qt_package()`. Please tell me if this is correct or if there is a better way to do this. The reason for the split is that `common` and `qt` require different files/folders to be moved compared to the previous version 1.3.1.
#### Further Notes
- The patch `srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch` has been deleted because it is included in backintime 1.4.1 (see https://github.com/bit-team/backintime/commit/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3).
A patch file from https://github.com/void-linux/void-packages/pull/47880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-package/backintime-47880.patch --]
[-- Type: text/x-diff, Size: 4617 bytes --]
From ff73fa2a6324c3e55889af21b992f0ecc334afb3 Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Fri, 22 Dec 2023 22:14:30 +0100
Subject: [PATCH] backintime: update to 1.4.1.
Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
...23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch | 51 -------------------
srcpkgs/backintime/template | 32 ++++++++----
2 files changed, 21 insertions(+), 62 deletions(-)
delete mode 100644 srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
diff --git a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch b/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
deleted file mode 100644
index e6a871e962d39..0000000000000
--- a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3 Mon Sep 17 00:00:00 2001
-From: Germar Reitze <germar.reitze@gmail.com>
-Date: Mon, 5 Jul 2021 19:11:58 +0200
-Subject: [PATCH] Tests no longer work with Python 3.10 (fixes: #1175)
-
----
- CHANGES | 5 ++++-
- common/tools.py | 7 +++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CHANGES b/CHANGES
-index c01501f2..0eb5b489 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -1,7 +1,10 @@
- Back In Time
-
-+Version 1.3.2
-+* Fix bug: Tests no longer work with Python 3.10 (https://github.com/bit-team/backintime/issues/1175)
-+
- Version 1.3.1
--* bump version, forgot to push branch to Github before releasing
-+* bump version, forgot to push branch to Github before releasing
-
- Version 1.3.0
- * Merge PR: Fix FileNotFoundError exception in mount.mounted, Thanks tatokis (https://github.com/bit-team/backintime/pull/1157)
-diff --git a/common/tools.py b/common/tools.py
-index 528da707..12645224 100644
---- a/common/tools.py
-+++ b/common/tools.py
-@@ -25,7 +25,10 @@
- import errno
- import gzip
- import tempfile
--import collections
-+try:
-+ from collections.abc import MutableSet
-+except ImportError:
-+ from collections import MutableSet
- import hashlib
- import ipaddress
- import atexit
-@@ -1802,7 +1805,7 @@ def reset(self, path):
- self.history = [path,]
- self.index = 0
-
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(MutableSet):
- """
- OrderedSet from Python recipe
- http://code.activestate.com/recipes/576694/
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index 4550ddabf8b08..8d2bf2e3efc9f 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,17 +1,17 @@
# Template file for 'backintime'
pkgname=backintime
-version=1.3.1
-revision=3
+version=1.4.1
+revision=1
configure_args="--python3"
pycompile_dirs="/usr/share/backintime"
hostmakedepends="gettext python3"
-depends="python3 rsync python3-dbus python3-keyring"
+depends="python3 rsync python3-dbus python3-keyring python3-packaging libnotify xdpyinfo"
short_desc="Simple backup tool for Linux"
maintainer="Alpicoid <alpicoid@tuta.io>"
license="GPL-2.0-or-later"
homepage="https://github.com/bit-team/backintime"
-distfiles="https://github.com/bit-team/backintime/releases/download/${version}/backintime-${version}.tar.gz"
-checksum=4ffbca4f92c16a7f1c6ce2df17ea88ca13ebf70a2771286e3eebacdce3a2a44e
+distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
+checksum=bc758022fbb3ef14177a258c1292adc60ff4efee93129d147eab724faed9e21e
python_version=3
do_configure() {
@@ -35,10 +35,24 @@ do_install() {
make install DESTDIR=$DESTDIR
}
+backintime_package() {
+ pkg_install() {
+ vmove etc/xdg/autostart
+ vmove "usr/bin/backintime*"
+ vmove usr/share/backintime
+ vmove usr/share/bash-completion/completions/backintime
+ vmove usr/share/doc/backintime-common
+ vmove usr/share/doc/qt
+ vmove usr/share/icons
+ vmove usr/share/locale
+ vmove "usr/share/man/man1/backintime*"
+ vmove usr/share/polkit-1
+ }
+}
+
backintime-qt_package() {
short_desc+=" - Qt GUI"
- depends="backintime-${version}_${revision}
- python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
+ depends="backintime-${version}_${revision} python3-PyQt5 python3-PyQt5-dbus"
pkg_install() {
vmove etc/dbus-1
vmove "usr/bin/backintime-qt*"
@@ -47,9 +61,5 @@ backintime-qt_package() {
vmove usr/share/bash-completion/completions/backintime-qt
vmove usr/share/dbus-1
vmove usr/share/doc/backintime-qt
- vmove usr/share/doc/qt
- vmove usr/share/icons
- vmove "usr/share/man/man1/backintime-qt*"
- vmove usr/share/polkit-1
}
}
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
@ 2023-12-22 23:38 ` Duncaen
2023-12-22 23:47 ` thetredev
` (44 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: Duncaen @ 2023-12-22 23:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 474 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#issuecomment-1868131539
Comment:
`backintime_package` defines a sub package by the main package name. The files are already in the package `backintime`, `backintime-qt` moves them out of it. If you want to keep the files in `backintime` they simply don't get moved, no need to define `backintime_package`. Not sure what files you actually want to move where though.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
2023-12-22 23:38 ` Duncaen
@ 2023-12-22 23:47 ` thetredev
2023-12-23 0:01 ` [PR PATCH] [Updated] " thetredev
` (43 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-22 23:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
New comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#issuecomment-1868134334
Comment:
Gotcha thanks. I'll try to remove `backintime_package` and see how it goes.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR PATCH] [Updated] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
2023-12-22 23:38 ` Duncaen
2023-12-22 23:47 ` thetredev
@ 2023-12-23 0:01 ` thetredev
2023-12-23 0:01 ` thetredev
` (42 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1400 bytes --]
There is an updated pull request by thetredev against master on the void-packages repository
https://github.com/thetredev/void-packages update-package/backintime
https://github.com/void-linux/void-packages/pull/47880
backintime: update to 1.4.1.
#### Testing the changes
- I tested the changes in this PR: **YES**. The Qt GUI launches and I can setup backup targets. The CLI runs and doesn't complain, but I don't know how to use it so I assume it's fine also.
#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`
#### Questions to maintainers
- The package revision has been reset to `1`, because the minor version changed to `4`. Please tell me if this is correct.
- The function `backintime-qt_package()` has been split into `backintime_package()` and `backintime-qt_package()`. Please tell me if this is correct or if there is a better way to do this. The reason for the split is that `common` and `qt` require different files/folders to be moved compared to the previous version 1.3.1.
#### Further Notes
- The patch `srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch` has been deleted because it is included in backintime 1.4.1 (see https://github.com/bit-team/backintime/commit/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3).
A patch file from https://github.com/void-linux/void-packages/pull/47880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-package/backintime-47880.patch --]
[-- Type: text/x-diff, Size: 4189 bytes --]
From bc9336954c3a3dafc637ef317e1b2e9a51f3f63e Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Fri, 22 Dec 2023 22:14:30 +0100
Subject: [PATCH] backintime: update to 1.4.1.
Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
...23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch | 51 -------------------
srcpkgs/backintime/template | 17 +++----
2 files changed, 6 insertions(+), 62 deletions(-)
delete mode 100644 srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
diff --git a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch b/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
deleted file mode 100644
index e6a871e962d39..0000000000000
--- a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3 Mon Sep 17 00:00:00 2001
-From: Germar Reitze <germar.reitze@gmail.com>
-Date: Mon, 5 Jul 2021 19:11:58 +0200
-Subject: [PATCH] Tests no longer work with Python 3.10 (fixes: #1175)
-
----
- CHANGES | 5 ++++-
- common/tools.py | 7 +++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CHANGES b/CHANGES
-index c01501f2..0eb5b489 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -1,7 +1,10 @@
- Back In Time
-
-+Version 1.3.2
-+* Fix bug: Tests no longer work with Python 3.10 (https://github.com/bit-team/backintime/issues/1175)
-+
- Version 1.3.1
--* bump version, forgot to push branch to Github before releasing
-+* bump version, forgot to push branch to Github before releasing
-
- Version 1.3.0
- * Merge PR: Fix FileNotFoundError exception in mount.mounted, Thanks tatokis (https://github.com/bit-team/backintime/pull/1157)
-diff --git a/common/tools.py b/common/tools.py
-index 528da707..12645224 100644
---- a/common/tools.py
-+++ b/common/tools.py
-@@ -25,7 +25,10 @@
- import errno
- import gzip
- import tempfile
--import collections
-+try:
-+ from collections.abc import MutableSet
-+except ImportError:
-+ from collections import MutableSet
- import hashlib
- import ipaddress
- import atexit
-@@ -1802,7 +1805,7 @@ def reset(self, path):
- self.history = [path,]
- self.index = 0
-
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(MutableSet):
- """
- OrderedSet from Python recipe
- http://code.activestate.com/recipes/576694/
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index 4550ddabf8b08..289d7419f93a2 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,17 +1,17 @@
# Template file for 'backintime'
pkgname=backintime
-version=1.3.1
-revision=3
+version=1.4.1
+revision=1
configure_args="--python3"
pycompile_dirs="/usr/share/backintime"
hostmakedepends="gettext python3"
-depends="python3 rsync python3-dbus python3-keyring"
+depends="python3 rsync python3-dbus python3-keyring python3-packaging libnotify xdpyinfo"
short_desc="Simple backup tool for Linux"
maintainer="Alpicoid <alpicoid@tuta.io>"
license="GPL-2.0-or-later"
homepage="https://github.com/bit-team/backintime"
-distfiles="https://github.com/bit-team/backintime/releases/download/${version}/backintime-${version}.tar.gz"
-checksum=4ffbca4f92c16a7f1c6ce2df17ea88ca13ebf70a2771286e3eebacdce3a2a44e
+distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
+checksum=bc758022fbb3ef14177a258c1292adc60ff4efee93129d147eab724faed9e21e
python_version=3
do_configure() {
@@ -37,8 +37,7 @@ do_install() {
backintime-qt_package() {
short_desc+=" - Qt GUI"
- depends="backintime-${version}_${revision}
- python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
+ depends="backintime-${version}_${revision} python3-PyQt5 python3-PyQt5-dbus"
pkg_install() {
vmove etc/dbus-1
vmove "usr/bin/backintime-qt*"
@@ -47,9 +46,5 @@ backintime-qt_package() {
vmove usr/share/bash-completion/completions/backintime-qt
vmove usr/share/dbus-1
vmove usr/share/doc/backintime-qt
- vmove usr/share/doc/qt
- vmove usr/share/icons
- vmove "usr/share/man/man1/backintime-qt*"
- vmove usr/share/polkit-1
}
}
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (2 preceding siblings ...)
2023-12-23 0:01 ` [PR PATCH] [Updated] " thetredev
@ 2023-12-23 0:01 ` thetredev
2023-12-23 0:03 ` thetredev
` (41 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
New comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#issuecomment-1868140427
Comment:
That worked, thanks!
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (3 preceding siblings ...)
2023-12-23 0:01 ` thetredev
@ 2023-12-23 0:03 ` thetredev
2023-12-23 0:04 ` thetredev
` (40 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
New comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#issuecomment-1868140427
Comment:
That worked, thanks! Now I understand why it didn't work before: the new package version doesn't have a couple files/folders that were listed in `backintime-qt_package`.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (4 preceding siblings ...)
2023-12-23 0:03 ` thetredev
@ 2023-12-23 0:04 ` thetredev
2023-12-23 0:06 ` [PR REVIEW] " Duncaen
` (39 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 338 bytes --]
New comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#issuecomment-1868140427
Comment:
That worked, thanks! Now I understand why it didn't work before: the new package version doesn't have a couple files/folders that were listed in `backintime-qt_package`.
PR branch is updated.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (5 preceding siblings ...)
2023-12-23 0:04 ` thetredev
@ 2023-12-23 0:06 ` Duncaen
2023-12-23 0:17 ` thetredev
` (38 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: Duncaen @ 2023-12-23 0:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 349 bytes --]
New review comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435402492
Comment:
Putting the man page into the same package as the binary seems to make more sense.
The icons and the polkit file also seem to be more likely only used by the qt gui, what is the reason to change this?
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (6 preceding siblings ...)
2023-12-23 0:06 ` [PR REVIEW] " Duncaen
@ 2023-12-23 0:17 ` thetredev
2023-12-23 0:30 ` thetredev
` (37 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 265 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435405470
Comment:
`xbps-src` complained about `usr/share/doc/qt` not being there in the first place. Let me see where I got it wrong.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (7 preceding siblings ...)
2023-12-23 0:17 ` thetredev
@ 2023-12-23 0:30 ` thetredev
2023-12-23 0:30 ` thetredev
` (36 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 825 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435409656
Comment:
Yeah, got the error again:
```
=> backintime-qt-1.4.1_1: running pkg_install ...
mv: cannot stat '/destdir//backintime-1.4.1/etc/dbus-1': No such file or directory
=> ERROR: backintime-qt-1.4.1_1: pkg_install: 'mv ${DESTDIR}/$files ${PKGDESTDIR}/${_targetdir}' exited with 1
=> ERROR: in _vmove() at common/environment/setup/install.sh:228
=> ERROR: in _noglob_helper() at common/environment/setup/install.sh:12
=> ERROR: in pkg_install() at srcpkgs/backintime-qt/template:43
```
It tries to move the files out of `backintime` when it builds `backintime-qt`, so I'm confused now.
I reverted the whole `backintime-qt_package` function to the one from master.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (8 preceding siblings ...)
2023-12-23 0:30 ` thetredev
@ 2023-12-23 0:30 ` thetredev
2023-12-23 0:31 ` thetredev
` (35 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 833 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435409656
Comment:
Yeah, got the error again:
```
=> backintime-qt-1.4.1_1: running pkg_install ...
mv: cannot stat '/destdir//backintime-1.4.1/etc/dbus-1': No such file or directory
=> ERROR: backintime-qt-1.4.1_1: pkg_install: 'mv ${DESTDIR}/$files ${PKGDESTDIR}/${_targetdir}' exited with 1
=> ERROR: in _vmove() at common/environment/setup/install.sh:228
=> ERROR: in _noglob_helper() at common/environment/setup/install.sh:12
=> ERROR: in pkg_install() at srcpkgs/backintime-qt/template:43
```
It tries to move the files out of `backintime` when it builds `backintime-qt`, so I'm confused now.
I reverted the whole `backintime-qt_package` function to the one from master locally.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (9 preceding siblings ...)
2023-12-23 0:30 ` thetredev
@ 2023-12-23 0:31 ` thetredev
2023-12-23 0:33 ` thetredev
` (34 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1389 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435409656
Comment:
Yeah, got the error again:
```
=> backintime-qt-1.4.1_1: running pkg_install ...
mv: cannot stat '/destdir//backintime-1.4.1/etc/dbus-1': No such file or directory
=> ERROR: backintime-qt-1.4.1_1: pkg_install: 'mv ${DESTDIR}/$files ${PKGDESTDIR}/${_targetdir}' exited with 1
=> ERROR: in _vmove() at common/environment/setup/install.sh:228
=> ERROR: in _noglob_helper() at common/environment/setup/install.sh:12
=> ERROR: in pkg_install() at srcpkgs/backintime-qt/template:43
```
It tries to move the files out of `backintime` when it builds `backintime-qt`, so I'm confused now.
I reverted the whole `backintime-qt_package` function to the one from master locally:
```
backintime-qt_package() {
short_desc+=" - Qt GUI"
depends="backintime-${version}_${revision}
python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
pkg_install() {
vmove etc/dbus-1
vmove "usr/bin/backintime-qt*"
vmove usr/share/applications
vmove usr/share/backintime/qt
vmove usr/share/bash-completion/completions/backintime-qt
vmove usr/share/dbus-1
vmove usr/share/doc/backintime-qt
vmove usr/share/doc/qt
vmove usr/share/icons
vmove "usr/share/man/man1/backintime-qt*"
vmove usr/share/polkit-1
}
}
```
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (10 preceding siblings ...)
2023-12-23 0:31 ` thetredev
@ 2023-12-23 0:33 ` thetredev
2023-12-23 0:34 ` thetredev
` (33 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 806 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435410734
Comment:
The reason is that in fact `usr/share/doc` doesn't exist for `backintime-qt`. But as soon as I remove that line, I get:
```
=> backintime-qt-1.4.1_1: running pkg_install ...
mv: cannot stat '/destdir//backintime-1.4.1/etc/dbus-1': No such file or directory
=> ERROR: backintime-qt-1.4.1_1: pkg_install: 'mv ${DESTDIR}/$files ${PKGDESTDIR}/${_targetdir}' exited with 1
=> ERROR: in _vmove() at common/environment/setup/install.sh:228
=> ERROR: in _noglob_helper() at common/environment/setup/install.sh:12
=> ERROR: in pkg_install() at srcpkgs/backintime-qt/template:4
```
where `etc/dbus-1` exists in `backintime-qt` but not in `backintime`.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (11 preceding siblings ...)
2023-12-23 0:33 ` thetredev
@ 2023-12-23 0:34 ` thetredev
2023-12-23 0:37 ` thetredev
` (32 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435411261
Comment:
Oh, the `icons` and `polkit` actually do belong to `backintime`, not `backintime-qt`.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (12 preceding siblings ...)
2023-12-23 0:34 ` thetredev
@ 2023-12-23 0:37 ` thetredev
2023-12-23 0:40 ` thetredev
` (31 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 12429 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435411261
Comment:
Oh, the `icons` and `polkit` actually do belong to `backintime`, not `backintime-qt`.
<details>
<summary>output of tree command</summary>
```
~/repo/github.com/thetredev/void-packages/masterdir/destdir
$ tree .
.
├── backintime-1.4.1
│ ├── etc
│ │ └── xdg
│ │ └── autostart
│ │ └── backintime.desktop
│ └── usr
│ ├── bin
│ │ ├── backintime
│ │ └── backintime-askpass
│ ├── lib
│ ├── lib64 -> lib
│ └── share
│ ├── backintime
│ │ ├── common
│ │ │ ├── applicationinstance.py
│ │ │ ├── askpass.py
│ │ │ ├── backintime.py
│ │ │ ├── bcolors.py
│ │ │ ├── cli.py
│ │ │ ├── config.py
│ │ │ ├── configfile.py
│ │ │ ├── create-manpage-backintime-config.py
│ │ │ ├── diagnostics.py
│ │ │ ├── driveinfo.py
│ │ │ ├── encfstools.py
│ │ │ ├── exceptions.py
│ │ │ ├── guiapplicationinstance.py
│ │ │ ├── languages.py
│ │ │ ├── logger.py
│ │ │ ├── mount.py
│ │ │ ├── password.py
│ │ │ ├── password_ipc.py
│ │ │ ├── pluginmanager.py
│ │ │ ├── progress.py
│ │ │ ├── qt5_probing.py
│ │ │ ├── snapshotlog.py
│ │ │ ├── snapshots.py
│ │ │ ├── sshMaxArg.py
│ │ │ ├── sshtools.py
│ │ │ └── tools.py
│ │ └── plugins
│ │ ├── notifyplugin.py
│ │ ├── systrayiconplugin.py
│ │ └── usercallbackplugin.py
│ ├── bash-completion
│ │ └── completions
│ │ └── backintime
│ ├── doc
│ │ └── backintime-common
│ │ ├── AUTHORS
│ │ ├── CHANGES
│ │ ├── LICENSE
│ │ ├── README.md
│ │ ├── TRANSLATIONS
│ │ ├── VERSION
│ │ ├── copyright
│ │ └── examples
│ │ ├── config-example-local.gz
│ │ └── config-example-ssh.gz
│ ├── icons
│ │ └── hicolor
│ │ ├── 16x16
│ │ │ └── actions
│ │ │ └── show-hidden.svg
│ │ ├── 22x22
│ │ │ └── actions
│ │ │ └── show-hidden.svg
│ │ ├── 24x24
│ │ │ └── actions
│ │ │ └── show-hidden.svg
│ │ ├── 32x32
│ │ │ └── actions
│ │ │ └── show-hidden.svg
│ │ ├── 48x48
│ │ │ └── actions
│ │ │ └── show-hidden.svg
│ │ └── scalable
│ │ └── actions
│ │ └── show-hidden.svg
│ ├── locale
│ │ ├── ar
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── bg
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── bs
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── ca
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── cs
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── da
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── de
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── el
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── eo
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── es
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── et
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── eu
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── fa
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── fi
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── fo
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── fr
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── gl
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── he
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── hr
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── hu
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── id
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── is
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── it
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── ja
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── ko
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── lt
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── nb
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── nl
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── nn
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── pl
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── pt
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── pt_BR
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── ro
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── ru
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── sk
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── sl
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── sr
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── sv
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── th
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── tr
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── uk
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── vi
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ ├── zh_CN
│ │ │ └── LC_MESSAGES
│ │ │ └── backintime.mo
│ │ └── zh_TW
│ │ └── LC_MESSAGES
│ │ └── backintime.mo
│ ├── man
│ │ └── man1
│ │ ├── backintime-askpass.1.gz
│ │ ├── backintime-config.1.gz
│ │ ├── backintime-qt.1.gz
│ │ └── backintime.1.gz
│ └── polkit-1
│ └── actions
│ └── net.launchpad.backintime.policy
└── backintime-qt-1.4.1
├── etc
│ └── dbus-1
│ └── system.d
│ └── net.launchpad.backintime.serviceHelper.conf
└── usr
├── bin
│ ├── backintime-qt
│ └── backintime-qt_polkit
├── lib
├── lib64 -> lib
└── share
├── applications
│ ├── backintime-qt-root.desktop
│ └── backintime-qt.desktop
├── backintime
│ └── qt
│ ├── app.py
│ ├── icon.py
│ ├── languagedialog.py
│ ├── logviewdialog.py
│ ├── messagebox.py
│ ├── qtsystrayicon.py
│ ├── qttools.py
│ ├── qttools_path.py
│ ├── restoredialog.py
│ ├── serviceHelper.py
│ ├── settingsdialog.py
│ └── snapshotsdialog.py
├── bash-completion
│ └── completions
│ └── backintime-qt -> backintime
├── dbus-1
│ └── system-services
│ └── net.launchpad.backintime.serviceHelper.service
└── doc
└── backintime-qt
├── AUTHORS
├── CHANGES
├── LICENSE
├── README.md
├── TRANSLATIONS
├── VERSION
└── copyright
143 directories, 123 files
```
</details>
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (13 preceding siblings ...)
2023-12-23 0:37 ` thetredev
@ 2023-12-23 0:40 ` thetredev
2023-12-23 0:46 ` Duncaen
` (30 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435412653
Comment:
Judging by the tree output above, I assume the PR changes are correct?
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (14 preceding siblings ...)
2023-12-23 0:40 ` thetredev
@ 2023-12-23 0:46 ` Duncaen
2023-12-23 0:50 ` thetredev
` (29 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: Duncaen @ 2023-12-23 0:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
New review comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435414375
Comment:
The icons and the polkit file are both part of the qt part of it and are in the qt directory in the source. https://github.com/bit-team/backintime/tree/2f7b6099edf40366da1c1020385b300ac2793080/qt
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (15 preceding siblings ...)
2023-12-23 0:46 ` Duncaen
@ 2023-12-23 0:50 ` thetredev
2023-12-23 0:50 ` thetredev
` (28 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435415311
Comment:
Well they are not in the `masterdir` anymore. Not sure how to go about that.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (16 preceding siblings ...)
2023-12-23 0:50 ` thetredev
@ 2023-12-23 0:50 ` thetredev
2023-12-23 0:55 ` [PR PATCH] [Updated] " thetredev
` (27 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435415311
Comment:
Well they are not in the `masterdir` anymore. Not sure how to go about that.
Edit: Maybe I looked at it from the wrong perspective. Will try something else.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR PATCH] [Updated] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (17 preceding siblings ...)
2023-12-23 0:50 ` thetredev
@ 2023-12-23 0:55 ` thetredev
2023-12-23 0:55 ` [PR REVIEW] " thetredev
` (26 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by thetredev against master on the void-packages repository
https://github.com/thetredev/void-packages update-package/backintime
https://github.com/void-linux/void-packages/pull/47880
backintime: update to 1.4.1.
#### Testing the changes
- I tested the changes in this PR: **YES**. The Qt GUI launches and I can setup backup targets. The CLI runs and doesn't complain, but I don't know how to use it so I assume it's fine also.
#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`
#### Questions to maintainers
- The package revision has been reset to `1`, because the minor version changed to `4`. Please tell me if this is correct.
#### Further Notes
- The patch `srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch` has been deleted because it is included in backintime 1.4.1 (see https://github.com/bit-team/backintime/commit/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3).
A patch file from https://github.com/void-linux/void-packages/pull/47880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-package/backintime-47880.patch --]
[-- Type: text/x-diff, Size: 4238 bytes --]
From e4e625d7b13e49f1ced24803935909bb7b874d2b Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Fri, 22 Dec 2023 22:14:30 +0100
Subject: [PATCH] backintime: update to 1.4.1.
Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
...23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch | 51 -------------------
srcpkgs/backintime/template | 22 +++-----
2 files changed, 7 insertions(+), 66 deletions(-)
delete mode 100644 srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
diff --git a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch b/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
deleted file mode 100644
index e6a871e962d39..0000000000000
--- a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3 Mon Sep 17 00:00:00 2001
-From: Germar Reitze <germar.reitze@gmail.com>
-Date: Mon, 5 Jul 2021 19:11:58 +0200
-Subject: [PATCH] Tests no longer work with Python 3.10 (fixes: #1175)
-
----
- CHANGES | 5 ++++-
- common/tools.py | 7 +++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CHANGES b/CHANGES
-index c01501f2..0eb5b489 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -1,7 +1,10 @@
- Back In Time
-
-+Version 1.3.2
-+* Fix bug: Tests no longer work with Python 3.10 (https://github.com/bit-team/backintime/issues/1175)
-+
- Version 1.3.1
--* bump version, forgot to push branch to Github before releasing
-+* bump version, forgot to push branch to Github before releasing
-
- Version 1.3.0
- * Merge PR: Fix FileNotFoundError exception in mount.mounted, Thanks tatokis (https://github.com/bit-team/backintime/pull/1157)
-diff --git a/common/tools.py b/common/tools.py
-index 528da707..12645224 100644
---- a/common/tools.py
-+++ b/common/tools.py
-@@ -25,7 +25,10 @@
- import errno
- import gzip
- import tempfile
--import collections
-+try:
-+ from collections.abc import MutableSet
-+except ImportError:
-+ from collections import MutableSet
- import hashlib
- import ipaddress
- import atexit
-@@ -1802,7 +1805,7 @@ def reset(self, path):
- self.history = [path,]
- self.index = 0
-
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(MutableSet):
- """
- OrderedSet from Python recipe
- http://code.activestate.com/recipes/576694/
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index 4550ddabf8b08..b0449e59958c1 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,17 +1,17 @@
# Template file for 'backintime'
pkgname=backintime
-version=1.3.1
-revision=3
+version=1.4.1
+revision=1
configure_args="--python3"
pycompile_dirs="/usr/share/backintime"
hostmakedepends="gettext python3"
-depends="python3 rsync python3-dbus python3-keyring"
+depends="python3 rsync python3-dbus python3-keyring python3-packaging libnotify xdpyinfo"
short_desc="Simple backup tool for Linux"
maintainer="Alpicoid <alpicoid@tuta.io>"
license="GPL-2.0-or-later"
homepage="https://github.com/bit-team/backintime"
-distfiles="https://github.com/bit-team/backintime/releases/download/${version}/backintime-${version}.tar.gz"
-checksum=4ffbca4f92c16a7f1c6ce2df17ea88ca13ebf70a2771286e3eebacdce3a2a44e
+distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
+checksum=bc758022fbb3ef14177a258c1292adc60ff4efee93129d147eab724faed9e21e
python_version=3
do_configure() {
@@ -37,19 +37,11 @@ do_install() {
backintime-qt_package() {
short_desc+=" - Qt GUI"
- depends="backintime-${version}_${revision}
- python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
+ depends="backintime-${version}_${revision} python3-PyQt5 python3-PyQt5-dbus"
pkg_install() {
- vmove etc/dbus-1
- vmove "usr/bin/backintime-qt*"
vmove usr/share/applications
- vmove usr/share/backintime/qt
- vmove usr/share/bash-completion/completions/backintime-qt
- vmove usr/share/dbus-1
- vmove usr/share/doc/backintime-qt
- vmove usr/share/doc/qt
- vmove usr/share/icons
vmove "usr/share/man/man1/backintime-qt*"
+ vmove usr/share/icons
vmove usr/share/polkit-1
}
}
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (18 preceding siblings ...)
2023-12-23 0:55 ` [PR PATCH] [Updated] " thetredev
@ 2023-12-23 0:55 ` thetredev
2023-12-23 16:54 ` classabbyamp
` (25 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 0:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435417019
Comment:
I think I got it now. Can you take another look please?
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (19 preceding siblings ...)
2023-12-23 0:55 ` [PR REVIEW] " thetredev
@ 2023-12-23 16:54 ` classabbyamp
2023-12-23 16:57 ` classabbyamp
` (24 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: classabbyamp @ 2023-12-23 16:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435651693
Comment:
not moving the binaries seems to defeat the point of splitting it off
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (20 preceding siblings ...)
2023-12-23 16:54 ` classabbyamp
@ 2023-12-23 16:57 ` classabbyamp
2023-12-23 16:58 ` classabbyamp
` (23 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: classabbyamp @ 2023-12-23 16:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435651693
Comment:
not moving the binaries seems to defeat the point of splitting it off
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (21 preceding siblings ...)
2023-12-23 16:57 ` classabbyamp
@ 2023-12-23 16:58 ` classabbyamp
2023-12-23 18:59 ` thetredev
` (22 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: classabbyamp @ 2023-12-23 16:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435652708
Comment:
i think a lot of the removed `vmove`s need to be restored, see the diff: https://github.com/void-linux/void-packages/actions/runs/7305156960/job/19908370726?pr=47880#step:9:9
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (22 preceding siblings ...)
2023-12-23 16:58 ` classabbyamp
@ 2023-12-23 18:59 ` thetredev
2023-12-23 19:26 ` classabbyamp
` (21 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 18:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435679746
Comment:
Is that the diff between the new and previous XBPS package contents?
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (23 preceding siblings ...)
2023-12-23 18:59 ` thetredev
@ 2023-12-23 19:26 ` classabbyamp
2023-12-23 19:27 ` thetredev
` (20 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: classabbyamp @ 2023-12-23 19:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435685196
Comment:
yes
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (24 preceding siblings ...)
2023-12-23 19:26 ` classabbyamp
@ 2023-12-23 19:27 ` thetredev
2024-03-09 23:14 ` [PR PATCH] [Updated] " thetredev
` (19 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2023-12-23 19:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1435685684
Comment:
Cool, didn't know that we could do that. I'll get back to the PR after the holidays I guess.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR PATCH] [Updated] backintime: update to 1.4.1.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (25 preceding siblings ...)
2023-12-23 19:27 ` thetredev
@ 2024-03-09 23:14 ` thetredev
2024-03-09 23:14 ` backintime: update to 1.4.3 thetredev
` (18 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-09 23:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by thetredev against master on the void-packages repository
https://github.com/thetredev/void-packages update-package/backintime
https://github.com/void-linux/void-packages/pull/47880
backintime: update to 1.4.1.
#### Testing the changes
- I tested the changes in this PR: **YES**. The Qt GUI launches and I can setup backup targets. The CLI runs and doesn't complain, but I don't know how to use it so I assume it's fine also.
#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`
#### Questions to maintainers
- The package revision has been reset to `1`, because the minor version changed to `4`. Please tell me if this is correct.
#### Further Notes
- The patch `srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch` has been deleted because it is included in backintime 1.4.1 (see https://github.com/bit-team/backintime/commit/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3).
A patch file from https://github.com/void-linux/void-packages/pull/47880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-package/backintime-47880.patch --]
[-- Type: text/x-diff, Size: 3799 bytes --]
From 7af01ad2ec5ce72a46a1648e3b670cf5b185ed83 Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 10 Mar 2024 00:01:54 +0100
Subject: [PATCH] backintime: update to 1.4.3.
Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
...23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch | 51 -------------------
srcpkgs/backintime/template | 14 ++---
2 files changed, 3 insertions(+), 62 deletions(-)
delete mode 100644 srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
diff --git a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch b/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
deleted file mode 100644
index e6a871e962d396..00000000000000
--- a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3 Mon Sep 17 00:00:00 2001
-From: Germar Reitze <germar.reitze@gmail.com>
-Date: Mon, 5 Jul 2021 19:11:58 +0200
-Subject: [PATCH] Tests no longer work with Python 3.10 (fixes: #1175)
-
----
- CHANGES | 5 ++++-
- common/tools.py | 7 +++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CHANGES b/CHANGES
-index c01501f2..0eb5b489 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -1,7 +1,10 @@
- Back In Time
-
-+Version 1.3.2
-+* Fix bug: Tests no longer work with Python 3.10 (https://github.com/bit-team/backintime/issues/1175)
-+
- Version 1.3.1
--* bump version, forgot to push branch to Github before releasing
-+* bump version, forgot to push branch to Github before releasing
-
- Version 1.3.0
- * Merge PR: Fix FileNotFoundError exception in mount.mounted, Thanks tatokis (https://github.com/bit-team/backintime/pull/1157)
-diff --git a/common/tools.py b/common/tools.py
-index 528da707..12645224 100644
---- a/common/tools.py
-+++ b/common/tools.py
-@@ -25,7 +25,10 @@
- import errno
- import gzip
- import tempfile
--import collections
-+try:
-+ from collections.abc import MutableSet
-+except ImportError:
-+ from collections import MutableSet
- import hashlib
- import ipaddress
- import atexit
-@@ -1802,7 +1805,7 @@ def reset(self, path):
- self.history = [path,]
- self.index = 0
-
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(MutableSet):
- """
- OrderedSet from Python recipe
- http://code.activestate.com/recipes/576694/
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index 4550ddabf8b08d..acaf74239f2623 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,7 +1,7 @@
# Template file for 'backintime'
pkgname=backintime
-version=1.3.1
-revision=3
+version=1.4.3
+revision=1
configure_args="--python3"
pycompile_dirs="/usr/share/backintime"
hostmakedepends="gettext python3"
@@ -11,7 +11,7 @@ maintainer="Alpicoid <alpicoid@tuta.io>"
license="GPL-2.0-or-later"
homepage="https://github.com/bit-team/backintime"
distfiles="https://github.com/bit-team/backintime/releases/download/${version}/backintime-${version}.tar.gz"
-checksum=4ffbca4f92c16a7f1c6ce2df17ea88ca13ebf70a2771286e3eebacdce3a2a44e
+checksum=68874587883f33b2a8fec5c00cb446034a3110e9198339fc9152543951790776
python_version=3
do_configure() {
@@ -40,14 +40,6 @@ backintime-qt_package() {
depends="backintime-${version}_${revision}
python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
pkg_install() {
- vmove etc/dbus-1
- vmove "usr/bin/backintime-qt*"
- vmove usr/share/applications
- vmove usr/share/backintime/qt
- vmove usr/share/bash-completion/completions/backintime-qt
- vmove usr/share/dbus-1
- vmove usr/share/doc/backintime-qt
- vmove usr/share/doc/qt
vmove usr/share/icons
vmove "usr/share/man/man1/backintime-qt*"
vmove usr/share/polkit-1
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (26 preceding siblings ...)
2024-03-09 23:14 ` [PR PATCH] [Updated] " thetredev
@ 2024-03-09 23:14 ` thetredev
2024-03-09 23:17 ` [PR REVIEW] " thetredev
` (17 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-09 23:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#issuecomment-1987006381
Comment:
Updated to version v1.4.3
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (27 preceding siblings ...)
2024-03-09 23:14 ` backintime: update to 1.4.3 thetredev
@ 2024-03-09 23:17 ` thetredev
2024-03-09 23:18 ` [PR PATCH] [Updated] " thetredev
` (16 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-09 23:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 597 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1518682898
Comment:
I still don't understand it... it won't compile until I remove all those `vmmove` lines. Without them, it compiles fine and the Qt GUI also works. The last commit works on my system. Maybe these files just aren't needed anymore by `backintime`? If there's another way, could you please provide a `diff` on `backintime-qt_package()` with your proposal? The one from `master` throws the errors I posted above for all lines that I removed in this PR.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR PATCH] [Updated] backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (28 preceding siblings ...)
2024-03-09 23:17 ` [PR REVIEW] " thetredev
@ 2024-03-09 23:18 ` thetredev
2024-03-09 23:21 ` thetredev
` (15 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-09 23:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by thetredev against master on the void-packages repository
https://github.com/thetredev/void-packages update-package/backintime
https://github.com/void-linux/void-packages/pull/47880
backintime: update to 1.4.3.
#### Testing the changes
- I tested the changes in this PR: **YES**. The Qt GUI launches and I can setup backup targets. The CLI runs and doesn't complain, but I don't know how to use it so I assume it's fine also.
#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`
#### Questions to maintainers
- The package revision has been reset to `1`, because the minor version changed to `4`. Please tell me if this is correct.
#### Further Notes
- The patch `srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch` has been deleted because it is included in backintime 1.4.1 (see https://github.com/bit-team/backintime/commit/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3).
A patch file from https://github.com/void-linux/void-packages/pull/47880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-package/backintime-47880.patch --]
[-- Type: text/x-diff, Size: 3954 bytes --]
From e29028b1108a59421af93ad8bee0e96eaecc9c2c Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 10 Mar 2024 00:01:54 +0100
Subject: [PATCH] backintime: update to 1.4.3.
Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
...23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch | 51 -------------------
srcpkgs/backintime/template | 16 ++----
2 files changed, 4 insertions(+), 63 deletions(-)
delete mode 100644 srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
diff --git a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch b/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
deleted file mode 100644
index e6a871e962d396..00000000000000
--- a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3 Mon Sep 17 00:00:00 2001
-From: Germar Reitze <germar.reitze@gmail.com>
-Date: Mon, 5 Jul 2021 19:11:58 +0200
-Subject: [PATCH] Tests no longer work with Python 3.10 (fixes: #1175)
-
----
- CHANGES | 5 ++++-
- common/tools.py | 7 +++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CHANGES b/CHANGES
-index c01501f2..0eb5b489 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -1,7 +1,10 @@
- Back In Time
-
-+Version 1.3.2
-+* Fix bug: Tests no longer work with Python 3.10 (https://github.com/bit-team/backintime/issues/1175)
-+
- Version 1.3.1
--* bump version, forgot to push branch to Github before releasing
-+* bump version, forgot to push branch to Github before releasing
-
- Version 1.3.0
- * Merge PR: Fix FileNotFoundError exception in mount.mounted, Thanks tatokis (https://github.com/bit-team/backintime/pull/1157)
-diff --git a/common/tools.py b/common/tools.py
-index 528da707..12645224 100644
---- a/common/tools.py
-+++ b/common/tools.py
-@@ -25,7 +25,10 @@
- import errno
- import gzip
- import tempfile
--import collections
-+try:
-+ from collections.abc import MutableSet
-+except ImportError:
-+ from collections import MutableSet
- import hashlib
- import ipaddress
- import atexit
-@@ -1802,7 +1805,7 @@ def reset(self, path):
- self.history = [path,]
- self.index = 0
-
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(MutableSet):
- """
- OrderedSet from Python recipe
- http://code.activestate.com/recipes/576694/
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index 4550ddabf8b08d..bdfbb16627f9f9 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,7 +1,7 @@
# Template file for 'backintime'
pkgname=backintime
-version=1.3.1
-revision=3
+version=1.4.3
+revision=1
configure_args="--python3"
pycompile_dirs="/usr/share/backintime"
hostmakedepends="gettext python3"
@@ -10,8 +10,8 @@ short_desc="Simple backup tool for Linux"
maintainer="Alpicoid <alpicoid@tuta.io>"
license="GPL-2.0-or-later"
homepage="https://github.com/bit-team/backintime"
-distfiles="https://github.com/bit-team/backintime/releases/download/${version}/backintime-${version}.tar.gz"
-checksum=4ffbca4f92c16a7f1c6ce2df17ea88ca13ebf70a2771286e3eebacdce3a2a44e
+distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
+checksum=68874587883f33b2a8fec5c00cb446034a3110e9198339fc9152543951790776
python_version=3
do_configure() {
@@ -40,14 +40,6 @@ backintime-qt_package() {
depends="backintime-${version}_${revision}
python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
pkg_install() {
- vmove etc/dbus-1
- vmove "usr/bin/backintime-qt*"
- vmove usr/share/applications
- vmove usr/share/backintime/qt
- vmove usr/share/bash-completion/completions/backintime-qt
- vmove usr/share/dbus-1
- vmove usr/share/doc/backintime-qt
- vmove usr/share/doc/qt
vmove usr/share/icons
vmove "usr/share/man/man1/backintime-qt*"
vmove usr/share/polkit-1
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (29 preceding siblings ...)
2024-03-09 23:18 ` [PR PATCH] [Updated] " thetredev
@ 2024-03-09 23:21 ` thetredev
2024-03-09 23:21 ` thetredev
` (14 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-09 23:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#issuecomment-1987006381
Comment:
Rebased to lastest master, updated to version v1.4.3
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (30 preceding siblings ...)
2024-03-09 23:21 ` thetredev
@ 2024-03-09 23:21 ` thetredev
2024-03-11 0:01 ` [PR REVIEW] " classabbyamp
` (13 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-09 23:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
New comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#issuecomment-1987006381
Comment:
Rebased to lastest master, updated the package to version v1.4.3
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (31 preceding siblings ...)
2024-03-09 23:21 ` thetredev
@ 2024-03-11 0:01 ` classabbyamp
2024-03-11 0:07 ` thetredev
` (12 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: classabbyamp @ 2024-03-11 0:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 283 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1519017504
Comment:
the only ones that need to be removed are `vmove etc/dbus-1` and `vmove usr/share/doc/qt`, as they no longer exist in the package.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (32 preceding siblings ...)
2024-03-11 0:01 ` [PR REVIEW] " classabbyamp
@ 2024-03-11 0:07 ` thetredev
2024-03-11 0:09 ` thetredev
` (11 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-11 0:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1519018568
Comment:
Okay that worked. How did you figure that out if I may ask?
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (33 preceding siblings ...)
2024-03-11 0:07 ` thetredev
@ 2024-03-11 0:09 ` thetredev
2024-03-11 0:12 ` classabbyamp
` (10 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-11 0:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1519018568
Comment:
Okay that worked. How did you figure that out if I may ask?
Edit: Ouch... I think I have to `xbps-src remove <pkg>` before I rebuild it, right? Seems to fix caching or something.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (34 preceding siblings ...)
2024-03-11 0:09 ` thetredev
@ 2024-03-11 0:12 ` classabbyamp
2024-03-11 0:15 ` thetredev
` (9 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: classabbyamp @ 2024-03-11 0:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1519020231
Comment:
> How did you figure that out if I may ask?
I read the error message, checked what was in masterdir/destdir, removed the relevant line, `xbps-src clean`ed, retried
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (35 preceding siblings ...)
2024-03-11 0:12 ` classabbyamp
@ 2024-03-11 0:15 ` thetredev
2024-03-11 0:16 ` [PR PATCH] [Updated] " thetredev
` (8 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-11 0:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1519021452
Comment:
Thanks! I'll keep that in mind for the next PRs.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR PATCH] [Updated] backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (36 preceding siblings ...)
2024-03-11 0:15 ` thetredev
@ 2024-03-11 0:16 ` thetredev
2024-03-11 0:19 ` [PR REVIEW] " thetredev
` (7 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-11 0:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by thetredev against master on the void-packages repository
https://github.com/thetredev/void-packages update-package/backintime
https://github.com/void-linux/void-packages/pull/47880
backintime: update to 1.4.3.
#### Testing the changes
- I tested the changes in this PR: **YES**. The Qt GUI launches and I can setup backup targets. The CLI runs and doesn't complain, but I don't know how to use it so I assume it's fine also.
#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`
#### Questions to maintainers
- The package revision has been reset to `1`, because the minor version changed to `4`. Please tell me if this is correct.
#### Further Notes
- The patch `srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch` has been deleted because it is included in backintime 1.4.1 (see https://github.com/bit-team/backintime/commit/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3).
A patch file from https://github.com/void-linux/void-packages/pull/47880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-package/backintime-47880.patch --]
[-- Type: text/x-diff, Size: 3953 bytes --]
From 40b9949c8c7be59565726b18a4b83958573f97f5 Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 10 Mar 2024 00:01:54 +0100
Subject: [PATCH] backintime: update to 1.4.3.
Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
...23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch | 51 -------------------
srcpkgs/backintime/template | 10 ++--
2 files changed, 4 insertions(+), 57 deletions(-)
delete mode 100644 srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
diff --git a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch b/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
deleted file mode 100644
index e6a871e962d396..00000000000000
--- a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3 Mon Sep 17 00:00:00 2001
-From: Germar Reitze <germar.reitze@gmail.com>
-Date: Mon, 5 Jul 2021 19:11:58 +0200
-Subject: [PATCH] Tests no longer work with Python 3.10 (fixes: #1175)
-
----
- CHANGES | 5 ++++-
- common/tools.py | 7 +++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CHANGES b/CHANGES
-index c01501f2..0eb5b489 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -1,7 +1,10 @@
- Back In Time
-
-+Version 1.3.2
-+* Fix bug: Tests no longer work with Python 3.10 (https://github.com/bit-team/backintime/issues/1175)
-+
- Version 1.3.1
--* bump version, forgot to push branch to Github before releasing
-+* bump version, forgot to push branch to Github before releasing
-
- Version 1.3.0
- * Merge PR: Fix FileNotFoundError exception in mount.mounted, Thanks tatokis (https://github.com/bit-team/backintime/pull/1157)
-diff --git a/common/tools.py b/common/tools.py
-index 528da707..12645224 100644
---- a/common/tools.py
-+++ b/common/tools.py
-@@ -25,7 +25,10 @@
- import errno
- import gzip
- import tempfile
--import collections
-+try:
-+ from collections.abc import MutableSet
-+except ImportError:
-+ from collections import MutableSet
- import hashlib
- import ipaddress
- import atexit
-@@ -1802,7 +1805,7 @@ def reset(self, path):
- self.history = [path,]
- self.index = 0
-
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(MutableSet):
- """
- OrderedSet from Python recipe
- http://code.activestate.com/recipes/576694/
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index 4550ddabf8b08d..91ec2b5f778999 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,7 +1,7 @@
# Template file for 'backintime'
pkgname=backintime
-version=1.3.1
-revision=3
+version=1.4.3
+revision=1
configure_args="--python3"
pycompile_dirs="/usr/share/backintime"
hostmakedepends="gettext python3"
@@ -10,8 +10,8 @@ short_desc="Simple backup tool for Linux"
maintainer="Alpicoid <alpicoid@tuta.io>"
license="GPL-2.0-or-later"
homepage="https://github.com/bit-team/backintime"
-distfiles="https://github.com/bit-team/backintime/releases/download/${version}/backintime-${version}.tar.gz"
-checksum=4ffbca4f92c16a7f1c6ce2df17ea88ca13ebf70a2771286e3eebacdce3a2a44e
+distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
+checksum=68874587883f33b2a8fec5c00cb446034a3110e9198339fc9152543951790776
python_version=3
do_configure() {
@@ -40,14 +40,12 @@ backintime-qt_package() {
depends="backintime-${version}_${revision}
python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
pkg_install() {
- vmove etc/dbus-1
vmove "usr/bin/backintime-qt*"
vmove usr/share/applications
vmove usr/share/backintime/qt
vmove usr/share/bash-completion/completions/backintime-qt
vmove usr/share/dbus-1
vmove usr/share/doc/backintime-qt
- vmove usr/share/doc/qt
vmove usr/share/icons
vmove "usr/share/man/man1/backintime-qt*"
vmove usr/share/polkit-1
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (37 preceding siblings ...)
2024-03-11 0:16 ` [PR PATCH] [Updated] " thetredev
@ 2024-03-11 0:19 ` thetredev
2024-03-11 0:19 ` thetredev
` (6 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-11 0:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1519022644
Comment:
Should be good now.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR REVIEW] backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (38 preceding siblings ...)
2024-03-11 0:19 ` [PR REVIEW] " thetredev
@ 2024-03-11 0:19 ` thetredev
2024-03-11 0:24 ` [PR PATCH] [Updated] " thetredev
` (5 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-11 0:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New review comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#discussion_r1519022644
Comment:
Should be good now @Duncaen.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR PATCH] [Updated] backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (39 preceding siblings ...)
2024-03-11 0:19 ` thetredev
@ 2024-03-11 0:24 ` thetredev
2024-03-11 0:26 ` thetredev
` (4 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-11 0:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by thetredev against master on the void-packages repository
https://github.com/thetredev/void-packages update-package/backintime
https://github.com/void-linux/void-packages/pull/47880
backintime: update to 1.4.3.
#### Testing the changes
- I tested the changes in this PR: **YES**. The Qt GUI launches and I can setup backup targets. The CLI runs and doesn't complain, but I don't know how to use it so I assume it's fine also.
#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`
#### Questions to maintainers
- The package revision has been reset to `1`, because the minor version changed to `4`. Please tell me if this is correct.
#### Further Notes
- The patch `srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch` has been deleted because it is included in backintime 1.4.1 (see https://github.com/bit-team/backintime/commit/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3).
A patch file from https://github.com/void-linux/void-packages/pull/47880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-package/backintime-47880.patch --]
[-- Type: text/x-diff, Size: 3953 bytes --]
From 40b9949c8c7be59565726b18a4b83958573f97f5 Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 10 Mar 2024 00:01:54 +0100
Subject: [PATCH] backintime: update to 1.4.3.
Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
...23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch | 51 -------------------
srcpkgs/backintime/template | 10 ++--
2 files changed, 4 insertions(+), 57 deletions(-)
delete mode 100644 srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
diff --git a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch b/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
deleted file mode 100644
index e6a871e962d396..00000000000000
--- a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3 Mon Sep 17 00:00:00 2001
-From: Germar Reitze <germar.reitze@gmail.com>
-Date: Mon, 5 Jul 2021 19:11:58 +0200
-Subject: [PATCH] Tests no longer work with Python 3.10 (fixes: #1175)
-
----
- CHANGES | 5 ++++-
- common/tools.py | 7 +++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CHANGES b/CHANGES
-index c01501f2..0eb5b489 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -1,7 +1,10 @@
- Back In Time
-
-+Version 1.3.2
-+* Fix bug: Tests no longer work with Python 3.10 (https://github.com/bit-team/backintime/issues/1175)
-+
- Version 1.3.1
--* bump version, forgot to push branch to Github before releasing
-+* bump version, forgot to push branch to Github before releasing
-
- Version 1.3.0
- * Merge PR: Fix FileNotFoundError exception in mount.mounted, Thanks tatokis (https://github.com/bit-team/backintime/pull/1157)
-diff --git a/common/tools.py b/common/tools.py
-index 528da707..12645224 100644
---- a/common/tools.py
-+++ b/common/tools.py
-@@ -25,7 +25,10 @@
- import errno
- import gzip
- import tempfile
--import collections
-+try:
-+ from collections.abc import MutableSet
-+except ImportError:
-+ from collections import MutableSet
- import hashlib
- import ipaddress
- import atexit
-@@ -1802,7 +1805,7 @@ def reset(self, path):
- self.history = [path,]
- self.index = 0
-
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(MutableSet):
- """
- OrderedSet from Python recipe
- http://code.activestate.com/recipes/576694/
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index 4550ddabf8b08d..91ec2b5f778999 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,7 +1,7 @@
# Template file for 'backintime'
pkgname=backintime
-version=1.3.1
-revision=3
+version=1.4.3
+revision=1
configure_args="--python3"
pycompile_dirs="/usr/share/backintime"
hostmakedepends="gettext python3"
@@ -10,8 +10,8 @@ short_desc="Simple backup tool for Linux"
maintainer="Alpicoid <alpicoid@tuta.io>"
license="GPL-2.0-or-later"
homepage="https://github.com/bit-team/backintime"
-distfiles="https://github.com/bit-team/backintime/releases/download/${version}/backintime-${version}.tar.gz"
-checksum=4ffbca4f92c16a7f1c6ce2df17ea88ca13ebf70a2771286e3eebacdce3a2a44e
+distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
+checksum=68874587883f33b2a8fec5c00cb446034a3110e9198339fc9152543951790776
python_version=3
do_configure() {
@@ -40,14 +40,12 @@ backintime-qt_package() {
depends="backintime-${version}_${revision}
python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
pkg_install() {
- vmove etc/dbus-1
vmove "usr/bin/backintime-qt*"
vmove usr/share/applications
vmove usr/share/backintime/qt
vmove usr/share/bash-completion/completions/backintime-qt
vmove usr/share/dbus-1
vmove usr/share/doc/backintime-qt
- vmove usr/share/doc/qt
vmove usr/share/icons
vmove "usr/share/man/man1/backintime-qt*"
vmove usr/share/polkit-1
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (40 preceding siblings ...)
2024-03-11 0:24 ` [PR PATCH] [Updated] " thetredev
@ 2024-03-11 0:26 ` thetredev
2024-03-11 0:28 ` [PR PATCH] [Updated] " thetredev
` (3 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-11 0:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
New comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#issuecomment-1987006381
Comment:
Rebased to lastest master, updated the package to version v1.4.3
Edit: Sorry, messed up the commit history... my local clone wasn't right. Will fix it asap.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR PATCH] [Updated] backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (41 preceding siblings ...)
2024-03-11 0:26 ` thetredev
@ 2024-03-11 0:28 ` thetredev
2024-03-11 0:29 ` thetredev
` (2 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-11 0:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by thetredev against master on the void-packages repository
https://github.com/thetredev/void-packages update-package/backintime
https://github.com/void-linux/void-packages/pull/47880
backintime: update to 1.4.3.
#### Testing the changes
- I tested the changes in this PR: **YES**. The Qt GUI launches and I can setup backup targets. The CLI runs and doesn't complain, but I don't know how to use it so I assume it's fine also.
#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`
#### Questions to maintainers
- The package revision has been reset to `1`, because the minor version changed to `4`. Please tell me if this is correct.
#### Further Notes
- The patch `srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch` has been deleted because it is included in backintime 1.4.1 (see https://github.com/bit-team/backintime/commit/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3).
A patch file from https://github.com/void-linux/void-packages/pull/47880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-package/backintime-47880.patch --]
[-- Type: text/x-diff, Size: 3953 bytes --]
From 938c71ad6420d8b58f39e7ccdbc5ad4325eca09c Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 10 Mar 2024 00:01:54 +0100
Subject: [PATCH] backintime: update to 1.4.3.
Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
...23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch | 51 -------------------
srcpkgs/backintime/template | 10 ++--
2 files changed, 4 insertions(+), 57 deletions(-)
delete mode 100644 srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
diff --git a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch b/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
deleted file mode 100644
index e6a871e962d396..00000000000000
--- a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3 Mon Sep 17 00:00:00 2001
-From: Germar Reitze <germar.reitze@gmail.com>
-Date: Mon, 5 Jul 2021 19:11:58 +0200
-Subject: [PATCH] Tests no longer work with Python 3.10 (fixes: #1175)
-
----
- CHANGES | 5 ++++-
- common/tools.py | 7 +++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CHANGES b/CHANGES
-index c01501f2..0eb5b489 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -1,7 +1,10 @@
- Back In Time
-
-+Version 1.3.2
-+* Fix bug: Tests no longer work with Python 3.10 (https://github.com/bit-team/backintime/issues/1175)
-+
- Version 1.3.1
--* bump version, forgot to push branch to Github before releasing
-+* bump version, forgot to push branch to Github before releasing
-
- Version 1.3.0
- * Merge PR: Fix FileNotFoundError exception in mount.mounted, Thanks tatokis (https://github.com/bit-team/backintime/pull/1157)
-diff --git a/common/tools.py b/common/tools.py
-index 528da707..12645224 100644
---- a/common/tools.py
-+++ b/common/tools.py
-@@ -25,7 +25,10 @@
- import errno
- import gzip
- import tempfile
--import collections
-+try:
-+ from collections.abc import MutableSet
-+except ImportError:
-+ from collections import MutableSet
- import hashlib
- import ipaddress
- import atexit
-@@ -1802,7 +1805,7 @@ def reset(self, path):
- self.history = [path,]
- self.index = 0
-
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(MutableSet):
- """
- OrderedSet from Python recipe
- http://code.activestate.com/recipes/576694/
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index 4550ddabf8b08d..91ec2b5f778999 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,7 +1,7 @@
# Template file for 'backintime'
pkgname=backintime
-version=1.3.1
-revision=3
+version=1.4.3
+revision=1
configure_args="--python3"
pycompile_dirs="/usr/share/backintime"
hostmakedepends="gettext python3"
@@ -10,8 +10,8 @@ short_desc="Simple backup tool for Linux"
maintainer="Alpicoid <alpicoid@tuta.io>"
license="GPL-2.0-or-later"
homepage="https://github.com/bit-team/backintime"
-distfiles="https://github.com/bit-team/backintime/releases/download/${version}/backintime-${version}.tar.gz"
-checksum=4ffbca4f92c16a7f1c6ce2df17ea88ca13ebf70a2771286e3eebacdce3a2a44e
+distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
+checksum=68874587883f33b2a8fec5c00cb446034a3110e9198339fc9152543951790776
python_version=3
do_configure() {
@@ -40,14 +40,12 @@ backintime-qt_package() {
depends="backintime-${version}_${revision}
python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
pkg_install() {
- vmove etc/dbus-1
vmove "usr/bin/backintime-qt*"
vmove usr/share/applications
vmove usr/share/backintime/qt
vmove usr/share/bash-completion/completions/backintime-qt
vmove usr/share/dbus-1
vmove usr/share/doc/backintime-qt
- vmove usr/share/doc/qt
vmove usr/share/icons
vmove "usr/share/man/man1/backintime-qt*"
vmove usr/share/polkit-1
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (42 preceding siblings ...)
2024-03-11 0:28 ` [PR PATCH] [Updated] " thetredev
@ 2024-03-11 0:29 ` thetredev
2024-03-11 0:39 ` [PR PATCH] [Updated] " thetredev
2024-03-11 0:40 ` thetredev
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-11 0:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#issuecomment-1987434873
Comment:
Okay, now it's ready to be merged.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PR PATCH] [Updated] backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (43 preceding siblings ...)
2024-03-11 0:29 ` thetredev
@ 2024-03-11 0:39 ` thetredev
2024-03-11 0:40 ` thetredev
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-11 0:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There is an updated pull request by thetredev against master on the void-packages repository
https://github.com/thetredev/void-packages update-package/backintime
https://github.com/void-linux/void-packages/pull/47880
backintime: update to 1.4.3.
#### Testing the changes
- I tested the changes in this PR: **YES**. The Qt GUI launches and I can setup backup targets. The CLI runs and doesn't complain, but I don't know how to use it so I assume it's fine also.
#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`
#### Questions to maintainers
- The package revision has been reset to `1`, because the minor version changed to `4`. Please tell me if this is correct.
#### Further Notes
- The patch `srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch` has been deleted because it is included in backintime 1.4.1 (see https://github.com/bit-team/backintime/commit/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3).
A patch file from https://github.com/void-linux/void-packages/pull/47880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-package/backintime-47880.patch --]
[-- Type: text/x-diff, Size: 4181 bytes --]
From a64dbf7236e983a150745d17bfd33bb898631c1c Mon Sep 17 00:00:00 2001
From: Timo Reichl <thetredev@gmail.com>
Date: Sun, 10 Mar 2024 00:01:54 +0100
Subject: [PATCH] backintime: update to 1.4.3.
Signed-off-by: Timo Reichl <thetredev@gmail.com>
---
...23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch | 51 -------------------
srcpkgs/backintime/template | 14 +++--
2 files changed, 6 insertions(+), 59 deletions(-)
delete mode 100644 srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
diff --git a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch b/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
deleted file mode 100644
index e6a871e962d396..00000000000000
--- a/srcpkgs/backintime/patches/e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e1ae23ddc0b4229053e3e9c6c61adcb7f3d8e9b3 Mon Sep 17 00:00:00 2001
-From: Germar Reitze <germar.reitze@gmail.com>
-Date: Mon, 5 Jul 2021 19:11:58 +0200
-Subject: [PATCH] Tests no longer work with Python 3.10 (fixes: #1175)
-
----
- CHANGES | 5 ++++-
- common/tools.py | 7 +++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CHANGES b/CHANGES
-index c01501f2..0eb5b489 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -1,7 +1,10 @@
- Back In Time
-
-+Version 1.3.2
-+* Fix bug: Tests no longer work with Python 3.10 (https://github.com/bit-team/backintime/issues/1175)
-+
- Version 1.3.1
--* bump version, forgot to push branch to Github before releasing
-+* bump version, forgot to push branch to Github before releasing
-
- Version 1.3.0
- * Merge PR: Fix FileNotFoundError exception in mount.mounted, Thanks tatokis (https://github.com/bit-team/backintime/pull/1157)
-diff --git a/common/tools.py b/common/tools.py
-index 528da707..12645224 100644
---- a/common/tools.py
-+++ b/common/tools.py
-@@ -25,7 +25,10 @@
- import errno
- import gzip
- import tempfile
--import collections
-+try:
-+ from collections.abc import MutableSet
-+except ImportError:
-+ from collections import MutableSet
- import hashlib
- import ipaddress
- import atexit
-@@ -1802,7 +1805,7 @@ def reset(self, path):
- self.history = [path,]
- self.index = 0
-
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(MutableSet):
- """
- OrderedSet from Python recipe
- http://code.activestate.com/recipes/576694/
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index 4550ddabf8b08d..60cea573224a9a 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,17 +1,17 @@
# Template file for 'backintime'
pkgname=backintime
-version=1.3.1
-revision=3
+version=1.4.3
+revision=1
configure_args="--python3"
pycompile_dirs="/usr/share/backintime"
hostmakedepends="gettext python3"
-depends="python3 rsync python3-dbus python3-keyring"
+depends="python3 rsync python3-dbus python3-keyring python3-packaging"
short_desc="Simple backup tool for Linux"
maintainer="Alpicoid <alpicoid@tuta.io>"
license="GPL-2.0-or-later"
homepage="https://github.com/bit-team/backintime"
-distfiles="https://github.com/bit-team/backintime/releases/download/${version}/backintime-${version}.tar.gz"
-checksum=4ffbca4f92c16a7f1c6ce2df17ea88ca13ebf70a2771286e3eebacdce3a2a44e
+distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
+checksum=68874587883f33b2a8fec5c00cb446034a3110e9198339fc9152543951790776
python_version=3
do_configure() {
@@ -38,16 +38,14 @@ do_install() {
backintime-qt_package() {
short_desc+=" - Qt GUI"
depends="backintime-${version}_${revision}
- python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
+ python3-PyQt5 python3-PyQt5-dbus python3-packaging libnotify xdpyinfo"
pkg_install() {
- vmove etc/dbus-1
vmove "usr/bin/backintime-qt*"
vmove usr/share/applications
vmove usr/share/backintime/qt
vmove usr/share/bash-completion/completions/backintime-qt
vmove usr/share/dbus-1
vmove usr/share/doc/backintime-qt
- vmove usr/share/doc/qt
vmove usr/share/icons
vmove "usr/share/man/man1/backintime-qt*"
vmove usr/share/polkit-1
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: backintime: update to 1.4.3.
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
` (44 preceding siblings ...)
2024-03-11 0:39 ` [PR PATCH] [Updated] " thetredev
@ 2024-03-11 0:40 ` thetredev
45 siblings, 0 replies; 47+ messages in thread
From: thetredev @ 2024-03-11 0:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 274 bytes --]
New comment by thetredev on void-packages repository
https://github.com/void-linux/void-packages/pull/47880#issuecomment-1987434873
Comment:
Okay, now it's ready to be merged.
Edit: @Duncaen @classabbyamp `python3-packaging` was missing. Now it can really be merged :)
^ permalink raw reply [flat|nested] 47+ messages in thread
end of thread, other threads:[~2024-03-11 0:40 UTC | newest]
Thread overview: 47+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-22 23:28 [PR PATCH] backintime: update to 1.4.1 thetredev
2023-12-22 23:38 ` Duncaen
2023-12-22 23:47 ` thetredev
2023-12-23 0:01 ` [PR PATCH] [Updated] " thetredev
2023-12-23 0:01 ` thetredev
2023-12-23 0:03 ` thetredev
2023-12-23 0:04 ` thetredev
2023-12-23 0:06 ` [PR REVIEW] " Duncaen
2023-12-23 0:17 ` thetredev
2023-12-23 0:30 ` thetredev
2023-12-23 0:30 ` thetredev
2023-12-23 0:31 ` thetredev
2023-12-23 0:33 ` thetredev
2023-12-23 0:34 ` thetredev
2023-12-23 0:37 ` thetredev
2023-12-23 0:40 ` thetredev
2023-12-23 0:46 ` Duncaen
2023-12-23 0:50 ` thetredev
2023-12-23 0:50 ` thetredev
2023-12-23 0:55 ` [PR PATCH] [Updated] " thetredev
2023-12-23 0:55 ` [PR REVIEW] " thetredev
2023-12-23 16:54 ` classabbyamp
2023-12-23 16:57 ` classabbyamp
2023-12-23 16:58 ` classabbyamp
2023-12-23 18:59 ` thetredev
2023-12-23 19:26 ` classabbyamp
2023-12-23 19:27 ` thetredev
2024-03-09 23:14 ` [PR PATCH] [Updated] " thetredev
2024-03-09 23:14 ` backintime: update to 1.4.3 thetredev
2024-03-09 23:17 ` [PR REVIEW] " thetredev
2024-03-09 23:18 ` [PR PATCH] [Updated] " thetredev
2024-03-09 23:21 ` thetredev
2024-03-09 23:21 ` thetredev
2024-03-11 0:01 ` [PR REVIEW] " classabbyamp
2024-03-11 0:07 ` thetredev
2024-03-11 0:09 ` thetredev
2024-03-11 0:12 ` classabbyamp
2024-03-11 0:15 ` thetredev
2024-03-11 0:16 ` [PR PATCH] [Updated] " thetredev
2024-03-11 0:19 ` [PR REVIEW] " thetredev
2024-03-11 0:19 ` thetredev
2024-03-11 0:24 ` [PR PATCH] [Updated] " thetredev
2024-03-11 0:26 ` thetredev
2024-03-11 0:28 ` [PR PATCH] [Updated] " thetredev
2024-03-11 0:29 ` thetredev
2024-03-11 0:39 ` [PR PATCH] [Updated] " thetredev
2024-03-11 0:40 ` thetredev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).