Sync from SUSE:SLFO:Main poppler revision f03e84c2f47f572e18e3910b614d0361

This commit is contained in:
2025-03-15 14:56:58 +01:00
parent efb01405c3
commit c0f0d74f5b
10 changed files with 221 additions and 223 deletions

BIN
poppler-24.02.0.tar.xz (Stored with Git LFS)

Binary file not shown.

View File

@@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW8H38ACgkQOmpNuDnq
ptdTsA//ZYb4uiQL4SDml3OESrileRN0mhPvUSpIRNan8fX3xnwMsjEmALuC0rYM
p/5N1PCHXzrRzxk6Vdm8CLSUBPe2+0cDDmHiznOwj1cAyXM3tZhtrZoaPPdKjroC
1q4/OdBti9KLDL5inVqFihSicLJXWqTwFwySubSJ7thpLFKeOHU/W65BUGUsazZ3
QAnaLfEdK+1YnZb1QfbKPu32hD+PAljc/3NbC5t65G+DjlNYMT863eTTQP2xU+9t
CJHjZ45N3pBr51Ug7JkBfg0OpkBgsuXDQENtPrVRLzkypwIwRTZzILU5TMOZ6x+p
YVvWqYunITi9LQlZraUw4vMU/Tw1nCwt44WcUpGj9RP6sM0ChkYE6n5IvEkkvVIJ
GqSUZ3p+3Rx/gr+vKEH2iktatsDFvwZbrqQf55L+mF4k+6HVLv8qR9XVsNOHEYB3
B6Hnb5yOOSqhN1HmTP3riMkiDyvAWIyREETVZbTsaugEy/5Df7E9C5PMDkcO2Uhz
iVDDPMG//fN5lwkqm5LOctO9d2gvOF56FzO3doaaBHVmOiMFcVtlXxG1Vw+x2we6
r88gr6wgm77SFpNMJd3Wfno1Vcxh8ezSaW1/gKJUry/ruOvSK25HPnUVU9AScxKn
RNfLsOR3XYXMf7ix5u3jpCGV36x38IqCoagOCIhALNiPL4Aa5oA=
=/vGT
-----END PGP SIGNATURE-----

BIN
poppler-25.01.0.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmd2WbgACgkQOmpNuDnq
ptdtig/+JUGkUpABSx71UTP1gNRMQYhkU/X3r4QvTlUm4TE06RbpXR3+iB8pshFA
tqQkPdWCNxzHenZhOdh9F4nCIxCW5an5Z5lyYYcGSC0A6nkT77orcXxucdc97nQE
WOVgYHzisIUod3uKzfQTxzUcB8Ir7aDeeVCrOLkrRJrUu/9Bl1P8ZUV9rHNmbsjZ
swZ+i+SPnql9+bV8UdndBZw4F/1cWMMW24Kp9EpZ2RlnOtw/+bGXCBb3/Wwl3kxi
gTvZQxZcFEWCV13tKJpLcA+mDNwZu1xNyicZ/z1WWlhPPAS7lXbLsZqfw3UtYjZ6
5Qg7WscwcwCZVzL0kZJPcE196tiIR+lKEA7oJeWz9fBnloB4scXR+9agnplp0R/M
uovcNQ0fqQD6Y7cQrdAo8gV+iA2AAoE1U/myyyzdZRXOlM/0TAp4xXTykwIIaazT
cF24AUzKj+zVQYiRUFem9HMccp6LTTvwCOdRXFCgKm/hYnucHhP+ehV1kFnOXvEh
Bx7+vIsoU/CJJ6xjPmoYqQa4iKj7Sj4b4H4EuNLpSm6hoOz/16RONXn6w47ocOZu
9dLTcVL4c9BPip8DwKBpzpkhXDtzGEf8jJ+mtv6L1SA5hYV8H9w973tqddiQHzHE
nfpjDyYbcjn9f1ebm9q59jpY2E4rXcU8eNQO5UiW5wY+99BA7nw=
=qICU
-----END PGP SIGNATURE-----

