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 | 4 | ||||
| -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 | 14 | ||||
| -rw-r--r-- | arch/tde-base/tde-tdegraphics/bp000-support-poppler-25.10.diff | 107 | ||||
| -rw-r--r-- | arch/tde-base/tde-tdeutils/PKGBUILD | 4 |
8 files changed, 128 insertions, 17 deletions
diff --git a/arch/tde-base/tde-i18n/PKGBUILD b/arch/tde-base/tde-i18n/PKGBUILD index 2a173eef5..2b992c2c7 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.1.4 +pkgver=14.1.5 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=('a560d5d6c58dae278e66d5bf031b302d') +md5sums=('3427b592dbd37c72422e03e63740a0b4') install='' _languages=( diff --git a/arch/tde-base/tde-polkit-agent-tde/PKGBUILD b/arch/tde-base/tde-polkit-agent-tde/PKGBUILD index 51b93508e..6d9eeb540 100644 --- a/arch/tde-base/tde-polkit-agent-tde/PKGBUILD +++ b/arch/tde-base/tde-polkit-agent-tde/PKGBUILD @@ -6,7 +6,7 @@ _cat=applications/system/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.1.4 +pkgver=14.1.5 pkgrel=1 pkgdesc="TDE dialogs for PolicyKit" arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') @@ -28,7 +28,7 @@ options=('staticlibs' 'libtool' '!strip') install= source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('90908ed5386168780b1cd903fbfc182f') +md5sums=('4bc175fafccf772eb7dea04f1e5ffe0e') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 diff --git a/arch/tde-base/tde-tdeadmin/PKGBUILD b/arch/tde-base/tde-tdeadmin/PKGBUILD index 513a6cb60..05b691f55 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.1.4 +pkgver=14.1.5 pkgrel=1 pkgdesc="The TDE system administration utilities" arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') @@ -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=('00e84e599deedbb880a11dc90adb130b') +md5sums=('cecfba7da349214893b6a1138620b2ac') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-base/tde-tdeartwork/PKGBUILD b/arch/tde-base/tde-tdeartwork/PKGBUILD index ec357da78..50444b85f 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.1.4 +pkgver=14.1.5 pkgrel=1 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') 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=('d7f8227b2f9950fae21bd446089d5063') +md5sums=('dccfca642266be150af1fd53bae02265') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-base/tde-tdebindings/PKGBUILD b/arch/tde-base/tde-tdebindings/PKGBUILD index 431576267..c8681c8ed 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.1.4 +pkgver=14.1.5 pkgrel=1 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https//scm.trinitydesktop.org/scm/git/${_mod}" @@ -19,7 +19,7 @@ depends=('tde-tdelibs') makedepends=('pkgconfig' 'autoconf' 'python3' 'python-setuptools' 'ruby' 'jdk-openjdk') options=('staticlibs' 'libtool' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('ef9e343d5744e9290440e9af2156b9f3') +md5sums=('02388c1d92a5a36ec50613d09d59aa48') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 diff --git a/arch/tde-base/tde-tdegraphics/PKGBUILD b/arch/tde-base/tde-tdegraphics/PKGBUILD index 2bcd7d56a..f47f0a747 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.1.4 -pkgrel=2 +pkgver=14.1.5 +pkgrel=1 pkgdesc="Trinity Desktop Graphics Components" arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -19,8 +19,12 @@ provides=("${_mod}") 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=('3dd7caa87dfb6201fff63de63da825a0') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" + "bp000-support-poppler-25.10.diff" +) +md5sums=('f86818598c09fda4dc8ea5678288f893' + 'd58141aac77b2d319e939b2178a75ea0' +) # install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity @@ -28,7 +32,7 @@ md5sums=('3dd7caa87dfb6201fff63de63da825a0') prepare() { msg "Apply backported patches" cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1 -# patch -p1 < ${srcdir}/bp000-?.diff + patch -p1 < ${srcdir}/bp000-support-poppler-25.10.diff } build() { diff --git a/arch/tde-base/tde-tdegraphics/bp000-support-poppler-25.10.diff b/arch/tde-base/tde-tdegraphics/bp000-support-poppler-25.10.diff new file mode 100644 index 000000000..46282df96 --- /dev/null +++ b/arch/tde-base/tde-tdegraphics/bp000-support-poppler-25.10.diff @@ -0,0 +1,107 @@ +commit 7de16ecd1e7afda4fd043128289cc9f9cd75aa22 +Author: Slávek Banko <slavek.banko@axis.cz> +Date: Mon Nov 3 15:50:00 2025 +0100 + + Add support for Poppler >= 25.10. + Fix confusing formatting in DocumentData::addTocChildren. + + Signed-off-by: Slávek Banko <slavek.banko@axis.cz> + +diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp +index 5ed02af6..81c6b04a 100644 +--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp ++++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp +@@ -88,7 +88,10 @@ bool Document::unlock(const TQCString &password) + { + if (data->locked) { + /* racier then it needs to be */ +-# if (POPPLER_VERSION_C >= 22003000) ++# if (POPPLER_VERSION_C >= 25010000) ++ DocumentData *doc2 = new DocumentData(data->doc.getFileName()->copy(), ++ GooString(password.data())); ++# elif (POPPLER_VERSION_C >= 22003000) + DocumentData *doc2 = new DocumentData(std::make_unique<GooString>(data->doc.getFileName()), + GooString(password.data())); + # else +@@ -225,7 +228,14 @@ TQString Document::getInfo( const TQString & type ) const + isUnicode = gFalse; + i = 0; + } +- while ( i < obj.getString()->getLength() ) ++ while ++ ( ++# if (POPPLER_VERSION_C >= 25010000) ++ i < obj.getString()->size() ++# else ++ i < obj.getString()->getLength() ++# endif ++ ) + { + if ( isUnicode ) + { +diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.cpp +index 42ec0899..d5c028d1 100644 +--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.cpp ++++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.cpp +@@ -57,7 +57,14 @@ TQString UnicodeParsedString(CONST_064 GooString *s1) + isUnicode = gFalse; + i = 0; + } +- while ( i < s1->getLength() ) ++ while ++ ( ++# if (POPPLER_VERSION_C >= 25010000) ++ i < s1->size() ++# else ++ i < s1->getLength() ++# endif ++ ) + { + if ( isUnicode ) + { +@@ -129,23 +136,31 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, O + // get the destination for the page now, but it's VERY time consuming, + // so better storing the reference and provide the viewport on demand + CONST_064 GooString *s = g->getNamedDest(); +- TQChar *charArray = new TQChar[s->getLength()]; +- for (int i = 0; i < s->getLength(); ++i) charArray[i] = TQChar(s->GOO_GET_CSTR()[i]); +- TQString aux(charArray, s->getLength()); +- item.setAttribute( "DestinationName", aux ); +- delete[] charArray; +- } +- else if ( destination && destination->isOk() ) +- { +- LinkDestinationData ldd(destination, NULL, this); +- item.setAttribute( "Destination", LinkDestination(ldd).toString() ); +- } +- if ( a->getKind() == actionGoToR ) ++# if (POPPLER_VERSION_C >= 25010000) ++ int sLen = s->size(); ++# else ++ int sLen = s->getLength(); ++# endif ++ TQChar *charArray = new TQChar[sLen]; ++ for (int i = 0; i < sLen; ++i) + { +- CONST_064 LinkGoToR * g2 = static_cast< CONST_064 LinkGoToR * >( a ); +- item.setAttribute( "ExternalFileName", g2->getFileName()->GOO_GET_CSTR() ); ++ charArray[i] = TQChar(s->GOO_GET_CSTR()[i]); + } ++ TQString aux(charArray, sLen); ++ item.setAttribute( "DestinationName", aux ); ++ delete[] charArray; ++ } ++ else if ( destination && destination->isOk() ) ++ { ++ LinkDestinationData ldd(destination, NULL, this); ++ item.setAttribute( "Destination", LinkDestination(ldd).toString() ); ++ } ++ if ( a->getKind() == actionGoToR ) ++ { ++ CONST_064 LinkGoToR * g2 = static_cast< CONST_064 LinkGoToR * >( a ); ++ item.setAttribute( "ExternalFileName", g2->getFileName()->GOO_GET_CSTR() ); + } ++ } + + // 3. recursively descend over children + outlineItem->open(); diff --git a/arch/tde-base/tde-tdeutils/PKGBUILD b/arch/tde-base/tde-tdeutils/PKGBUILD index 6b46ad464..981c57028 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.1.4 +pkgver=14.1.5 pkgrel=1 pkgdesc="The TDE something - with Trinity upstream" arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') @@ -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=('662746e079bd9acd7bdbacad0eb5ed4c') +md5sums=('86885eb169c56158fe4ae38ec0da49dd') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity |
