Skip to content

Commit

Permalink
timeshift: fix compatibility with util-linux 2.37.1.
Browse files Browse the repository at this point in the history
Timeshift will only start in "Live USB Mode".

Upstream issues:
teejee2008/timeshift#425
teejee2008/timeshift#753
teejee2008/timeshift#755
  • Loading branch information
jchook authored and ericonr committed Aug 6, 2021
1 parent 34dc637 commit 38ecf6a
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
23 changes: 23 additions & 0 deletions srcpkgs/timeshift/patches/d437358a.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
commit d437358ac3debf7625aefda4d0bd387a91b69df5
Author: Tony George <[email protected]>
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)){
2 changes: 1 addition & 1 deletion srcpkgs/timeshift/template
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 38ecf6a

Please sign in to comment.