diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-12-16 15:52:41 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-12-16 15:52:41 +0100 |
| commit | d667fc1385b65b13de04b33cac9c9210eec4950c (patch) | |
| tree | 91ea0ccf083e109bddcdc23cb0a3e486a18cf261 | |
| parent | 8e5d126a1bfc5d0ce61033afb702ed2222970476 (diff) | |
| download | tde-packaging-d667fc1385b65b13de04b33cac9c9210eec4950c.tar.gz tde-packaging-d667fc1385b65b13de04b33cac9c9210eec4950c.zip | |
FreeBSD tdegraphics: Backport patch for support Poppler >= 21.11.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rw-r--r-- | freebsd/core/tdegraphics/Makefile | 2 | ||||
| -rw-r--r-- | freebsd/core/tdegraphics/files/patch-bp000-544868bcc9.diff | 60 |
2 files changed, 61 insertions, 1 deletions
diff --git a/freebsd/core/tdegraphics/Makefile b/freebsd/core/tdegraphics/Makefile index ea3fb9c17..3743c4835 100644 --- a/freebsd/core/tdegraphics/Makefile +++ b/freebsd/core/tdegraphics/Makefile @@ -9,7 +9,7 @@ PORTNAME= tdegraphics-trinity COMMENT= Trinity graphics apps TDE_PREVERSION= MASTER_SITE_SUBDIR= t/${PORTNAME} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 graphics DIST_SUBDIR= TDE/core diff --git a/freebsd/core/tdegraphics/files/patch-bp000-544868bcc9.diff b/freebsd/core/tdegraphics/files/patch-bp000-544868bcc9.diff new file mode 100644 index 000000000..975fd5224 --- /dev/null +++ b/freebsd/core/tdegraphics/files/patch-bp000-544868bcc9.diff @@ -0,0 +1,60 @@ +commit 9cde144216b331f0eef2ce2c3800d8356109ccc7 +Author: Slávek Banko <slavek.banko@axis.cz> +Date: Wed Dec 15 17:30:53 2021 +0100 + + Add support for Poppler >= 21.11. + This resolves issue #36. + + Signed-off-by: Slávek Banko <slavek.banko@axis.cz> + +diff --git a/config.h.cmake b/config.h.cmake +index b3b6d1ec..fa71d600 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -1,6 +1,7 @@ + #cmakedefine VERSION "@VERSION@" + + // poppler-tqt ++#cmakedefine HAVE_POPPLER_2111 + #cmakedefine HAVE_POPPLER_2108 + #cmakedefine HAVE_POPPLER_086 + #cmakedefine HAVE_POPPLER_083 +diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake +index 9c15e64f..78f6ffbc 100644 +--- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake ++++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake +@@ -24,7 +24,7 @@ check_cxx_source_compiles(" + HAVE_POPPLER_030 ) + tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) + +-foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 ) ++foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 ) + string( REPLACE "." "" _poppler_str "${_poppler_ver}" ) + if( NOT DEFINED HAVE_POPPLER_${_poppler_str} ) + message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str}" ) +diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp +index 426b750f..9b4f6208 100644 +--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp ++++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp +@@ -173,7 +173,11 @@ TQValueList<TextBox*> Page::textList() const + data->doc->data->doc.displayPageSlice(output_dev, data->index + 1, 72, 72, + 0, false, false, false, -1, -1, -1, -1); + ++# if defined(HAVE_POPPLER_2111) ++ std::unique_ptr<TextWordList> word_list = output_dev->makeWordList(); ++# else + TextWordList *word_list = output_dev->makeWordList(); ++# endif + + if (!word_list) { + delete output_dev; +@@ -193,7 +197,9 @@ TQValueList<TextBox*> Page::textList() const + output_list.append(text_box); + } + ++# if !defined(HAVE_POPPLER_2111) + delete word_list; ++# endif + delete output_dev; + + return output_list; |