From 005bd377db1e3d0cf3e1703f35b3330dd2a7804a Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@fujitsu.com>
Date: Tue, 23 Jan 2024 09:58:30 +0800
Subject: qpdf: upgrade 11.7.0 -> 11.8.0

Changelog:
===========
* Bug fix: treat references to older generations of objects as null.
* When recovering a file's xref table, attempt to find xref streams if a
 traditional trailer dictionary is not found.
* Add --set-page-labels command-line argument and supporting API.
  - QPDFJob::Config::setPageLabels
  - pdf_page_label_e enumerated type
  - QPDFPageLabelDocumentHelper::pageLabelDict
* Support comma-separated numeric values with --collate to select
 different group sizes from different files.
* Support "x" before a group in a numeric range to exclude a group
 from the previous group. Details are in the manual.
* When flattening annotations, preserve annotations without any appearance
 information at all, such as types /Link, /Popup, and /Projection.
* Detect overlong UTF-8 in the UTF-8 decoder, and fix detection of 8-bit
 characters in erroneous UTF-8 strings.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-printing/qpdf/qpdf_11.7.0.bb | 31 ----------------------------
 meta-oe/recipes-printing/qpdf/qpdf_11.8.0.bb | 31 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 meta-oe/recipes-printing/qpdf/qpdf_11.7.0.bb
 create mode 100644 meta-oe/recipes-printing/qpdf/qpdf_11.8.0.bb

(limited to 'meta-oe')

diff --git a/meta-oe/recipes-printing/qpdf/qpdf_11.7.0.bb b/meta-oe/recipes-printing/qpdf/qpdf_11.7.0.bb
deleted file mode 100644
index 92655e3c6..000000000
--- a/meta-oe/recipes-printing/qpdf/qpdf_11.7.0.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "PDF transformation/inspection software"
-HOMEPAGE = "http://qpdf.sourceforge.net"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-DEPENDS = "zlib jpeg ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls', 'openssl', d)}"
-
-SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main"
-SRCREV = "986d2485784d57d7a84cc5af50e67bde827b0dc9"
-
-inherit cmake pkgconfig gettext
-
-EXTRA_OECMAKE = ' \
-	-DRANDOM_DEVICE="/dev/random" \
-	-DBUILD_STATIC_LIBS=OFF \
-	-DALLOW_CRYPTO_NATIVE=OFF \
-	-DUSE_IMPLICIT_CRYPTO=OFF \
-'
-
-LDFLAGS:append:mipsarch = " -latomic"
-LDFLAGS:append:riscv32 = " -latomic"
-
-S="${WORKDIR}/git"
-
-PACKAGECONFIG ?= "gnutls"
-PACKAGECONFIG[gnutls] = "-DREQUIRE_CRYPTO_GNUTLS=ON,-DREQUIRE_CRYPTO_OPENSSL=ON"
-
-do_install:append() {
-    # Change the fully defined path on the target
-    sed -i -e 's|${STAGING_LIBDIR}|${libdir}|g' ${D}${libdir}/cmake/${BPN}/libqpdfTargets.cmake
-}
diff --git a/meta-oe/recipes-printing/qpdf/qpdf_11.8.0.bb b/meta-oe/recipes-printing/qpdf/qpdf_11.8.0.bb
new file mode 100644
index 000000000..a13c9a023
--- /dev/null
+++ b/meta-oe/recipes-printing/qpdf/qpdf_11.8.0.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "PDF transformation/inspection software"
+HOMEPAGE = "http://qpdf.sourceforge.net"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+DEPENDS = "zlib jpeg ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls', 'openssl', d)}"
+
+SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main"
+SRCREV = "452e1f5c20ec6adf62cd296cb9dddacbc06e6ffa"
+
+inherit cmake pkgconfig gettext
+
+EXTRA_OECMAKE = ' \
+	-DRANDOM_DEVICE="/dev/random" \
+	-DBUILD_STATIC_LIBS=OFF \
+	-DALLOW_CRYPTO_NATIVE=OFF \
+	-DUSE_IMPLICIT_CRYPTO=OFF \
+'
+
+LDFLAGS:append:mipsarch = " -latomic"
+LDFLAGS:append:riscv32 = " -latomic"
+
+S="${WORKDIR}/git"
+
+PACKAGECONFIG ?= "gnutls"
+PACKAGECONFIG[gnutls] = "-DREQUIRE_CRYPTO_GNUTLS=ON,-DREQUIRE_CRYPTO_OPENSSL=ON"
+
+do_install:append() {
+    # Change the fully defined path on the target
+    sed -i -e 's|${STAGING_LIBDIR}|${libdir}|g' ${D}${libdir}/cmake/${BPN}/libqpdfTargets.cmake
+}
-- 
cgit v1.2.3-54-g00ecf