commit:     cd355f0fdf5e1a8ab9348432de8cfd534af03800
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 07:40:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  9 09:45:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd355f0f

dev-util/diffoscope: add patch metadata, now merged upstream

Bug: https://bugs.gentoo.org/889250
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/diffoscope/files/diffoscope-231-pypdf.patch | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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 <[email protected]>
+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 <[email protected]>
 --- a/diffoscope.egg-info/requires.txt
 +++ b/diffoscope.egg-info/requires.txt
 @@ -11,7 +11,7 @@ binwalk

Reply via email to