diff --git a/.github/workflows/poppler.yml b/.github/workflows/poppler.yml index 2703c1c..eb041fe 100644 --- a/.github/workflows/poppler.yml +++ b/.github/workflows/poppler.yml @@ -16,20 +16,6 @@ jobs: package: poppler version: '23.12.0' - build-poppler-23_10_0: - name: poppler 23.10.0 - uses: ./.github/workflows/build.yml - with: - package: poppler - version: '23.10.0' - - build-poppler-21_02_0: - name: poppler 21.02.0 - uses: ./.github/workflows/build.yml - with: - package: poppler - version: '21.02.0' - build-poppler-0_89_0: name: poppler 0.89.0 uses: ./.github/workflows/build.yml diff --git a/README.md b/README.md index 8273684..f8e1184 100644 --- a/README.md +++ b/README.md @@ -76,8 +76,6 @@ Usable version is 2.75.0 Available versions: - 23.12.0 -- 23.10.0 -- 21.02.0 - 0.89.0 - 0.81.0 diff --git a/poppler/build.gradle.kts b/poppler/build.gradle.kts index 5b53c78..86512d1 100644 --- a/poppler/build.gradle.kts +++ b/poppler/build.gradle.kts @@ -15,14 +15,6 @@ val portVersion = when(project.findProperty("packageVersion")) { version = "0.89.0-beta-7" "0.89.0" } - "21.02.0" -> { - version = "21.02.0-beta-6" - "21.02.0" - } - "23.10.0" -> { - version = "23.10.0-beta-8" - "23.10.0" - } else /* "23.12.0" */ -> { version = "23.12.0-beta-5" "23.12.0" @@ -47,7 +39,7 @@ dependencies { implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:2.75.0-beta-1") implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:1.18.0-beta-6") implementation("com.viliussutkus89.ndk.thirdparty:lcms2${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:2.16-beta-2") - if (listOf("0.81.0", "0.89.0", "21.02.0").contains(portVersion)) { + if (listOf("0.81.0", "0.89.0").contains(portVersion)) { // 23.10.0 supports Android's native alternative of fontconfig implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:2.14.2-beta-5") } @@ -115,12 +107,7 @@ tasks.extractSrc { srcDir.patch("glib-boxed-type.patch") srcDir.patch("ExportPrivatesForPdf2htmlEX.patch") } - "21.02.0" -> { - srcDir.resolve("CMakeLists.txt").patch("fontconfig.patch") - srcDir.resolve("CMakeLists.txt").patch("FindCairo.patch") - srcDir.patch("glib-boxed-type.patch") - } - "23.10.0", "23.12.0" -> { + "23.12.0" -> { srcDir.resolve("CMakeLists.txt").patch("FindCairo.patch") srcDir.resolve("cmake/modules/CheckFileOffsetBits.cmake").patch("CheckFileOffsetBits.patch") srcDir.patch("ExportPrivatesForPdf2htmlEX.patch") @@ -135,7 +122,7 @@ tasks.prefab { tasks.register("buildPort") { when (portVersion) { - "0.81.0", "0.89.0", "21.02.0" -> { + "0.81.0", "0.89.0" -> { cmake { arg("-DENABLE_UNSTABLE_API_ABI_HEADERS=ON") } @@ -148,7 +135,7 @@ tasks.register("buildPort") { } } } - "23.10.0", "23.12.0" -> { + "23.12.0" -> { cmake { args( "-DENABLE_UNSTABLE_API_ABI_HEADERS=ON", @@ -280,8 +267,6 @@ publishing { // Developer list obtained from: // https://gitlab.freedesktop.org/poppler/poppler/-/raw/poppler-0.81.0/AUTHORS // https://gitlab.freedesktop.org/poppler/poppler/-/raw/poppler-0.89.0/AUTHORS - // https://gitlab.freedesktop.org/poppler/poppler/-/raw/poppler-21.02.0/AUTHORS - // https://gitlab.freedesktop.org/poppler/poppler/-/raw/poppler-23.10.0/AUTHORS // https://gitlab.freedesktop.org/poppler/poppler/-/raw/poppler-23.12.0/AUTHORS // https://gitlab.freedesktop.org/poppler/poppler-data/-/blob/POPPLER_DATA_0_4_12/README developer { diff --git a/poppler/patches/21.02.0/FindCairo.patch b/poppler/patches/21.02.0/FindCairo.patch deleted file mode 100644 index 5603610..0000000 --- a/poppler/patches/21.02.0/FindCairo.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- CMakeLists.txt 2023-11-03 12:59:37.594000000 +0200 -+++ CMakeLists.txt 2023-11-03 13:00:13.671000000 +0200 -@@ -173,7 +173,7 @@ - - # Check for rendering backends (Splash included unless disabled) - set(HAVE_SPLASH ${ENABLE_SPLASH}) --macro_optional_find_package(Cairo ${CAIRO_VERSION}) -+pkg_search_module(CAIRO REQUIRED IMPORTED_TARGET cairo) - - if(ENABLE_SPLASH) - find_package(Boost 1.58.0) -@@ -183,6 +183,7 @@ - endif() - - if(CAIRO_FOUND) -+ set(CAIRO_LIBRARIES PkgConfig::CAIRO) - set(HAVE_CAIRO ${CAIRO_FOUND}) - set(CAIRO_FEATURE "#define POPPLER_HAS_CAIRO 1") - set(CAIRO_REQ "cairo") diff --git a/poppler/patches/21.02.0/fontconfig.patch b/poppler/patches/21.02.0/fontconfig.patch deleted file mode 100644 index bb2dd85..0000000 --- a/poppler/patches/21.02.0/fontconfig.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- CMakeLists.txt 2019-09-22 18:56:22.000000000 +0300 -+++ CMakeLists.txt 2023-11-03 10:53:17.851000000 +0200 -@@ -93,9 +93,6 @@ - - if(WIN32) - set(_default_fontconfiguration "win32") --elseif(ANDROID) -- # on android we don't have fontconfig and we don't want windows-specific code -- set(_default_fontconfiguration "generic") - else() - set(_default_fontconfiguration "fontconfig") - endif() -@@ -124,7 +121,7 @@ - macro_bool_to_01(ENABLE_SPLASH HAVE_SPLASH) - find_package(Freetype REQUIRED) - if(WITH_FONTCONFIGURATION_FONTCONFIG) -- find_package(Fontconfig REQUIRED) -+ pkg_search_module(FONTCONFIG REQUIRED IMPORTED_TARGET fontconfig) - endif() - macro_optional_find_package(JPEG) - macro_optional_find_package(PNG) -@@ -237,10 +234,6 @@ - # Use mingw's ansi stdio extensions - add_definitions(-D__USE_MINGW_ANSI_STDIO=1) - endif() --if(FONTCONFIG_FOUND) -- add_definitions(${FONTCONFIG_DEFINITIONS}) -- include_directories(SYSTEM ${FONTCONFIG_INCLUDE_DIR}) --endif() - if(WITH_FONTCONFIGURATION_WIN32) - if(MINGW) - # Set the minimum required Internet Explorer version to 5.0 -@@ -428,7 +421,7 @@ - ) - endif() - if(FONTCONFIG_FOUND) -- set(poppler_LIBS ${poppler_LIBS} ${FONTCONFIG_LIBRARIES}) -+ set(poppler_LIBS ${poppler_LIBS} PkgConfig::FONTCONFIG) - endif() - - if(JPEG_FOUND) diff --git a/poppler/patches/21.02.0/glib-boxed-type.patch b/poppler/patches/21.02.0/glib-boxed-type.patch deleted file mode 100644 index 7fb389a..0000000 --- a/poppler/patches/21.02.0/glib-boxed-type.patch +++ /dev/null @@ -1,273 +0,0 @@ -From 47de887d7658cfd68df44b3acf710971054f957b Mon Sep 17 00:00:00 2001 -From: Christian Persch -Date: Fri, 26 Mar 2021 18:17:25 +0100 -Subject: [PATCH 1/2] glib: Use stock glib macro to define boxed type - -Poppler already depends on a sufficiently new glib version, so we can -simply use G_DEFINE_BOXED_TYPE instead of defining our own macro. ---- - glib/poppler-action.cc | 4 ++-- - glib/poppler-annot.cc | 2 +- - glib/poppler-document.cc | 6 +++--- - glib/poppler-page.cc | 20 ++++++++++---------- - glib/poppler-private.h | 15 --------------- - glib/poppler-structure-element.cc | 4 ++-- - 6 files changed, 18 insertions(+), 33 deletions(-) - -diff --git glib/poppler-action.cc glib/poppler-action.cc -index d395db797..b772a3c2d 100644 ---- glib/poppler-action.cc -+++ glib/poppler-action.cc -@@ -25,7 +25,7 @@ - * @title: PopplerAction - */ - --POPPLER_DEFINE_BOXED_TYPE(PopplerDest, poppler_dest, poppler_dest_copy, poppler_dest_free) -+G_DEFINE_BOXED_TYPE(PopplerDest, poppler_dest, poppler_dest_copy, poppler_dest_free) - - /** - * poppler_dest_copy: -@@ -88,7 +88,7 @@ static PopplerActionLayer *poppler_action_layer_copy(PopplerActionLayer *action_ - return retval; - } - --POPPLER_DEFINE_BOXED_TYPE(PopplerAction, poppler_action, poppler_action_copy, poppler_action_free) -+G_DEFINE_BOXED_TYPE(PopplerAction, poppler_action, poppler_action_copy, poppler_action_free) - - /** - * poppler_action_free: -diff --git glib/poppler-annot.cc glib/poppler-annot.cc -index f4c5bb1fc..53205658f 100644 ---- glib/poppler-annot.cc -+++ glib/poppler-annot.cc -@@ -1693,7 +1693,7 @@ gchar *poppler_annot_file_attachment_get_name(PopplerAnnotFileAttachment *popple - } - - /* PopplerAnnotCalloutLine */ --POPPLER_DEFINE_BOXED_TYPE(PopplerAnnotCalloutLine, poppler_annot_callout_line, poppler_annot_callout_line_copy, poppler_annot_callout_line_free) -+G_DEFINE_BOXED_TYPE(PopplerAnnotCalloutLine, poppler_annot_callout_line, poppler_annot_callout_line_copy, poppler_annot_callout_line_free) - - /** - * poppler_annot_callout_line_new: -diff --git glib/poppler-document.cc glib/poppler-document.cc -index e8dfe1379..eafe9b63e 100644 ---- glib/poppler-document.cc -+++ glib/poppler-document.cc -@@ -2360,7 +2360,7 @@ struct _PopplerIndexIter - int index; - }; - --POPPLER_DEFINE_BOXED_TYPE(PopplerIndexIter, poppler_index_iter, poppler_index_iter_copy, poppler_index_iter_free) -+G_DEFINE_BOXED_TYPE(PopplerIndexIter, poppler_index_iter, poppler_index_iter_copy, poppler_index_iter_free) - - /** - * poppler_index_iter_copy: -@@ -2579,7 +2579,7 @@ struct _PopplerFontsIter - int index; - }; - --POPPLER_DEFINE_BOXED_TYPE(PopplerFontsIter, poppler_fonts_iter, poppler_fonts_iter_copy, poppler_fonts_iter_free) -+G_DEFINE_BOXED_TYPE(PopplerFontsIter, poppler_fonts_iter, poppler_fonts_iter_copy, poppler_fonts_iter_free) - - /** - * poppler_fonts_iter_get_full_name: -@@ -3111,7 +3111,7 @@ struct _PopplerLayersIter - int index; - }; - --POPPLER_DEFINE_BOXED_TYPE(PopplerLayersIter, poppler_layers_iter, poppler_layers_iter_copy, poppler_layers_iter_free) -+G_DEFINE_BOXED_TYPE(PopplerLayersIter, poppler_layers_iter, poppler_layers_iter_copy, poppler_layers_iter_free) - - /** - * poppler_layers_iter_copy: -diff --git glib/poppler-page.cc glib/poppler-page.cc -index 75c39c123..3332a9ebc 100644 ---- glib/poppler-page.cc -+++ glib/poppler-page.cc -@@ -1563,7 +1563,7 @@ void poppler_page_remove_annot(PopplerPage *page, PopplerAnnot *annot) - - /* PopplerRectangle type */ - --POPPLER_DEFINE_BOXED_TYPE(PopplerRectangle, poppler_rectangle, poppler_rectangle_copy, poppler_rectangle_free) -+G_DEFINE_BOXED_TYPE(PopplerRectangle, poppler_rectangle, poppler_rectangle_copy, poppler_rectangle_free) - - /** - * poppler_rectangle_new: -@@ -1605,7 +1605,7 @@ void poppler_rectangle_free(PopplerRectangle *rectangle) - - /* PopplerPoint type */ - --POPPLER_DEFINE_BOXED_TYPE(PopplerPoint, poppler_point, poppler_point_copy, poppler_point_free) -+G_DEFINE_BOXED_TYPE(PopplerPoint, poppler_point, poppler_point_copy, poppler_point_free) - - /** - * poppler_point_new: -@@ -1654,7 +1654,7 @@ void poppler_point_free(PopplerPoint *point) - - /* PopplerQuadrilateral type */ - --POPPLER_DEFINE_BOXED_TYPE(PopplerQuadrilateral, poppler_quadrilateral, poppler_quadrilateral_copy, poppler_quadrilateral_free) -+G_DEFINE_BOXED_TYPE(PopplerQuadrilateral, poppler_quadrilateral, poppler_quadrilateral_copy, poppler_quadrilateral_free) - - /** - * poppler_quadrilateral_new: -@@ -1702,7 +1702,7 @@ void poppler_quadrilateral_free(PopplerQuadrilateral *quad) - - /* PopplerTextAttributes type */ - --POPPLER_DEFINE_BOXED_TYPE(PopplerTextAttributes, poppler_text_attributes, poppler_text_attributes_copy, poppler_text_attributes_free) -+G_DEFINE_BOXED_TYPE(PopplerTextAttributes, poppler_text_attributes, poppler_text_attributes_copy, poppler_text_attributes_free) - - /** - * poppler_text_attributes_new: -@@ -1801,7 +1801,7 @@ void poppler_text_attributes_free(PopplerTextAttributes *text_attrs) - */ - - /* PopplerColor type */ --POPPLER_DEFINE_BOXED_TYPE(PopplerColor, poppler_color, poppler_color_copy, poppler_color_free) -+G_DEFINE_BOXED_TYPE(PopplerColor, poppler_color, poppler_color_copy, poppler_color_free) - - /** - * poppler_color_new: -@@ -1845,7 +1845,7 @@ void poppler_color_free(PopplerColor *color) - } - - /* PopplerLinkMapping type */ --POPPLER_DEFINE_BOXED_TYPE(PopplerLinkMapping, poppler_link_mapping, poppler_link_mapping_copy, poppler_link_mapping_free) -+G_DEFINE_BOXED_TYPE(PopplerLinkMapping, poppler_link_mapping, poppler_link_mapping_copy, poppler_link_mapping_free) - - /** - * poppler_link_mapping_new: -@@ -1897,7 +1897,7 @@ void poppler_link_mapping_free(PopplerLinkMapping *mapping) - } - - /* Poppler Image mapping type */ --POPPLER_DEFINE_BOXED_TYPE(PopplerImageMapping, poppler_image_mapping, poppler_image_mapping_copy, poppler_image_mapping_free) -+G_DEFINE_BOXED_TYPE(PopplerImageMapping, poppler_image_mapping, poppler_image_mapping_copy, poppler_image_mapping_free) - - /** - * poppler_image_mapping_new: -@@ -1936,7 +1936,7 @@ void poppler_image_mapping_free(PopplerImageMapping *mapping) - } - - /* Page Transition */ --POPPLER_DEFINE_BOXED_TYPE(PopplerPageTransition, poppler_page_transition, poppler_page_transition_copy, poppler_page_transition_free) -+G_DEFINE_BOXED_TYPE(PopplerPageTransition, poppler_page_transition, poppler_page_transition_copy, poppler_page_transition_free) - - /** - * poppler_page_transition_new: -@@ -1980,7 +1980,7 @@ void poppler_page_transition_free(PopplerPageTransition *transition) - } - - /* Form Field Mapping Type */ --POPPLER_DEFINE_BOXED_TYPE(PopplerFormFieldMapping, poppler_form_field_mapping, poppler_form_field_mapping_copy, poppler_form_field_mapping_free) -+G_DEFINE_BOXED_TYPE(PopplerFormFieldMapping, poppler_form_field_mapping, poppler_form_field_mapping_copy, poppler_form_field_mapping_free) - - /** - * poppler_form_field_mapping_new: -@@ -2032,7 +2032,7 @@ void poppler_form_field_mapping_free(PopplerFormFieldMapping *mapping) - } - - /* PopplerAnnot Mapping Type */ --POPPLER_DEFINE_BOXED_TYPE(PopplerAnnotMapping, poppler_annot_mapping, poppler_annot_mapping_copy, poppler_annot_mapping_free) -+G_DEFINE_BOXED_TYPE(PopplerAnnotMapping, poppler_annot_mapping, poppler_annot_mapping_copy, poppler_annot_mapping_free) - - /** - * poppler_annot_mapping_new: -diff --git glib/poppler-private.h glib/poppler-private.h -index d41b59c6a..102727162 100644 ---- glib/poppler-private.h -+++ glib/poppler-private.h -@@ -143,21 +143,6 @@ gboolean _poppler_convert_pdf_date_to_gtime(const GooString *date, time_t *gdate - GDateTime *_poppler_convert_pdf_date_to_date_time(const GooString *date); - GooString *_poppler_convert_date_time_to_pdf_date(GDateTime *datetime); - --/* -- * A convenience macro for boxed type implementations, which defines a -- * type_name_get_type() function registering the boxed type. -- */ --#define POPPLER_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, free_func) \ -- GType type_name##_get_type(void) \ -- { \ -- static volatile gsize g_define_type_id__volatile = 0; \ -- if (g_once_init_enter(&g_define_type_id__volatile)) { \ -- GType g_define_type_id = g_boxed_type_register_static(g_intern_static_string(#TypeName), (GBoxedCopyFunc)copy_func, (GBoxedFreeFunc)free_func); \ -- g_once_init_leave(&g_define_type_id__volatile, g_define_type_id); \ -- } \ -- return g_define_type_id__volatile; \ -- } -- - void _poppler_error_cb(ErrorCategory category, Goffset pos, const char *message); - - #endif -diff --git glib/poppler-structure-element.cc glib/poppler-structure-element.cc -index aec7cd151..29d3e5cad 100644 ---- glib/poppler-structure-element.cc -+++ glib/poppler-structure-element.cc -@@ -581,7 +581,7 @@ struct _PopplerStructureElementIter - unsigned index; - }; - --POPPLER_DEFINE_BOXED_TYPE(PopplerStructureElementIter, poppler_structure_element_iter, poppler_structure_element_iter_copy, poppler_structure_element_iter_free) -+G_DEFINE_BOXED_TYPE(PopplerStructureElementIter, poppler_structure_element_iter, poppler_structure_element_iter_copy, poppler_structure_element_iter_free) - - /** - * poppler_structure_element_iter_copy: -@@ -763,7 +763,7 @@ struct _PopplerTextSpan - PopplerColor color; - }; - --POPPLER_DEFINE_BOXED_TYPE(PopplerTextSpan, poppler_text_span, poppler_text_span_copy, poppler_text_span_free) -+G_DEFINE_BOXED_TYPE(PopplerTextSpan, poppler_text_span, poppler_text_span_copy, poppler_text_span_free) - - enum - { --- -GitLab - - -From bdd110b45a38e8a4f80f522892e4c4a9e432abd5 Mon Sep 17 00:00:00 2001 -From: Christian Persch -Date: Fri, 26 Mar 2021 18:17:25 +0100 -Subject: [PATCH 2/2] glib: Remove incorrecly used volatile from enum type - registration code - ---- - glib/poppler-enums.c.template | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git glib/poppler-enums.c.template glib/poppler-enums.c.template -index 26a51b4c4..eefc76970 100644 ---- glib/poppler-enums.c.template -+++ glib/poppler-enums.c.template -@@ -15,9 +15,9 @@ - GType - @enum_name@_get_type (void) - { -- static volatile gsize g_define_type_id__volatile = 0; -+ static volatile gsize g_define_type_id = 0; - -- if (g_once_init_enter (&g_define_type_id__volatile)) { -+ if (g_once_init_enter (&g_define_type_id)) { - static const G@Type@Value values[] = { - /*** END value-header ***/ - -@@ -28,13 +28,13 @@ GType - /*** BEGIN value-tail ***/ - { 0, NULL, NULL } - }; -- GType g_define_type_id = -+ GType type = - g_@type@_register_static (g_intern_static_string ("@EnumName@"), values); - -- g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); -+ g_once_init_leave (&g_define_type_id, type); - } - -- return g_define_type_id__volatile; -+ return g_define_type_id; - } - - /*** END value-tail ***/ --- -GitLab diff --git a/poppler/patches/23.10.0/CheckFileOffsetBits.patch b/poppler/patches/23.10.0/CheckFileOffsetBits.patch deleted file mode 100644 index 0267a49..0000000 --- a/poppler/patches/23.10.0/CheckFileOffsetBits.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- CheckFileOffsetBits.cmake 2023-10-02 22:55:54.000000000 +0300 -+++ CheckFileOffsetBits.cmake 2023-11-03 13:14:02.057000000 +0200 -@@ -18,6 +18,11 @@ - "${CMAKE_CURRENT_LIST_FILE}" PATH) - - MACRO (CHECK_FILE_OFFSET_BITS) -+ IF (ANDROID_API_LEVEL LESS 24) -+ SET(_FILE_OFFSET_BITS "" CACHE INTERNAL "_FILE_OFFSET_BITS macro needed for large files") -+ MESSAGE(STATUS "Not enabling _FILE_OFFSET_BITS for Android API pre 24. This only affects 32bit devices") -+ ENDIF (ANDROID_API_LEVEL LESS 24) -+ - IF(NOT DEFINED _FILE_OFFSET_BITS) - MESSAGE(STATUS "Checking _FILE_OFFSET_BITS for large files") - TRY_COMPILE(__WITHOUT_FILE_OFFSET_BITS_64 diff --git a/poppler/patches/23.10.0/ExportPrivatesForPdf2htmlEX.patch b/poppler/patches/23.10.0/ExportPrivatesForPdf2htmlEX.patch deleted file mode 100644 index 6cd80a5..0000000 --- a/poppler/patches/23.10.0/ExportPrivatesForPdf2htmlEX.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- poppler/CairoFontEngine.h -+++ poppler/CairoFontEngine.h -@@ -45,7 +45,7 @@ - - class CairoFontEngine; - --class CairoFont -+class POPPLER_PRIVATE_EXPORT CairoFont - { - public: - CairoFont(Ref refA, cairo_font_face_t *cairo_font_faceA, std::vector &&codeToGIDA, bool substituteA, bool printingA); -@@ -112,7 +112,7 @@ private: - // CairoFontEngine - //------------------------------------------------------------------------ - --class CairoFontEngine -+class POPPLER_PRIVATE_EXPORT CairoFontEngine - { - public: - // Create a font engine. ---- poppler/CairoOutputDev.h -+++ poppler/CairoOutputDev.h -@@ -98,7 +98,7 @@ private: - // CairoOutputDev - //------------------------------------------------------------------------ - --class CairoOutputDev : public OutputDev -+class POPPLER_PRIVATE_EXPORT CairoOutputDev : public OutputDev - { - public: - // Constructor. ---- poppler/CharCodeToUnicode.h -+++ poppler/CharCodeToUnicode.h -@@ -42,7 +42,7 @@ class GooString; - - //------------------------------------------------------------------------ - --class CharCodeToUnicode -+class POPPLER_PRIVATE_EXPORT CharCodeToUnicode - { - friend class UnicodeToCharCode; - ---- poppler/GfxState.h -+++ poppler/GfxState.h -@@ -56,7 +56,7 @@ class GfxState; - class GfxResources; - class GfxSeparationColorSpace; - --class Matrix -+class POPPLER_PRIVATE_EXPORT Matrix - { - public: - double m[6]; diff --git a/poppler/patches/23.10.0/FindCairo.patch b/poppler/patches/23.10.0/FindCairo.patch deleted file mode 100644 index 091ece8..0000000 --- a/poppler/patches/23.10.0/FindCairo.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- CMakeLists.txt 2023-10-02 22:55:54.000000000 +0300 -+++ CMakeLists.txt 2023-11-03 13:17:53.216000000 +0200 -@@ -223,7 +223,7 @@ - find_soft_mandatory_package(ENABLE_QT6 Qt6Test ${QT6_VERSION}) - - # Check for Cairo rendering backend --macro_optional_find_package(Cairo ${CAIRO_VERSION}) -+pkg_search_module(CAIRO REQUIRED IMPORTED_TARGET cairo) - - find_package(Boost 1.71.0) - if(Boost_FOUND) -@@ -233,6 +233,7 @@ - endif() - - if(CAIRO_FOUND) -+ set(CAIRO_LIBRARIES PkgConfig::CAIRO) - set(HAVE_CAIRO ${CAIRO_FOUND}) - set(CAIRO_FEATURE "#define POPPLER_HAS_CAIRO 1") - set(CAIRO_REQ "cairo") diff --git a/poppler/poppler-21.02.0.tar.xz b/poppler/poppler-21.02.0.tar.xz deleted file mode 100644 index 7493af1..0000000 Binary files a/poppler/poppler-21.02.0.tar.xz and /dev/null differ diff --git a/poppler/poppler-23.10.0.tar.xz b/poppler/poppler-23.10.0.tar.xz deleted file mode 100644 index 6a190b3..0000000 Binary files a/poppler/poppler-23.10.0.tar.xz and /dev/null differ