[ptxdist] [PATCH v2 1/4] qpdf: version bump 7.0.0 -> 8.2.1

[Roland Hieber <r.hieber@pengutronix.de>]

Development moved to GitHub.

Remove patch, qpdf now builds fine without it (see referenced Pull
Request). However, it needs to generate its own ./configure first, so
symlink autogen.sh.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 ...e-libjpeg-dependency-from-pkg-config.patch | 40 -------------------
 patches/qpdf-7.0.0/series                     |  4 --
 patches/qpdf-8.2.1/autogen.sh                 |  1 +
 rules/qpdf.make                               |  6 +--
 4 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 patches/qpdf-7.0.0/0001-Remove-libjpeg-dependency-from-pkg-config.patch
 delete mode 100644 patches/qpdf-7.0.0/series
 create mode 120000 patches/qpdf-8.2.1/autogen.sh

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
diff --git a/patches/qpdf-8.2.1/autogen.sh b/patches/qpdf-8.2.1/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/qpdf-8.2.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/rules/qpdf.make b/rules/qpdf.make
index 5995f22b2..b13945bac 100644
--- a/rules/qpdf.make
+++ b/rules/qpdf.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_QPDF) += qpdf
 #
 # Paths and names
 #
-QPDF_VERSION	:= 7.0.0
-QPDF_MD5	:= c3ff408f69b3a6b2b3b4c8b373b2600c
+QPDF_VERSION	:= 8.2.1
+QPDF_MD5	:= 36661781b5d57a85664dc15deda4df78
 QPDF		:= qpdf-$(QPDF_VERSION)
 QPDF_SUFFIX	:= tar.gz
-QPDF_URL	:= $(call ptx/mirror, SF, /qpdf/qpdf/$(QPDF_VERSION)/$(QPDF).$(QPDF_SUFFIX))
+QPDF_URL	:= https://github.com/qpdf/qpdf/archive/release-$(QPDF).$(QPDF_SUFFIX)
 QPDF_SOURCE	:= $(SRCDIR)/$(QPDF).$(QPDF_SUFFIX)
 QPDF_DIR	:= $(BUILDDIR)/$(QPDF)
 QPDF_LICENSE	:= Apache-2.0
-- 
2.19.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de