diff options
Diffstat (limited to 'arch/tde-base')
-rw-r--r-- | arch/tde-base/tde-i18n/PKGBUILD | 4 | ||||
-rw-r--r-- | arch/tde-base/tde-polkit-agent-tde/PKGBUILD | 60 | ||||
-rw-r--r-- | arch/tde-base/tde-tdeadmin/PKGBUILD | 4 | ||||
-rw-r--r-- | arch/tde-base/tde-tdeartwork/PKGBUILD | 4 | ||||
-rw-r--r-- | arch/tde-base/tde-tdebindings/PKGBUILD | 4 | ||||
-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 | ||||
-rw-r--r-- | arch/tde-base/tde-tdeutils/PKGBUILD | 4 |
9 files changed, 157 insertions, 76 deletions
diff --git a/arch/tde-base/tde-i18n/PKGBUILD b/arch/tde-base/tde-i18n/PKGBUILD index 5d9fcec95..f598f6a1e 100644 --- a/arch/tde-base/tde-i18n/PKGBUILD +++ b/arch/tde-base/tde-i18n/PKGBUILD @@ -6,7 +6,7 @@ _kdemod="${_mod/tde/kde}" pkgbase="tde-${_mod/tde-}" pkgname=("$pkgbase") -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Internationalized (i18n) files for TDE" arch=('any') @@ -17,7 +17,7 @@ makedepends=('tde-cmake-trinity') depends=('tde-tdelibs') options=('staticlibs' 'libtool' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('a5a69fb9f1e4dae6852a68d4725ee6c3') +md5sums=('62e049f7717401eed9994d05c1430578') install='' _languages=( diff --git a/arch/tde-base/tde-polkit-agent-tde/PKGBUILD b/arch/tde-base/tde-polkit-agent-tde/PKGBUILD new file mode 100644 index 000000000..c27ddf9d9 --- /dev/null +++ b/arch/tde-base/tde-polkit-agent-tde/PKGBUILD @@ -0,0 +1,60 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=polkit-agent-tde +_cat=applications/system/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.12 +pkgrel=1 +pkgdesc="TDE dialogs for PolicyKit" +arch=('i686' 'x86_64') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-base') +depends=( + 'tde-tdelibs' + 'tde-polkit-tqt' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") +options=('staticlibs' 'libtool' '!strip') +install= + +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('3d3987adfcac0d9bd9e342d58fd063a8') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-trinity-${pkgver} \ + -GNinja \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON + + msg "Building - ${pkgname}..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - ${pkgname}-${pkgver}" + cd "$srcdir/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-base/tde-tdeadmin/PKGBUILD b/arch/tde-base/tde-tdeadmin/PKGBUILD index 8ad9aab9a..a1ca30728 100644 --- a/arch/tde-base/tde-tdeadmin/PKGBUILD +++ b/arch/tde-base/tde-tdeadmin/PKGBUILD @@ -6,7 +6,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="The TDE system administration utilities" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ conflicts=("trinity-${_mod}") replaces=("${_mod}") options=('staticlibs' 'libtool' '!emptydirs') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('1cdc7261b0a07b2b5767024ee699d852') +md5sums=('e76c21cbd47a42c2d71e882c2f1283c2') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-base/tde-tdeartwork/PKGBUILD b/arch/tde-base/tde-tdeartwork/PKGBUILD index 5c4f59b62..12c2cc377 100644 --- a/arch/tde-base/tde-tdeartwork/PKGBUILD +++ b/arch/tde-base/tde-tdeartwork/PKGBUILD @@ -6,7 +6,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -21,7 +21,7 @@ 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") -md5sums=('fc7ac94e49b18619699b7872339fe8d1') +md5sums=('a5dd6908aff6731593deddaaefcd03cd') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-base/tde-tdebindings/PKGBUILD b/arch/tde-base/tde-tdebindings/PKGBUILD index eadab5f96..cd59a6156 100644 --- a/arch/tde-base/tde-tdebindings/PKGBUILD +++ b/arch/tde-base/tde-tdebindings/PKGBUILD @@ -8,7 +8,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 arch=('i686' 'x86_64') url="https//scm.trinitydesktop.org/scm/git/${_mod}" @@ -19,7 +19,7 @@ depends=('tde-tdelibs') makedepends=('pkgconfig' 'autoconf' 'imake' 'python2' 'ruby' 'jdk-openjdk' 'gtk2') options=('staticlibs' 'libtool' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('3f4933a66c0e1b32011148b9b4733579') +md5sums=('305423d327fe5b7ca3260932044fa51d') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 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() + { diff --git a/arch/tde-base/tde-tdeutils/PKGBUILD b/arch/tde-base/tde-tdeutils/PKGBUILD index d3c4ea03b..91c530e94 100644 --- a/arch/tde-base/tde-tdeutils/PKGBUILD +++ b/arch/tde-base/tde-tdeutils/PKGBUILD @@ -5,7 +5,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="The TDE something - with Trinity upstream" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ conflicts=("trinity-${_mod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!emptydirs') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('9d5bc073642e7f540f9c168e7d8ea989') +md5sums=('d5b2c81c4fc59351ae1be3059fc5df1f') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity |