summaryrefslogtreecommitdiff
path: root/dev-util/diffoscope
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-01-09 12:18:21 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-01-09 12:18:21 +0000
commit83c424cc446967ca87809e13c2ef264eebce79f8 (patch)
treebce1c3a7e1f36095b5a4956a97e7ec63d3414d41 /dev-util/diffoscope
parent92ed25ce2ff461f502de1dd96ab0accd683b69d2 (diff)
gentoo auto-resync : 09:01:2023 - 12:18:20
Diffstat (limited to 'dev-util/diffoscope')
-rw-r--r--dev-util/diffoscope/Manifest2
-rw-r--r--dev-util/diffoscope/files/diffoscope-231-pypdf.patch12
2 files changed, 12 insertions, 2 deletions
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index fb1f07c36198..e2b20a889eda 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,4 +1,4 @@
-AUX diffoscope-231-pypdf.patch 5490 BLAKE2B a0226b4cd7b8b0d257968597c19706bf228c720fb5d13ab93aa68187f739c6dcc8e222c5a79b1e4e3ab6209842535080b52a7885d6538b456de8c94ec9154e19 SHA512 91afae48467e84ac85f70854fee56df731fda445b32e852dcf77f9d3afb8f5c6964e3a9912bb332789c60a79da84e6251e270a977ee2f5b5cf16d12eeb312689
+AUX diffoscope-231-pypdf.patch 5947 BLAKE2B 98ccfdcb3d7d62e34eac7dd59ba455996c7621f8a9ef3023c90969a42d69c3589af4db2d571e6c2d063cf44dc97f95d2872f8095b4b56e75d5350bf2e1b6e4ea SHA512 37cdcc4ecd7788f39e26f7e0581f81642ea2dd77560ff8423914f9f41e4cb121b5175a0fb660c93fb483dc94215eebcb3f22e5ab6398a3dd29158af128c4d074
DIST diffoscope-229.tar.gz 3164192 BLAKE2B bee9fa1561ddcfde98cfa44cd6d66a28c636dbc7f3ec1f4895e91dfd3b66c039b68d53be0528b94c112552069886c3c81de4d9b9bc9038d183afdc9fdde6ddb9 SHA512 825c9c33f3088ba082ea3b998594445987558ee62b8b1fbfcded9b72a739faaa73908f8753b8772b3b1a8a43dbcfd52978265a18bdd92605defcd174884ccb23
DIST diffoscope-230.tar.gz 3164600 BLAKE2B f5ad44ff36d07fc5724895e661e0946b292146d004e97159fef1cb58ff38669702a3990740e4ea34300a9b48aeb10263aeb6bb332da3ec987c355ed5b910fedd SHA512 e025e5f95ae2fb9de466b886c58a44f64e0f654fb049bf9f035209fe7ca1fd0ccc14a382b17085c13bc9f2be0d368482d57a071a577cb87628ae7eb0060158ad
DIST diffoscope-231.tar.gz 3164686 BLAKE2B 5fe1546f63a047def4d1c9acc94360085be87460de1c106381532d937d1ad16be64749b9021caa7980a61a0dfd822ed7163e0f52bb0cab0520962b84bb184650 SHA512 544510de0790fc8f0c62030bc557f923bad6d5c39b7364e9944ebcf9bc5c1ecf2b9ecc91cf9142e54a23b1f004f53e96ed5b6f2f4637fa76cebd2ed7d0e4721d
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