Increase Minimum supported base to that provided by Ubuntu 22.04

5 files changed, 13 insertions, 22 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a80059af..06ac8e50 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,16 +68,12 @@ build_clang16_libcpp:
     - cp "$srcdir/.clang-tidy" .
     - run-clang-tidy-16
 
-build_ubuntu_20_04:
+build_ubuntu_22_04:
   stage: build
-  image: ubuntu:20.04
+  image: ubuntu:22.04
   before_script:
     - apt-get update
-    - apt-get install --yes --no-install-recommends build-essential cmake ninja-build libjpeg-dev libopenjp2-7-dev qtbase5-dev gobject-introspection libglib2.0-dev libgtk-3-dev libgirepository1.0-dev libnss3-dev ca-certificates libcurl4-nss-dev liblcms2-dev libboost-container-dev libtiff-dev wget p7zip-full git
-    - wget -r -l1 -np "https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_620/qt.qt6.620.gcc_64/" -A "6.2.0-0-*qtbase-Linux-RHEL_8_2-GCC-Linux-RHEL_8_2-X86_64.7z"
-    - 7z x download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_620/qt.qt6.620.gcc_64/6.2.0-0-*qtbase-Linux-RHEL_8_2-GCC-Linux-RHEL_8_2-X86_64.7z
-    - wget -r -l1 -np "https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_620/qt.qt6.620.gcc_64/" -A "6.2.0-0-*icu-linux-Rhel7.2-x64.7z"
-    - 7z x download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_620/qt.qt6.620.gcc_64/6.2.0-0-*icu-linux-Rhel7.2-x64.7z
+    - apt-get install --yes --no-install-recommends build-essential cmake ninja-build libjpeg-dev libopenjp2-7-dev qtbase5-dev gobject-introspection libglib2.0-dev libgtk-3-dev libgirepository1.0-dev libnss3-dev ca-certificates libcurl4-nss-dev liblcms2-dev libboost-container-dev libtiff-dev wget p7zip-full git qt6-base-dev
   script:
     - git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL} test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
     - mkdir -p build && cd build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d0f18f3..b27333a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.22.0 FATAL_ERROR)
 
 project(poppler)
 
@@ -142,7 +142,7 @@ set(TEXTOUT_WORD_LIST ON)
 
 # setting the minimum required versions for some components
 set(CAIRO_VERSION "1.16.0")
-set(GLIB_REQUIRED "2.64")
+set(GLIB_REQUIRED "2.72")
 set(GTK_REQUIRED "3.24")
 set(GDK_PIXBUF_REQUIRED "2.40")
 set(FREETYPE_VERSION "2.10")
@@ -164,9 +164,9 @@ macro(find_soft_mandatory_package _enable_option _package_name _package_version)
   endif()
 endmacro()
 
-find_soft_mandatory_package(ENABLE_NSS3 NSS3 3.68)
+find_soft_mandatory_package(ENABLE_NSS3 NSS3 3.98)
 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)
 
 macro_optional_find_package(JPEG)
 macro_optional_find_package(PNG)
@@ -208,7 +208,7 @@ else()
   message(FATAL_ERROR "Invalid ENABLE_DCTDECODER value.")
 endif()
 
-set(QT5_VERSION "5.12") # Update QT_DISABLE_DEPRECATED_BEFORE in qt5/CMakeLists.txt when changing this
+set(QT5_VERSION "5.15")
 find_soft_mandatory_package(ENABLE_QT5 Qt5Core ${QT5_VERSION})
 find_soft_mandatory_package(ENABLE_QT5 Qt5Gui ${QT5_VERSION})
 find_soft_mandatory_package(ENABLE_QT5 Qt5Xml ${QT5_VERSION})
@@ -225,7 +225,7 @@ find_soft_mandatory_package(ENABLE_QT6 Qt6Test ${QT6_VERSION})
 # Check for Cairo rendering backend
 macro_optional_find_package(Cairo ${CAIRO_VERSION})
 
-find_package(Boost 1.71.0)
+find_package(Boost 1.74.0)
 if(Boost_FOUND)
   set(USE_BOOST_HEADERS ON)
 elseif(ENABLE_BOOST)
@@ -247,7 +247,7 @@ if(CAIRO_FOUND)
   if(ENABLE_GLIB)
     if(ENABLE_GOBJECT_INTROSPECTION)
       # Check for introspection
-      macro_optional_find_package(GObjectIntrospection 1.64.0)
+      macro_optional_find_package(GObjectIntrospection 1.72.0)
       set(HAVE_INTROSPECTION ${INTROSPECTION_FOUND})
     endif()
     set(POPPLER_GLIB_DISABLE_DEPRECATED "${POPPLER_GLIB_DISABLE_DEPRECATED} -DG_DISABLE_DEPRECATED")
diff --git a/cmake/modules/FindNSS3.cmake b/cmake/modules/FindNSS3.cmake
index 6029da39..6ba72daa 100644
--- a/cmake/modules/FindNSS3.cmake
+++ b/cmake/modules/FindNSS3.cmake
@@ -14,6 +14,6 @@ include(FindPackageHandleStandardArgs)
 
 find_package(PkgConfig REQUIRED)
 
-pkg_check_modules(NSS3 IMPORTED_TARGET "nss>=3.49")
+pkg_check_modules(NSS3 IMPORTED_TARGET "nss>=3.98")
 
 find_package_handle_standard_args(NSS3 DEFAULT_MSG NSS3_LIBRARIES NSS3_CFLAGS)
diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
index 80b05852..431d2d35 100644
--- a/qt5/CMakeLists.txt
+++ b/qt5/CMakeLists.txt
@@ -5,7 +5,7 @@ if(ENABLE_QT_STRICT_ITERATORS)
   add_definitions(-DQT_STRICT_ITERATORS)
 endif()
 
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050C00)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050E00)
 add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
 
 add_subdirectory(src)
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index bc1c5864..3b566504 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -112,12 +112,7 @@ if (ENABLE_SIGNATURES)
     target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS})
   endif()
   if (Intl_FOUND)
-    if (${CMAKE_VERSION} VERSION_LESS "3.20.0")
-      target_include_directories(pdfsig SYSTEM PRIVATE ${Intl_INCLUDE_DIRS})
-      target_link_libraries(pdfsig ${Intl_LIBRARIES})
-    else ()
-      target_link_libraries(pdfsig Intl::Intl)
-    endif ()
+    target_link_libraries(pdfsig Intl::Intl)
   endif ()
   install(TARGETS pdfsig DESTINATION bin)
   install(FILES pdfsig.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)