8 files changed, 39 insertions, 118 deletions
diff --git a/arch/tde-base/tde-i18n/PKGBUILD b/arch/tde-base/tde-i18n/PKGBUILD
index f598f6a1e..f8b8f9027 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.12
+pkgver=14.1.2
 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=('62e049f7717401eed9994d05c1430578')
+md5sums=('3a165ecd6de977e0a1f82c65e9944a2a')
 install=''
 
 _languages=(
diff --git a/arch/tde-base/tde-polkit-agent-tde/PKGBUILD b/arch/tde-base/tde-polkit-agent-tde/PKGBUILD
index c27ddf9d9..abcf49cf1 100644
--- a/arch/tde-base/tde-polkit-agent-tde/PKGBUILD
+++ b/arch/tde-base/tde-polkit-agent-tde/PKGBUILD
@@ -6,10 +6,10 @@ _cat=applications/system/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.0.12
+pkgver=14.1.2
 pkgrel=1
 pkgdesc="TDE dialogs for PolicyKit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
 url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 provides=("${_mod}")
@@ -28,10 +28,10 @@ options=('staticlibs' 'libtool' '!strip')
 install=
 
 source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('3d3987adfcac0d9bd9e342d58fd063a8')
+md5sums=('3892b26a67a70e07e04eab601f6d34e1')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
-[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3
 
 build() {
   msg "Creating out-of-source build directory: ${srcdir}/build"
diff --git a/arch/tde-base/tde-tdeadmin/PKGBUILD b/arch/tde-base/tde-tdeadmin/PKGBUILD
index a1ca30728..7064830c5 100644
--- a/arch/tde-base/tde-tdeadmin/PKGBUILD
+++ b/arch/tde-base/tde-tdeadmin/PKGBUILD
@@ -6,10 +6,10 @@ _cat=core/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.0.12
+pkgver=14.1.2
 pkgrel=1
 pkgdesc="The TDE system administration utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
 url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-base')
@@ -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=('e76c21cbd47a42c2d71e882c2f1283c2')
+md5sums=('f6dcc2cd8aed31a3acc071c15170367e')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
diff --git a/arch/tde-base/tde-tdeartwork/PKGBUILD b/arch/tde-base/tde-tdeartwork/PKGBUILD
index 12c2cc377..6b77b9da7 100644
--- a/arch/tde-base/tde-tdeartwork/PKGBUILD
+++ b/arch/tde-base/tde-tdeartwork/PKGBUILD
@@ -6,9 +6,9 @@ _cat=core/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.0.12
+pkgver=14.1.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
 url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-base')
@@ -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=('a5dd6908aff6731593deddaaefcd03cd')
+md5sums=('ff436b524d2c79e9116d8b76edb94b76')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
diff --git a/arch/tde-base/tde-tdebindings/PKGBUILD b/arch/tde-base/tde-tdebindings/PKGBUILD
index cd59a6156..04fd9f713 100644
--- a/arch/tde-base/tde-tdebindings/PKGBUILD
+++ b/arch/tde-base/tde-tdebindings/PKGBUILD
@@ -8,47 +8,52 @@ _cat=core/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.0.12
+pkgver=14.1.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
 url="https//scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-base')
 pkgdesc="Trinity Desktop bindings"
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'autoconf' 'imake' 'python2' 'ruby' 'jdk-openjdk' 'gtk2')
+makedepends=('pkgconfig' 'autoconf' 'python3' '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=('305423d327fe5b7ca3260932044fa51d')
+md5sums=('c5a3a1bc27faa1c2b9b00a3bbac2ab4e')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
-[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3
 
 build() {
   ## Generate config files and update with autoreconf
   cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
 
   msg "Copying system libtool files...."
+  cp -a /usr/share/libtool/build-aux/config.guess ./admin/
+  cp -a /usr/share/libtool/build-aux/config.sub ./admin/
   cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
   cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
 
   msg "Running make -f admin/Makefile.common ...."
   make -f admin/Makefile.common
 
+  export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${TQTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
   ## configure
   msg "Configuring - ${pkgname}..."
-  PYTHON=/usr/bin/python2 \
+  PYTHON=/usr/bin/python3 \
   ./configure \
     --prefix=${TDEDIR} \
-    --with-qt-dir=${QTDIR} \
-    --with-qt-includes=${QTDIR}/include \
-    --with-qt-libraries=${QTDIR}/lib \
-    --with-extra-includes="/usr/include/tqt:/usr/include/tqt/Qt" \
+    --with-tqt-dir=${TQTDIR} \
+    --with-tqt-includes=${TQTDIR}/include \
+    --with-tqt-libraries=${TQTDIR}/lib \
+    --with-extra-includes="/usr/include/tqt" \
     --with-extra-libs="${TDEDIR}/lib:${TDEDIR}/lib/trinity" \
     --with-java=/usr/lib/jvm/default \
     --sysconfdir=${TDEDIR}/etc \
     --localstatedir=/var \
-    --enable-closure
+    --enable-closure \
+    DO_NOT_COMPILE='dcopc dcopperl kalyptus qtsharp xparts'
 
   msg "Building - ${pkgname}..."
   make $NUMJOBS
diff --git a/arch/tde-base/tde-tdegraphics/PKGBUILD b/arch/tde-base/tde-tdegraphics/PKGBUILD
index 3b5beae8f..8282fd065 100644
--- a/arch/tde-base/tde-tdegraphics/PKGBUILD
+++ b/arch/tde-base/tde-tdegraphics/PKGBUILD
@@ -6,23 +6,21 @@ _cat=core/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.0.12
+pkgver=14.1.2
 pkgrel=2
 pkgdesc="Trinity Desktop Graphics Components"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
 url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-base')
-depends=('tde-tdelibs' 'fribidi' 'imlib' 'libgphoto2' 'libpaper' 'poppler' 'sane' 't1lib')
+depends=('tde-tdelibs' 'fribidi' 'imlib' 'libgphoto2' 'libpaper' 'poppler' 'sane')
 makedepends=('tde-cmake-trinity')
 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"
-        'bp000-poppler-2203.diff')
-md5sums=('9e91406d7e02515a41ae60bd2a21440a'
-         'cd9b5a969ce31dae64fb8764a5e7b60f')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('7e10e0c0efd15d0d2b099f489e9776eb')
 # install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
@@ -30,7 +28,7 @@ md5sums=('9e91406d7e02515a41ae60bd2a21440a'
 prepare() {
   msg "Apply backported patches"
   cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1
-  patch -p1 < ${srcdir}/bp000-poppler-2203.diff
+#  patch -p1 < ${srcdir}/bp000-?.diff
 }
 
 build() {
@@ -46,7 +44,6 @@ build() {
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
      -DBUILD_ALL=ON \
-     -DWITH_T1LIB=ON \
      -DWITH_PAPER=ON \
      -DWITH_TIFF=ON \
      -DWITH_OPENEXR=ON \
diff --git a/arch/tde-base/tde-tdegraphics/bp000-poppler-2203.diff b/arch/tde-base/tde-tdegraphics/bp000-poppler-2203.diff
deleted file mode 100644
index aa170d53e..000000000
--- a/arch/tde-base/tde-tdegraphics/bp000-poppler-2203.diff
+++ /dev/null
@@ -1,81 +0,0 @@
-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 91c530e94..e2b8b9c13 100644
--- a/arch/tde-base/tde-tdeutils/PKGBUILD
+++ b/arch/tde-base/tde-tdeutils/PKGBUILD
@@ -5,22 +5,22 @@ _cat=core/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.0.12
+pkgver=14.1.2
 pkgrel=1
 pkgdesc="The TDE something - with Trinity upstream"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
 url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-base')
-depends=('tde-tdebase' 'xmms2')
-makedepends=('tde-cmake-trinity' 'python2')
+depends=('tde-tdebase')
+makedepends=('tde-cmake-trinity' 'python3')
 optdepends=()
 provides=("${_mod}")
 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=('d5b2c81c4fc59351ae1be3059fc5df1f')
+md5sums=('3a03977fbffe309415906d282fd70012')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity