[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/

[Sam James]

commit:     bc6f26f3a5f8e1bf549fa072dd6cf78445634e0c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May  7 20:59:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May  7 21:00:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc6f26f3

app-text/poppler: add 22.05.0

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

 app-text/poppler/Manifest                              |  1 +
 .../files/poppler-22.05.0-missing-include.patch        | 18 ++++++++++++++++++
 .../{poppler-9999.ebuild => poppler-22.05.0.ebuild}    |  5 +++--
 app-text/poppler/poppler-9999.ebuild                   |  4 ++--
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index b2044a054a9b..82e20c9de2d5 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,3 +1,4 @@
 DIST poppler-22.01.0.tar.xz 1801984 BLAKE2B f238636a0b1f07e0b70de99d8f0b3afcb7e2424c9dee4a044edaa5bd34753061e58a7c530792264ffb5a520cb4dc7dc52de17573fda350de97bef6346048fb76 SHA512 c6ea908a9188483ca588ac81d3e92dd15a405f90d36cc7059e618c8a7e3e9faeda82717aba5df34adb4a0a94e2fbecd472acec44972272349cc8d5a57b7405d1
 DIST poppler-22.02.0.tar.xz 1807024 BLAKE2B 97d27fb6d31535b5fce0aa518d00ab9da218a8d49dcb45dbaa5ab3cc669d8ffc75e07bd617b5fe9842c8b7b8ac843e9aa07ee0d31504f1e2b6c4f89b2177add6 SHA512 61867241d6d076dae554d654a8ad3b1a073079bad31f45170516b886fabb4c238ff2d49705924da219e128eb4052ac6337121967347600e54f61790dd0eed487
 DIST poppler-22.03.0.tar.xz 1809940 BLAKE2B 0307e9225645b289105fe5a55a712ab821a0961a5dd53467b7db41432d74ec763e9ab0494f6b4d1bed94f7b0c2a74cb849878ad5f0c877fa4df0888f97a10ef6 SHA512 f87bbff4f394f192095da0c00bdf8b5c70b7eb864941225aad2025e91283c3c42a0016a772e7e9ea73a86746251928fc64500f923e8fd841adae1c6e67d72569
+DIST poppler-22.05.0.tar.xz 1828628 BLAKE2B d1757893c841d35cbdeda493afea92046c447dfa0d519ab9a872a75fdb7edbb06bbde78b2e7d41757f5bbff8d1f46c81f7314dff8386d4d686ded4d2cc85d65e SHA512 629098793050f7a901c2a2cf1efcad83c58d26164cf94f4aa3985465f016a8875c62be4fb8ab8005ca00ef061402962e6d6c14eb611ce29f2d71d3ae83f24737

diff --git a/app-text/poppler/files/poppler-22.05.0-missing-include.patch b/app-text/poppler/files/poppler-22.05.0-missing-include.patch
new file mode 100644
index 000000000000..9dfdcfa12406
--- /dev/null
+++ b/app-text/poppler/files/poppler-22.05.0-missing-include.patch
@@ -0,0 +1,18 @@
+https://github.com/freedesktop/poppler/commit/5d543e801d304e4cdbe12506f62c340d509f12f3
+
+From: "Tobias C. Berner" <tcberner@×××××.com>
+Date: Thu, 5 May 2022 04:59:42 +0000
+Subject: [PATCH] Fix c_time usage
+
+In 2656d986d01da5aea4f51c75e4deee569ca88064 the time type was switched
+to time_t, without including the necessary ctime header.
+--- a/cpp/poppler-global.h
++++ b/cpp/poppler-global.h
+@@ -25,6 +25,7 @@
+ 
+ #include "poppler_cpp_export.h"
+ 
++#include <ctime>
+ #include <iosfwd>
+ #include <string>
+ #include <vector>

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-22.05.0.ebuild
similarity index 95%
copy from app-text/poppler/poppler-9999.ebuild
copy to app-text/poppler/poppler-22.05.0.ebuild
index 68361e6ea96e..5d80bacd8b0c 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-22.05.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/120"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/121"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -34,7 +34,7 @@ DEPEND="
 		introspection? ( dev-libs/gobject-introspection:= )
 	)
 	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
 	lcms? ( media-libs/lcms:2 )
 	nss? ( >=dev-libs/nss-3.19:0 )
@@ -63,6 +63,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
 	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+	"${FILESDIR}/${P}-missing-include.patch"
 )
 
 src_prepare() {

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 68361e6ea96e..945267131b33 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/120"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/121"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -34,7 +34,7 @@ DEPEND="
 		introspection? ( dev-libs/gobject-introspection:= )
 	)
 	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
 	lcms? ( media-libs/lcms:2 )
 	nss? ( >=dev-libs/nss-3.19:0 )