diff options
| author | Mark Wagie | 2021-06-04 08:28:38 -0600 |
|---|---|---|
| committer | Mark Wagie | 2021-06-04 08:28:38 -0600 |
| commit | b5164abd40efc5be530c6a6746665084d93eb42b (patch) | |
| tree | 42af1083361f61823b89d64aa7ca3c06621472c2 | |
| parent | 25673b9020f4f671a75ec292f0d7224ae5e16465 (diff) | |
| download | aur-b5164abd40efc5be530c6a6746665084d93eb42b.tar.gz | |
add patch
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | util-linux.patch | 17 |
4 files changed, 29 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = timeshift pkgdesc = A system restore utility for Linux pkgver = 20.11.1+3+g08d0e59 - pkgrel = 3 + pkgrel = 4 url = https://github.com/teejee2008/timeshift install = timeshift.install arch = i686 @@ -24,7 +24,9 @@ pkgbase = timeshift depends = xorg-xhost optdepends = btrfs-progs: BTRFS support source = git+https://github.com/teejee2008/timeshift.git#commit=08d0e5912b617009f2f0fdb61fb4173cb3576ed4 + source = util-linux.patch sha256sums = SKIP + sha256sums = 4d7f17e697c47784b3c6fb587fa4bef59e8c036de3e04a838ca8d426a592f354 pkgname = timeshift diff --git a/.gitignore b/.gitignore index aec8fd5d8395..a7e4cc459f5e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ !PKGBUILD !.SRCINFO !timeshift.install +!util-linux.patch @@ -6,7 +6,7 @@ # Contributor: Robert Orzanna <orschiro at gmail dot com> pkgname=timeshift pkgver=20.11.1+3+g08d0e59 -pkgrel=3 +pkgrel=4 pkgdesc="A system restore utility for Linux" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') url="https://github.com/teejee2008/timeshift" @@ -17,8 +17,10 @@ checkdepends=('appstream-glib' 'desktop-file-utils') optdepends=('btrfs-progs: BTRFS support') install="$pkgname.install" _commit=08d0e5912b617009f2f0fdb61fb4173cb3576ed4 -source=("git+https://github.com/teejee2008/timeshift.git#commit=$_commit") -sha256sums=('SKIP') +source=("git+https://github.com/teejee2008/timeshift.git#commit=$_commit" + 'util-linux.patch') +sha256sums=('SKIP' + '4d7f17e697c47784b3c6fb587fa4bef59e8c036de3e04a838ca8d426a592f354') pkgver() { cd "$srcdir/$pkgname" @@ -28,6 +30,9 @@ pkgver() { prepare() { cd "$srcdir/$pkgname" sed -i -e 's/--Xcc="-O3" //g' src/makefile + + # https://github.com/teejee2008/timeshift/issues/753 + patch -Np1 -i $srcdir/util-linux.patch } build() { diff --git a/util-linux.patch b/util-linux.patch new file mode 100644 index 000000000000..f6898da89877 --- /dev/null +++ b/util-linux.patch @@ -0,0 +1,17 @@ +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)){ |