From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C9A31158017 for ; Thu, 30 Sep 2021 19:39:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7A1EE0966; Thu, 30 Sep 2021 19:39:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD632E0966 for ; Thu, 30 Sep 2021 19:39:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D330C342CCC for ; Thu, 30 Sep 2021 19:39:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C6CF150 for ; Thu, 30 Sep 2021 19:39:42 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1633027875.954ab4ad5ccb7f579176d22066f5a540d0059f05.arthurzam@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: app-backup/timeshift/, app-backup/timeshift/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch app-backup/timeshift/timeshift-20.11.1.ebuild X-VCS-Directories: app-backup/timeshift/files/ app-backup/timeshift/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 954ab4ad5ccb7f579176d22066f5a540d0059f05 X-VCS-Branch: master Date: Thu, 30 Sep 2021 19:39:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 656ab94c-a531-42cc-b5f3-c079b6d6ae4e X-Archives-Hash: f75895a724f55684d9fe88992fd13d1b commit: 954ab4ad5ccb7f579176d22066f5a540d0059f05 Author: Pascal Jäger leimstift de> AuthorDate: Thu Sep 30 18:44:53 2021 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Thu Sep 30 18:51:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=954ab4ad app-backup/timeshift: fixed https://bugs.gentoo.org/794637 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Pascal Jäger leimstift.de> .../files/timeshift-20.11.1-fix-util-linux-update.patch | 15 +++++++++++++++ app-backup/timeshift/timeshift-20.11.1.ebuild | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch b/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch new file mode 100644 index 000000000..0206b9096 --- /dev/null +++ b/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch @@ -0,0 +1,15 @@ +--- 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/app-backup/timeshift/timeshift-20.11.1.ebuild b/app-backup/timeshift/timeshift-20.11.1.ebuild index 4e65c8893..5d88a64b2 100644 --- a/app-backup/timeshift/timeshift-20.11.1.ebuild +++ b/app-backup/timeshift/timeshift-20.11.1.ebuild @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" ) +PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" "${FILESDIR}/${P}-fix-util-linux-update.patch" ) DEPEND=" dev-libs/json-glib