summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-01-09 07:40:14 +0000
committerSam James <sam@gentoo.org>2023-01-09 09:45:01 +0000
commitcd355f0fdf5e1a8ab9348432de8cfd534af03800 (patch)
tree35516e4b403d4e9a834993c8545500f7b8bb0a38
parentecm.eclass: Add Qt 5.15.8 to ECM_QTHELP Portage bug workaround (diff)
downloadgentoo-cd355f0fdf5e1a8ab9348432de8cfd534af03800.tar.gz
gentoo-cd355f0fdf5e1a8ab9348432de8cfd534af03800.tar.bz2
gentoo-cd355f0fdf5e1a8ab9348432de8cfd534af03800.zip
dev-util/diffoscope: add patch metadata, now merged upstream
Bug: https://bugs.gentoo.org/889250 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--dev-util/diffoscope/files/diffoscope-231-pypdf.patch12
1 files changed, 11 insertions, 1 deletions
diff --git a/dev-util/diffoscope/files/diffoscope-231-pypdf.patch b/dev-util/diffoscope/files/diffoscope-231-pypdf.patch
index 7b4365c80eca..4376e03f668c 100644
--- a/dev-util/diffoscope/files/diffoscope-231-pypdf.patch
+++ b/dev-util/diffoscope/files/diffoscope-231-pypdf.patch
@@ -1,6 +1,16 @@
+https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/6aed2e5320b5d412f0f81a36dd493ae4bd7c3ff4
https://bugs.gentoo.org/889250
-(Can't yet submit upstream as can't login to gitlab.)
+From 6aed2e5320b5d412f0f81a36dd493ae4bd7c3ff4 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 9 Jan 2023 04:05:09 +0000
+Subject: [PATCH] Support PyPDF version 3.
+
+pypdf upstream has renamed the package from PyPDF2 to pypdf. This patch
+supporst the new pypdf version while keeping compatibility for older PyPDF2,
+adjusting to API changes.
+
+Signed-off-by: Chris Lamb <lamby@debian.org>
--- a/diffoscope.egg-info/requires.txt
+++ b/diffoscope.egg-info/requires.txt
@@ -11,7 +11,7 @@ binwalk