Re: [PR PATCH] [Updated] timeshift - fix for #425, #753, #755

[jchook <jchook@users.noreply.github.com>]

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

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

https://github.com/jchook/void-packages timeshift
https://github.com/void-linux/void-packages/pull/32329

timeshift - fix for #425, #753, #755
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] 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
-->

----

Timeshift is virtually unusable due to a change in util-linux, see:

- https://github.com/teejee2008/timeshift/issues/425
- https://github.com/teejee2008/timeshift/issues/753
- https://github.com/teejee2008/timeshift/issues/755

This PR applies an [official patch](https://github.com/teejee2008/timeshift/commit/d437358ac3debf7625aefda4d0bd387a91b69df5) to make the package usable on Void until the next official release, presumably later [this year](https://github.com/teejee2008/timeshift/issues/648).

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

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

From de0631ec3c852c9ad9c0b56e2bd3bcf54fe214f1 Mon Sep 17 00:00:00 2001
From: Wes Roberts <g0r6p@a.zinc.email>
Date: Thu, 5 Aug 2021 17:54:48 -0400
Subject: [PATCH] timeshift: fix compatibility with util-linux 2.37.1.

Timeshift will only start in "Live USB Mode".

Upstream issues:
https://github.com/teejee2008/timeshift/issues/425
https://github.com/teejee2008/timeshift/issues/753
https://github.com/teejee2008/timeshift/issues/755
---
 srcpkgs/timeshift/patches/d437358a.patch | 23 +++++++++++++++++++++++
 srcpkgs/timeshift/template               |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch

diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"