From 0a6242e7f6fa4b20b555fc90d5feb756aecc699c Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Fri, 3 Sep 2021 13:03:53 +0200
Subject: linux-libre-tools: update to 5.13.8

The perf-fix-types.patch has been removed becuase it is already
present in the 5.13.8 kernel upstream with the following commit:
20befbb1080307e70c7893ef9840d32e3ef8ac45 (perf tools: Use %zd
for size_t printf formats on 32-bit).

I updated to 5.13.8 as the linux-libre PKGBUILD aso has that
version.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 libre/linux-libre-tools/PKGBUILD             | 10 ++++------
 libre/linux-libre-tools/perf-fix-types.patch | 22 ----------------------
 2 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 libre/linux-libre-tools/perf-fix-types.patch

diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index a54342e1b..9d7ff7091 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -24,7 +24,7 @@ case "$CARCH" in
   armv7h)      pkgname+=('gpio-utils' 'iio-utils') ;;
 esac
 
-pkgver=5.6.1
+pkgver=5.13.8
 pkgver+=_gnu
 pkgrel=1
 license=('GPL2')
@@ -52,15 +52,13 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver//_/-}/l
         'cpupower.default'
         'cpupower.systemd'
         'cpupower.service'
-        'usbipd.service'
-        'perf-fix-types.patch')
-sha256sums=('c5f208af2d199e650ce609eb7ac4ece2a6909af679cc0a1de4dd8438f2ee05d8'
+        'usbipd.service')
+sha256sums=('ccf50deefcdf1d7e75b31d2ad1f869f252575d3795f1977c15605aaa26b6e5bc'
             'SKIP'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'd2e8e5e8b22c6089a91f573aa1c59e442a1f3b67a2c9f047abe3b57d3d6558cc'
             'fa2560630576464739ede14c9292249f4007f36a684bc378add174fc88394550'
-            '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
-            'ca6b56540e2f8d6931c86978910d47e01bc28516c8b9ce616ecf6de2ba3daf4e')
+            '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f')
 validpgpkeys=('474402C8C582DAFBE389C427BCB7CF877E7D47A7') # Alexandre Oliva
 
 prepare() {
diff --git a/libre/linux-libre-tools/perf-fix-types.patch b/libre/linux-libre-tools/perf-fix-types.patch
deleted file mode 100644
index cb6688acf..000000000
--- a/libre/linux-libre-tools/perf-fix-types.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- linux-5.4.1/tools/perf/util/session.c.orig	2019-11-29 04:10:32.000000000 -0500
-+++ linux-5.4.1/tools/perf/util/session.c	2020-01-19 16:13:39.628532016 -0500
-@@ -88,7 +88,7 @@
- 		session->decomp_last = decomp;
- 	}
- 
--	pr_debug("decomp (B): %ld to %ld\n", src_size, decomp_size);
-+	pr_debug("decomp (B): %zd to %zd\n", src_size, decomp_size);
- 
- 	return 0;
- }
---- linux-5.4.1/tools/perf/util/zstd.c.orig	2019-11-29 04:10:32.000000000 -0500
-+++ linux-5.4.1/tools/perf/util/zstd.c	2020-01-19 16:45:37.908560221 -0500
-@@ -99,7 +99,7 @@
- 	while (input.pos < input.size) {
- 		ret = ZSTD_decompressStream(data->dstream, &output, &input);
- 		if (ZSTD_isError(ret)) {
--			pr_err("failed to decompress (B): %ld -> %ld, dst_size %ld : %s\n",
-+			pr_err("failed to decompress (B): %zd -> %zd, dst_size %zd : %s\n",
- 			       src_size, output.size, dst_size, ZSTD_getErrorName(ret));
- 			break;
- 		}
-- 
cgit v1.2.3