diff options
Diffstat (limited to 'arch/tde-base/tde-tdegraphics')
| -rw-r--r-- | arch/tde-base/tde-tdegraphics/PKGBUILD | 12 | ||||
| -rw-r--r-- | arch/tde-base/tde-tdegraphics/bp000-544868bcc9.diff | 60 | ||||
| -rw-r--r-- | arch/tde-base/tde-tdegraphics/bp000-poppler-2203.diff | 81 |
3 files changed, 87 insertions, 66 deletions
diff --git a/arch/tde-base/tde-tdegraphics/PKGBUILD b/arch/tde-base/tde-tdegraphics/PKGBUILD index cde148275..1731412cb 100644 --- a/arch/tde-base/tde-tdegraphics/PKGBUILD +++ b/arch/tde-base/tde-tdegraphics/PKGBUILD @@ -6,8 +6,8 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 -pkgrel=3 +pkgver=14.0.12 +pkgrel=1 pkgdesc="Trinity Desktop Graphics Components" arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -20,9 +20,9 @@ conflicts=("trinity-${_mod}" "trinity-${_kdemod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" - "bp000-544868bcc9.diff") -md5sums=('04d2c95040a3a5664c4b0dca8556d10d' - "17ef39c263fb05827242762813b8c4b2") + 'bp000-poppler-2203.diff') +md5sums=('9e91406d7e02515a41ae60bd2a21440a' + 'cd9b5a969ce31dae64fb8764a5e7b60f') # install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity @@ -30,7 +30,7 @@ md5sums=('04d2c95040a3a5664c4b0dca8556d10d' prepare() { msg "Apply backported patches" cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1 - patch -p1 < ${srcdir}/bp000-544868bcc9.diff + patch -p1 < ${srcdir}/bp000-poppler-2203.diff } build() { diff --git a/arch/tde-base/tde-tdegraphics/bp000-544868bcc9.diff b/arch/tde-base/tde-tdegraphics/bp000-544868bcc9.diff deleted file mode 100644 index 975fd5224..000000000 --- a/arch/tde-base/tde-tdegraphics/bp000-544868bcc9.diff +++ /dev/null @@ -1,60 +0,0 @@ -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; diff --git a/arch/tde-base/tde-tdegraphics/bp000-poppler-2203.diff b/arch/tde-base/tde-tdegraphics/bp000-poppler-2203.diff new file mode 100644 index 000000000..aa170d53e --- /dev/null +++ b/arch/tde-base/tde-tdegraphics/bp000-poppler-2203.diff @@ -0,0 +1,81 @@ +commit 9adc0f647c04e84792be63d913274633cc2ecd65 +Author: Slávek Banko <slavek.banko@axis.cz> +Date: Sat Apr 30 01:48:37 2022 +0200 + + Add support for Poppler >= 22.03. + + Signed-off-by: Slávek Banko <slavek.banko@axis.cz> + +diff --git a/config.h.cmake b/config.h.cmake +index 7c1ab17a..fea46aaf 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -1,6 +1,7 @@ + #cmakedefine VERSION "@VERSION@" + + // poppler-tqt ++#cmakedefine HAVE_POPPLER_2203 + #cmakedefine HAVE_POPPLER_2112 + #cmakedefine HAVE_POPPLER_2111 + #cmakedefine HAVE_POPPLER_2108 +diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake +index fa82dd3c..def19529 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 21.11 21.12 ) ++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 21.12 22.03 ) + 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-document.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp +index 78e8befe..86e831ee 100644 +--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp ++++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp +@@ -50,7 +50,11 @@ Document *Document::load(const TQString &filePath) + #endif + } + ++# if defined(HAVE_POPPLER_2203) ++ DocumentData *doc = new DocumentData(std::make_unique<GooString>(TQFile::encodeName(filePath)), {}); ++# else + DocumentData *doc = new DocumentData(new GooString(TQFile::encodeName(filePath)), NULL); ++# endif + Document *pdoc; + if (doc->doc.isOk() || doc->doc.getErrorCode() == errEncrypted) { + pdoc = new Document(doc); +@@ -84,10 +88,15 @@ bool Document::unlock(const TQCString &password) + { + if (data->locked) { + /* racier then it needs to be */ ++# if defined(HAVE_POPPLER_2203) ++ DocumentData *doc2 = new DocumentData(std::make_unique<GooString>(data->doc.getFileName()), ++ GooString(password.data())); ++# else + GooString *filename = new GooString(data->doc.getFileName()); + GooString *pwd = new GooString(password.data()); + DocumentData *doc2 = new DocumentData(filename, pwd); + delete pwd; ++# endif + if (!doc2->doc.isOk()) { + delete doc2; + } else { +diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h +index c98d02b8..f1096ceb 100644 +--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h ++++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h +@@ -104,7 +104,11 @@ class LinkDestinationData { + + class DocumentData { + public: ++# if defined(HAVE_POPPLER_2203) ++ DocumentData(std::unique_ptr<GooString> &&filePath, const std::optional<GooString> &password) : doc(std::move(filePath), password), m_fontInfoScanner(0), m_outputDev(0) {} ++# else + DocumentData(GooString *filePath, GooString *password) : doc(filePath,password), m_fontInfoScanner(0), m_outputDev(0) {} ++# endif + + ~DocumentData() + { |