diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-06 11:37:06 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-06 12:58:09 +0200 |
| commit | 217d69c4eb6cec3a4ffd0e51443301190dd0a396 (patch) | |
| tree | 2318381ec0a21fc175b8260eb6371843cd235d90 /patches | |
| parent | 48fe1b1915eed03ea4ebbd32ff0decd039d66f86 (diff) | |
| download | ptxdist-217d69c4eb6cec3a4ffd0e51443301190dd0a396.tar.gz ptxdist-217d69c4eb6cec3a4ffd0e51443301190dd0a396.tar.xz | |
qpdf: version bump 7.0.0 -> 8.4.2
The patch is no longer needed: We now use libjpeg-turbo which provides a
libjpeg.pc.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/qpdf-7.0.0/0001-Remove-libjpeg-dependency-from-pkg-config.patch | 40 | ||||
| -rw-r--r-- | patches/qpdf-7.0.0/series | 4 |
2 files changed, 0 insertions, 44 deletions
diff --git a/patches/qpdf-7.0.0/0001-Remove-libjpeg-dependency-from-pkg-config.patch b/patches/qpdf-7.0.0/0001-Remove-libjpeg-dependency-from-pkg-config.patch deleted file mode 100644 index 7255159a1..000000000 --- a/patches/qpdf-7.0.0/0001-Remove-libjpeg-dependency-from-pkg-config.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Roland Hieber <r.hieber@pengutronix.de> -Date: Mon, 25 Sep 2017 13:01:04 +0200 -Subject: [PATCH] Remove libjpeg dependency from pkg-config - -I'm linking QPDF with the original libjpeg-9a from http://ijg.org. This -works well. But when I then compile cups-filters with QPDF support, -cups-filters' configure is confused about it, because libjpeg does not -ship pkg-config definitions: - - [...] - checking for ZLIB... yes - checking for LIBQPDF... no - configure: error: Package requirements (libqpdf >= 3.0.2) were not met: - - Package 'libjpeg', required by 'libqpdf', not found - - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - -We cannot solve this problem in QPDF, so just remove the libjpeg -dependency from the Requires.private variable. - -Forwarded: https://github.com/qpdf/qpdf/pull/157 -Signed-off-by: Roland Hieber <r.hieber@pengutronix.de> ---- - libqpdf.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libqpdf.pc.in b/libqpdf.pc.in -index d45df49ed73b..8ece48734941 100644 ---- a/libqpdf.pc.in -+++ b/libqpdf.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: libqpdf - Description: PDF transformation library - Version: @PACKAGE_VERSION@ --Requires.private: zlib, libjpeg -+Requires.private: zlib - Libs: -L${libdir} -lqpdf - Cflags: -I${includedir} diff --git a/patches/qpdf-7.0.0/series b/patches/qpdf-7.0.0/series deleted file mode 100644 index 0de60c199..000000000 --- a/patches/qpdf-7.0.0/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Remove-libjpeg-dependency-from-pkg-config.patch -# c373cfc66b49ecd3549c751d0c0febbe - git-ptx-patches magic |