View File

@@ -1,60 +0,0 @@
Index: poppler-24.12.0/poppler/JBIG2Stream.cc
===================================================================
--- poppler-24.12.0.orig/poppler/JBIG2Stream.cc
+++ poppler-24.12.0/poppler/JBIG2Stream.cc
@@ -766,7 +766,7 @@ void JBIG2Bitmap::duplicateRow(int yDest
void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y, unsigned int combOp)
{
- int x0, x1, y0, y1, xx, yy;
+ int x0, x1, y0, y1, xx, yy, yyy;
unsigned char *srcPtr, *destPtr;
unsigned int src0, src1, src, dest, s1, s2, m1, m2, m3;
bool oneByte;
@@ -813,14 +813,17 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *b
oneByte = x0 == ((x1 - 1) & ~7);
for (yy = y0; yy < y1; ++yy) {
- if (unlikely((y + yy >= h) || (y + yy < 0))) {
+ if (unlikely(checkedAdd(y, yy, &yyy))) {
+ continue;
+ }
+ if (unlikely((yyy >= h) || (yyy < 0))) {
continue;
}
// one byte per line -- need to mask both left and right side
if (oneByte) {
if (x >= 0) {
- destPtr = data + (y + yy) * line + (x >> 3);
+ destPtr = data + yyy * line + (x >> 3);
srcPtr = bitmap->data + yy * bitmap->line;
dest = *destPtr;
src1 = *srcPtr;
@@ -843,7 +846,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *b
}
*destPtr = dest;
} else {
- destPtr = data + (y + yy) * line;
+ destPtr = data + yyy * line;
srcPtr = bitmap->data + yy * bitmap->line + (-x >> 3);
dest = *destPtr;
src1 = *srcPtr;
@@ -873,7 +876,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *b
// left-most byte
if (x >= 0) {
- destPtr = data + (y + yy) * line + (x >> 3);
+ destPtr = data + yyy * line + (x >> 3);
srcPtr = bitmap->data + yy * bitmap->line;
src1 = *srcPtr++;
dest = *destPtr;
@@ -897,7 +900,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *b
*destPtr++ = dest;
xx = x0 + 8;
} else {
- destPtr = data + (y + yy) * line;
+ destPtr = data + yyy * line;
srcPtr = bitmap->data + yy * bitmap->line + (-x >> 3);
src1 = *srcPtr++;
xx = x0;

View File

@@ -1,109 +0,0 @@
From 0554731052d1a97745cb179ab0d45620589dd9c4 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Fri, 7 Jun 2024 00:54:55 +0200
Subject: [PATCH] pdfinfo: Fix crash in broken documents when using -dests
---
utils/pdfinfo.cc | 35 +++++++++++++++--------------------
1 file changed, 15 insertions(+), 20 deletions(-)
diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc
index 5d37ef64f..7d569749b 100644
--- a/utils/pdfinfo.cc
+++ b/utils/pdfinfo.cc
@@ -15,7 +15,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2006 Dom Lachowicz <cinamod@hotmail.com>
-// Copyright (C) 2007-2010, 2012, 2016-2022 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2007-2010, 2012, 2016-2022, 2024 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2011 Vittal Aithal <vittal.aithal@cognidox.com>
// Copyright (C) 2012, 2013, 2016-2018, 2021 Adrian Johnson <ajohnson@redneon.com>
@@ -113,16 +113,21 @@ static const ArgDesc argDesc[] = { { "-f", argInt, &firstPage, 0, "first page to
{ "-?", argFlag, &printHelp, 0, "print usage information" },
{} };
-static void printTextString(const GooString *s, const UnicodeMap *uMap)
+static void printStdTextString(const std::string &s, const UnicodeMap *uMap)
{
char buf[8];
- std::vector<Unicode> u = TextStringToUCS4(s->toStr());
+ const std::vector<Unicode> u = TextStringToUCS4(s);
for (const auto &c : u) {
int n = uMap->mapUnicode(c, buf, sizeof(buf));
fwrite(buf, 1, n, stdout);
}
}
+static void printTextString(const GooString *s, const UnicodeMap *uMap)
+{
+ printStdTextString(s->toStr(), uMap);
+}
+
static void printUCS4String(const Unicode *u, int len, const UnicodeMap *uMap)
{
char buf[8];
@@ -294,11 +299,6 @@ static void printStruct(const StructElement *element, unsigned indent)
}
}
-struct GooStringCompare
-{
- bool operator()(GooString *lhs, GooString *rhs) const { return lhs->cmp(const_cast<GooString *>(rhs)) < 0; }
-};
-
static void printLinkDest(const std::unique_ptr<LinkDest> &dest)
{
GooString s;
@@ -369,29 +369,25 @@ static void printLinkDest(const std::unique_ptr<LinkDest> &dest)
static void printDestinations(PDFDoc *doc, const UnicodeMap *uMap)
{
- std::map<Ref, std::map<GooString *, std::unique_ptr<LinkDest>, GooStringCompare>> map;
+ std::map<Ref, std::map<std::string, std::unique_ptr<LinkDest>>> map;
int numDests = doc->getCatalog()->numDestNameTree();
for (int i = 0; i < numDests; i++) {
- GooString *name = new GooString(doc->getCatalog()->getDestNameTreeName(i));
+ const GooString *name = doc->getCatalog()->getDestNameTreeName(i);
std::unique_ptr<LinkDest> dest = doc->getCatalog()->getDestNameTreeDest(i);
- if (dest && dest->isPageRef()) {
+ if (name && dest && dest->isPageRef()) {
Ref pageRef = dest->getPageRef();
- map[pageRef].insert(std::make_pair(name, std::move(dest)));
- } else {
- delete name;
+ map[pageRef].insert(std::make_pair(name->toStr(), std::move(dest)));
}
}
numDests = doc->getCatalog()->numDests();
for (int i = 0; i < numDests; i++) {
- GooString *name = new GooString(doc->getCatalog()->getDestsName(i));
+ const char *name = doc->getCatalog()->getDestsName(i);
std::unique_ptr<LinkDest> dest = doc->getCatalog()->getDestsDest(i);
- if (dest && dest->isPageRef()) {
+ if (name && dest && dest->isPageRef()) {
Ref pageRef = dest->getPageRef();
map[pageRef].insert(std::make_pair(name, std::move(dest)));
- } else {
- delete name;
}
}
@@ -405,9 +401,8 @@ static void printDestinations(PDFDoc *doc, const UnicodeMap *uMap)
printf("%4d ", i);
printLinkDest(it.second);
printf(" \"");
- printTextString(it.first, uMap);
+ printStdTextString(it.first, uMap);
printf("\"\n");
- delete it.first;
}
}
}
--
GitLab

View File

@@ -1,19 +1,175 @@
-------------------------------------------------------------------
Mon Dec 23 10:23:51 UTC 2024 - pgajdos@suse.com
Fri Jan 3 17:08:08 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
- security update
- added patches
fix CVE-2024-56378 [bsc#1234795], out-of-bounds read vulnerability within the JBIG2Bitmap::combine function in JBIG2Stream.cc
+ poppler-CVE-2024-56378.patch
- Update to version 25.01.0:
+ core:
- TextOutputDev: Better detect fakebold words
- TextOutputDev: Faster sorting algorithm
- Internal code improvements
- Fix crashes in malformed documents
+ cpp: Remove rect parameter from image::copy, it was never
implemented
+ qt6: Fix crash in Submit Forms if document links to non
existing field
+ qt5: Fix crash in Submit Forms if document links to non
existing field
+ glib: mark transfer of poppler_page_get_selected_region
+ utils: pdfdetach: Make -savefile work with Unicode strings.
+ build system: Don't update pdfsig.pot when POT-Creation-date is
the only change.
- Drop poppler-CVE-2024-56378.patch: Fixed upstream.
- Bump poppler sover and poppler_cpp_sover following upstream
changes.
-------------------------------------------------------------------
Thu Jul 4 07:39:57 UTC 2024 - pgajdos@suse.com
Mon Dec 23 09:38:52 UTC 2024 - pgajdos@suse.com
- security update
- Security update:
+ Added patch; fix CVE-2024-56378 [bsc#1234795], out-of-bounds
read vulnerability within the JBIG2Bitmap::combine function in
JBIG2Stream.cc (poppler-CVE-2024-56378.patch)
-------------------------------------------------------------------
Thu Dec 19 16:15:55 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 24.12.0:
+ core:
- cairo:
. Fix rendering of JPX images with transparency
. Fix JPX transparency regression
- Override encoding for Zapf Dingbats
- Improve Signature appearance generation code
- Improve Stamp appearance generation code
- Mark certificates that can do qualified signing
- Internal code improvements
+ qt6: Mark certificates that can do qualified signing
+ glib: Add free text annotations support
+ utils: pdfsig: Improve man page
+ build system:
- Install some more internal headers
- Fix build with in-tree build
- For changes between 24.07 and this release, please see NEWS file.
- Bump sover following upstream changes.
- Rebase patches with quilt.
-------------------------------------------------------------------
Tue Sep 17 11:55:59 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
- Poppler can load ghostscript fonts (n022003l.pfb and the like)
so the package now recommends the ghostscript-fonts-std package
(boo#1230636).
-------------------------------------------------------------------
Sat Aug 3 10:25:26 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
- add Provides for binaries in poppler-tools package
-------------------------------------------------------------------
Tue Jul 2 20:54:31 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
- Use correct version for freetype BuildRequires.
-------------------------------------------------------------------
Tue Jul 2 20:12:31 UTC 2024 - Dirk Müller <dmueller@suse.com>
- update to 24.07.0:
core:
* Fix crashes in broken files
* Internal code improvements
qt6:
* Add getters for document additional actions
* Implement reset forms link
qt5:
* Add getters for document additional actions
* Implement reset forms link
utils:
* pdfinfo: Fix crash in broken documents when using -dests
build system:
* Mark glib-mkenums as required
- drop poppler-CVE-2024-6239.patch (upstream)
-------------------------------------------------------------------
Tue Jun 25 07:44:32 UTC 2024 - pgajdos@suse.com
- version update to 24.06.1
Release 24.06.1:
Re-release 24.06.0 with increased SOVERSION of poppler internal library
Release 24.06.0:
core:
* Performance improvements in some files
* Fix some issues with files bigger than 2^31 bytes
* Remove all cairo include guards for cairo < 1.16
* Fix MSVC build
* Internal code improvements
qt6:
* Update Qt6 doc example
* Use the non deprecated version of QString::fromUcs4
glib:
* properly document return value from poppler_font_info_scan
Release 24.05.0:
core:
* Fix signing not being totally correct in some kind of PDF files
* Assume "Adobe-Identity" for character collection. Issue #1465
* Small improvements in annotation font rendering
* Remove some GooString methods, use std::string ones instead
* Move some GooString methods to UTF.h
* Fix crash in broken files
cpp:
* cpp: Fix crash extracting text and font in some files. Issue #1477
* Change base class of ustring to char16_t
qt6:
* Add async API for certificate validation
* Fix text extraction for Landscape/Seascape pages
qt5:
* Add async API for certificate validation
* Fix text extraction for Landscape/Seascape pages
utils:
* pdfdetach: Small code improvements
* pdftops: Write compliant ps header
build system:
* Increase minimum supported base to that provided by Ubuntu 22.04
Release 24.04.0:
core:
* Optimize page text extraction speed
* Fix clipping path handling in some files. Issue #739
* Fix regression in text selection
* Fix text search across lines between paragraphs
qt6:
* Fix crash in SoundObject::data
utils:
* pdfsig: Add Catalan translation
build system:
* Build code as C++20
- modified patches
% reduce-boost-required-version.patch (refreshed)
% reduce-libtiff-required-version.patch (refreshed)
- added patches
fix CVE-2024-6239 [bsc#1226916], crash when using pdfinfo with -dests parameter on malformed input files
+ poppler-CVE-2024-6239.patch
-------------------------------------------------------------------
Mon Mar 4 07:25:40 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
- version update to 24.03.0
Release 24.03.0:
core:
* Fix opening some malformed files. Issue #1447
* Skip drawing image when it has singular matrix. Issue #1114
* Fix crash on malformed files
* Small internal code cleanup
utils:
* pdfdetach: Fix potential directory traversal
* pdfimages: Enable to print filenames to stdout.
* pdfsig: Add visible name/date when signing an existing form
signature field
- Bump poppler_sover to 135 following upstream changes.
-------------------------------------------------------------------
Thu Feb 29 14:42:41 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %autosetup macro. Allows to eliminate the usage of deprecated
%patchN.
-------------------------------------------------------------------
Wed Feb 14 15:41:55 UTC 2024 - pgajdos@suse.com
@@ -40,7 +196,7 @@ Tue Dec 26 10:12:06 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>
- version update to 23.12.0
core:
* Rewrite FoFiType1::parse to be more flexible
* Small internal code refactoring
* Small internal code refactoring
-------------------------------------------------------------------
Thu Nov 16 12:12:13 UTC 2023 - pgajdos@suse.com

View File

@@ -1,7 +1,7 @@
#
# spec file for package poppler
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,15 +24,15 @@
%endif
# Actual version of poppler-data:
%define poppler_data_version 0.4.11
%define poppler_sover 134
%define poppler_cpp_sover 0
%define poppler_sover 145
%define poppler_cpp_sover 2
%define poppler_glib_sover 8
%define poppler_qt5_sover 1
%define poppler_qt6_sover 3
%define poppler_api 0.18
%define poppler_apipkg 0_18
Name: poppler%{?psuffix}
Version: 24.02.0
Version: 25.01.0
Release: 0
Summary: PDF Rendering Library
License: GPL-2.0-only OR GPL-3.0-only
@@ -44,10 +44,7 @@ Source90: poppler.keyring
Source99: baselibs.conf
Patch0: reduce-boost-required-version.patch
Patch1: reduce-libtiff-required-version.patch
# CVE-2024-6239 [bsc#1226916], crash when using pdfinfo with -dests parameter on malformed input files
Patch2: poppler-CVE-2024-6239.patch
# CVE-2024-56378 [bsc#1234795], out-of-bounds read vulnerability within the JBIG2Bitmap::combine function in JBIG2Stream.cc
Patch3: poppler-CVE-2024-56378.patch
BuildRequires: cmake >= 3.10
BuildRequires: gtk-doc
BuildRequires: libboost_headers-devel >= 1.66
@@ -61,7 +58,7 @@ BuildRequires: pkgconfig(cairo-pdf)
BuildRequires: pkgconfig(cairo-ps)
BuildRequires: pkgconfig(cairo-svg)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(freetype2) >= 24.0.18
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.36
BuildRequires: pkgconfig(glib-2.0) >= 2.56
BuildRequires: pkgconfig(gobject-2.0) >= 2.41
@@ -108,6 +105,7 @@ developed by Derek Noonburg of Glyph and Cog, LLC.
%package -n libpoppler%{poppler_sover}
Summary: PDF Rendering Library
Group: System/Libraries
Recommends: ghostscript-fonts-std
Recommends: poppler-data >= %{poppler_data_version}
%description -n libpoppler%{poppler_sover}
@@ -163,6 +161,19 @@ developed by Derek Noonburg of Glyph and Cog, LLC.
Summary: PDF Rendering Library Tools
Group: Productivity/Publishing/PDF
Requires: libpoppler%{poppler_sover} >= %{version}
Provides: pdfattach = %{version}
Provides: pdfdetach = %{version}
Provides: pdffonts = %{version}
Provides: pdfimages = %{version}
Provides: pdfinfo = %{version}
Provides: pdfseparate = %{version}
Provides: pdfsig = %{version}
Provides: pdftocairo = %{version}
Provides: pdftohtml = %{version}
Provides: pdftoppm = %{version}
Provides: pdftops = %{version}
Provides: pdftotext = %{version}
Provides: pdfunite = %{version}
%description tools
Poppler is a PDF rendering library, forked from the xpdf PDF viewer
@@ -218,11 +229,7 @@ Poppler is a PDF rendering library, forked from the xpdf PDF viewer
developed by Derek Noonburg of Glyph and Cog, LLC.
%prep
%setup -q -n poppler-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%autosetup -p1 -n poppler-%{version}
%build
%if "%{flavor}" == "qt5"
@@ -268,6 +275,10 @@ export LD_LIBRARY_PATH=$(pwd)/build
cd %{buildroot} && find . -type f -o -type l | grep -v qt | xargs rm -v
%endif
%if "%{flavor}" == ""
%find_lang pdfsig %name-tools.lang
%endif
echo > %{SOURCE99}
%if "%{flavor}" == "qt5"
echo "libpoppler-qt5-%{poppler_qt5_sover}" >> %{SOURCE99}
@@ -322,10 +333,10 @@ echo "libpoppler-cpp%{poppler_cpp_sover}" >> %{SOURCE99}
%files -n typelib-1_0-Poppler-%{poppler_apipkg}
%{_libdir}/girepository-1.0/Poppler-%{poppler_api}.typelib
%files tools
%files tools -f %name-tools.lang
%license COPYING COPYING3
%{_bindir}/*
%{_mandir}/man1/*.*
%{_mandir}/man1/*.1%{?ext_man}
%files -n libpoppler-cpp%{poppler_cpp_sover}
%{_libdir}/libpoppler-cpp.so.%{poppler_cpp_sover}*

View File

@@ -1,13 +1,13 @@
Index: poppler-23.10.0/CMakeLists.txt
Index: poppler-24.12.0/CMakeLists.txt
===================================================================
--- poppler-23.10.0.orig/CMakeLists.txt
+++ poppler-23.10.0/CMakeLists.txt
@@ -225,7 +225,7 @@ find_soft_mandatory_package(ENABLE_QT6 Q
--- poppler-24.12.0.orig/CMakeLists.txt
+++ poppler-24.12.0/CMakeLists.txt
@@ -227,7 +227,7 @@ find_soft_mandatory_package(ENABLE_QT6 Q
# Check for Cairo rendering backend
macro_optional_find_package(Cairo ${CAIRO_VERSION})
-find_package(Boost 1.71.0)
+find_package(Boost 1.66.0)
-find_package(Boost 1.74.0 CONFIG)
+find_package(Boost 1.66.0 CONFIG)
if(Boost_FOUND)
set(USE_BOOST_HEADERS ON)
elseif(ENABLE_BOOST)

View File

@@ -1,12 +1,12 @@
Index: poppler-23.10.0/CMakeLists.txt
Index: poppler-24.12.0/CMakeLists.txt
===================================================================
--- poppler-23.10.0.orig/CMakeLists.txt
+++ poppler-23.10.0/CMakeLists.txt
@@ -166,7 +166,7 @@ endmacro()
--- poppler-24.12.0.orig/CMakeLists.txt
+++ poppler-24.12.0/CMakeLists.txt
@@ -168,7 +168,7 @@ endmacro()
find_soft_mandatory_package(ENABLE_NSS3 NSS3 3.68)
find_soft_mandatory_package(ENABLE_GPGME Gpgmepp 1.19)
-find_soft_mandatory_package(ENABLE_LIBTIFF TIFF 4.1)
-find_soft_mandatory_package(ENABLE_LIBTIFF TIFF 4.3)
+find_soft_mandatory_package(ENABLE_LIBTIFF TIFF 4.0.9)
macro_optional_find_package(JPEG)