ArchLinux: Update for final R14.1.1.

Signed-off-by: Slávek Banko <[email protected]>

15 files changed, 38 insertions, 115 deletions

diff --git a/arch/tde-core/tde-arts/PKGBUILD b/arch/tde-core/tde-arts/PKGBUILD
index 4ac6f49a4..dcd844973 100644
--- a/arch/tde-core/tde-arts/PKGBUILD
+++ b/arch/tde-core/tde-arts/PKGBUILD
@@ -8,7 +8,7 @@ _cat=dependencies/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.1.0
+pkgver=14.1.1
 pkgrel=1
 pkgdesc="Trinity aRts Sound System and libraries"
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
@@ -33,7 +33,7 @@ conflicts=("kdemod3-${_mod}" "${_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=('8be9fc684e28efb1d13613acf7a607cf')
+md5sums=('620d604dda61d0deaf23475b20569cd5')
 install="tde-${_mod}.install"
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
diff --git a/arch/tde-core/tde-avahi-tqt/PKGBUILD b/arch/tde-core/tde-avahi-tqt/PKGBUILD
index c45e69afe..1b1a73e3f 100644
--- a/arch/tde-core/tde-avahi-tqt/PKGBUILD
+++ b/arch/tde-core/tde-avahi-tqt/PKGBUILD
@@ -6,7 +6,7 @@ _cat=dependencies/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.1.0
+pkgver=14.1.1
 pkgrel=1
 pkgdesc="Trinity Avahi-TQt"
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
@@ -20,7 +20,7 @@ provides=("${_mod}")
 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=('1edb610efb82db7244fa87564defbea5')
+md5sums=('5a8343fb4e4c33e0cfc78c6e6650b6ac')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
diff --git a/arch/tde-core/tde-cmake/PKGBUILD b/arch/tde-core/tde-cmake/PKGBUILD
index 2037b308c..487382e7a 100644
--- a/arch/tde-core/tde-cmake/PKGBUILD
+++ b/arch/tde-core/tde-cmake/PKGBUILD
@@ -5,7 +5,7 @@ _cat=dependencies/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod/tde-}"
-pkgver=14.1.0
+pkgver=14.1.1
 pkgrel=1
 pkgdesc="TDE CMake modules"
 arch=('any')
@@ -25,7 +25,7 @@ options=('staticlibs' 'libtool' '!strip')
 install=
 
 source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-${pkgver}.tar.xz")
-md5sums=('70bcd49a0df9b6c51c14787a762cc36e')
+md5sums=('f188cc34625c98a32f4c4d6738042419')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3
diff --git a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD
index 882705040..799e1b154 100644
--- a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD
+++ b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD
@@ -8,7 +8,7 @@ _cat=dependencies/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.1.0
+pkgver=14.1.1
 pkgrel=1
 pkgdesc="Trinity D-Bus TQtInterface Wrapper - from TDE upstream GIT"
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
@@ -22,7 +22,7 @@ conflicts=("trinity-${_mod}")
 replaces=("trinity-${_mod}" 'trinity-dbus-1-qt3' 'dbus-1-qt3')
 options=('staticlibs' 'libtool' '!strip')
 source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('9ccadae19ce306394fead18366bed01f')
+md5sums=('2faaaba3f430f16f40b5df816f96573b')
 install="trinity-${_mod}.install"
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
diff --git a/arch/tde-core/tde-dbus-tqt/PKGBUILD b/arch/tde-core/tde-dbus-tqt/PKGBUILD
index d64af9e22..f4cfa5759 100644
--- a/arch/tde-core/tde-dbus-tqt/PKGBUILD
+++ b/arch/tde-core/tde-dbus-tqt/PKGBUILD
@@ -8,7 +8,7 @@ _cat=dependencies/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.1.0
+pkgver=14.1.1
 pkgrel=1
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
 url="https://scm.trinitydesktop.org/scm/git/${_mod}"
@@ -20,7 +20,7 @@ makedepends=('tde-cmake-trinity')
 provides=("${_mod}")
 options=('staticlibs' 'libtool' '!strip')
 source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('2d9dcc8d701d4440421de2caca40d46c')
+md5sums=('631f68c433eb730218c3e9ee8385ea69')
 install="trinity-${_mod}.install"
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
diff --git a/arch/tde-core/tde-libart-lgpl/PKGBUILD b/arch/tde-core/tde-libart-lgpl/PKGBUILD
index b6500447c..fd0f24986 100644
--- a/arch/tde-core/tde-libart-lgpl/PKGBUILD
+++ b/arch/tde-core/tde-libart-lgpl/PKGBUILD
@@ -6,7 +6,7 @@ _cat=dependencies/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.1.0
+pkgver=14.1.1
 pkgrel=1
 pkgdesc="Trinity Desktop LGPL'd Component"
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
@@ -22,7 +22,7 @@ replaces=()
 options=('staticlibs' 'libtool' '!strip')
 install=
 source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('d8b1bdee79029bf799e0b19de1992b89')
+md5sums=('4832489e7ca5db88bc0c7741e9ddb6bd')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
diff --git a/arch/tde-core/tde-polkit-tqt/PKGBUILD b/arch/tde-core/tde-polkit-tqt/PKGBUILD
index adbcb3b5a..c3168e3a9 100644
--- a/arch/tde-core/tde-polkit-tqt/PKGBUILD
+++ b/arch/tde-core/tde-polkit-tqt/PKGBUILD
@@ -6,7 +6,7 @@ _cat=dependencies/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.1.0
+pkgver=14.1.1
 pkgrel=1
 pkgdesc="Trinity PolicyKit-tqt library"
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
@@ -20,7 +20,7 @@ conflicts=("trinity-${_mod}")
 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=('b23701be9de74f5cf962c0c17496b683')
+md5sums=('9d8828526fa2abfa761d952b2ed78ecc')
 install="trinity-${_mod}.install"
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
diff --git a/arch/tde-core/tde-tdebase/PKGBUILD b/arch/tde-core/tde-tdebase/PKGBUILD
index fa2120a43..1f76515b4 100644
--- a/arch/tde-core/tde-tdebase/PKGBUILD
+++ b/arch/tde-core/tde-tdebase/PKGBUILD
@@ -6,7 +6,7 @@ _cat=core/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.1.0
+pkgver=14.1.1
 pkgrel=1
 pkgdesc="Trinity Desktop Enviroment base components"
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
@@ -14,23 +14,24 @@ url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 provides=("${_mod}")
 groups=('tde-core')
-depends=('libraw1394'
+depends=('htdig'
+         'libraw1394'
          'libssh'
-         'libxtst'
          'libxss'
+         'libxtst'
          'lm_sensors'
-         'tde-tdelibs'
+         'openssl'
          'tde-dbus-1-tqt'
+         'tde-tdelibs'
          'ttf-dejavu'
          'ttf-freefont'
          'xorg-server'
-         'xorg-xinit'
-         'htdig'
-         'openssl')
+         'xorg-xinit')
 makedepends=('tde-cmake-trinity'
          'libxkbfile'
-         'smbclient'
          'rpcsvc-proto'
+         'smbclient'
+         'systemd-sysvcompat'
          'xorg-bdftopcf'
          'xscreensaver')
 optdepends=('desktop-file-utils: Command line utilities for working with desktop entries'
@@ -58,7 +59,7 @@ source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/
         'tdm.service'
         'xsession.patch')
 
-md5sums=('4190fe36fb22e1f18ddc86bb61bb76f2'
+md5sums=('105b7a69e0ed95af0e4ff0f141958205'
          '18e8d01124b19f7df2937c06e177bf7f'
          'c963ef6e37c9051119972a58c67f05fb'
          'bb4c25e560fa719e8e8f49ef80bd1c99'
diff --git a/arch/tde-core/tde-tdelibs/PKGBUILD b/arch/tde-core/tde-tdelibs/PKGBUILD
index 093d0fa4f..c8f67d616 100644
--- a/arch/tde-core/tde-tdelibs/PKGBUILD
+++ b/arch/tde-core/tde-tdelibs/PKGBUILD
@@ -8,8 +8,8 @@ _cat=core/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.1.0
-pkgrel=2
+pkgver=14.1.1
+pkgrel=1
 pkgdesc="Trinity Desktop core libraries and applications"
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
 url="https://scm.trinitydesktop.org/scm/git/${_mod}"
@@ -46,21 +46,13 @@ provides=("${_mod}")
 conflicts=("trinity-${_kdemod}" "trinity-${_mod}" "kdemod3-${_kdemod}" "${_kdemod}3")
 replaces=("trinity-${_kdemod}" "trinity-${_mod}")
 options=('staticlibs' 'libtool' '!makeflags' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
-        'bp000-41336d84c9.diff')
-md5sums=('24990c41b5aaf32844adb3eab1a26818'
-         '8344b0545a204e879187b42c983b32e4')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('c0191df81fc351a8a55e7a503cccabe6')
 
 install="trinity-${_mod}.install"
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
-prepare() {
-  msg "Apply backported patches"
-  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1
-  patch -p1 < ${srcdir}/bp000-41336d84c9.diff
-}
-
 build() {
   msg "Creating out-of-source build directory: ${srcdir}/build"
   mkdir -p ${srcdir}/build
diff --git a/arch/tde-core/tde-tdelibs/bp000-41336d84c9.diff b/arch/tde-core/tde-tdelibs/bp000-41336d84c9.diff
deleted file mode 100644
index ab9a9513b..000000000
--- a/arch/tde-core/tde-tdelibs/bp000-41336d84c9.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 41336d84c91181da148be31a0b9f469037d3669d
-Author: Michele Calgaro <[email protected]>
-Date:   Mon Jun 12 22:15:53 2023 +0900
-
-    Rework and fix commit 4d90cc61
-    
-    Signed-off-by: Michele Calgaro <[email protected]>
-    (cherry picked from commit 54b58986491c48408c720d706e5cbfd1043d3ee6)
-
-diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp
-index 43b0c808..cbe1a81d 100644
---- a/tdeio/tdeio/job.cpp
-+++ b/tdeio/tdeio/job.cpp
-@@ -114,9 +114,18 @@ public:
-     unsigned long m_userTimestamp;
- };
- 
--static TQObject *__job_root_obj = new TQObject(0, "jobroot");
-+static TQObject *__job_root_obj = nullptr;
- 
--Job::Job(bool showProgressInfo) : TQObject(__job_root_obj, "job"), m_error(0), m_percent(0)
-+static TQObject* __getJobRoot()
-+{
-+    if (!__job_root_obj)
-+    {
-+        __job_root_obj = new TQObject(0, "jobroot");
-+    }
-+    return __job_root_obj;
-+}
-+
-+Job::Job(bool showProgressInfo) : TQObject(__getJobRoot(), "job"), m_error(0), m_percent(0)
-    , m_progressId(0), m_speedTimer(0), d( new JobPrivate )
- {
-     // All jobs delete themselves after emiting 'result'.
diff --git a/arch/tde-core/tde-tqca-tls/PKGBUILD b/arch/tde-core/tde-tqca-tls/PKGBUILD
index 2a766ca62..7fe1e17b7 100644
--- a/arch/tde-core/tde-tqca-tls/PKGBUILD
+++ b/arch/tde-core/tde-tqca-tls/PKGBUILD
@@ -8,7 +8,7 @@ _cat=dependencies/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.1.0
+pkgver=14.1.1
 pkgrel=1
 pkgdesc="Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)"
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
@@ -22,7 +22,7 @@ conflicts=("trinity-${_mod}")
 replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
 source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod%-tls}-trinity-${pkgver}.tar.xz")
-md5sums=('54962b13ac1c53f0a89b2e8c3809eb1d')
+md5sums=('67b1edf8826cf97c281ab70cec5e9b7c')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3
diff --git a/arch/tde-core/tde-tqca/PKGBUILD b/arch/tde-core/tde-tqca/PKGBUILD
index f74690ede..54e442603 100644
--- a/arch/tde-core/tde-tqca/PKGBUILD
+++ b/arch/tde-core/tde-tqca/PKGBUILD
@@ -9,7 +9,7 @@ _cat=dependencies/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.1.0
+pkgver=14.1.1
 pkgrel=1
 pkgdesc="Trinity SSL/TLS interface for TQt Cryptographic Architecture (TQCA)"
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
@@ -23,7 +23,7 @@ conflicts=("trinity-${_mod}")
 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=('54962b13ac1c53f0a89b2e8c3809eb1d')
+md5sums=('67b1edf8826cf97c281ab70cec5e9b7c')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3
diff --git a/arch/tde-core/tde-tqt3/PKGBUILD b/arch/tde-core/tde-tqt3/PKGBUILD
index 60893b1bb..ee61e7743 100644
--- a/arch/tde-core/tde-tqt3/PKGBUILD
+++ b/arch/tde-core/tde-tqt3/PKGBUILD
@@ -9,8 +9,8 @@ _kdemod="${_mod/tde/kde}"
 
 pkgbase="tde-${_mod}"
 pkgname=("$pkgbase" "${pkgbase}-docs")
-pkgver=14.1.0
-pkgrel=2
+pkgver=14.1.1
+pkgrel=1
 pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3"
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
 url="https://scm.trinitydesktop.org/scm/git/${_mod}"
@@ -29,19 +29,11 @@ makedepends=('libcups'
         'libxft'
         'libxmu'
         'glu')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
-        'bp000-984ea06ed6.diff')
-md5sums=('e19fa258ec0cad29a169bc3148fa52db'
-         '9f8d4b37f315eb12b487b6e4418d8a23')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('ea0a0ea6b20a4b0bda9bb4af575cb88e')
 
 _prefix="/opt/trinity/tqt3"
 
-prepare() {
-  msg "Apply backported patches"
-  cd ${srcdir}/${_mod}-trinity-${pkgver} || exit 1
-  patch -p1 < ${srcdir}/bp000-984ea06ed6.diff
-}
-
 build() {
 
   cd ${srcdir}/${_mod}-trinity-${pkgver}
diff --git a/arch/tde-core/tde-tqt3/bp000-984ea06ed6.diff b/arch/tde-core/tde-tqt3/bp000-984ea06ed6.diff
deleted file mode 100644
index c20eb57e0..000000000
--- a/arch/tde-core/tde-tqt3/bp000-984ea06ed6.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 984ea06ed6ce702d98fcfe08dc353d58f3f0bcbc
-Author: Michele Calgaro <[email protected]>
-Date:   Mon Jun 12 10:46:33 2023 +0900
-
-    Revert "Add single TQObject root parent for all guarded pointers."
-    Commit b167d09c was functionally incorrect and is causing issues on
-    selected distributions.
-    This reverts commit b167d09c43be6c8b7d30f0d4fb1bf1e86c51b8a7.
-    This resolves issue TDE/tde#128.
-    
-    (cherry picked from commit fb1f3d64451e8cc405b5db572e2c506564a05680)
-
-diff --git a/src/kernel/qguardedptr.cpp b/src/kernel/qguardedptr.cpp
-index 3ac27e7a..803e75e1 100644
---- a/src/kernel/qguardedptr.cpp
-+++ b/src/kernel/qguardedptr.cpp
-@@ -194,10 +194,9 @@
- 
- /* Internal classes */
- 
--static TQObject *__ptrpriv_root_obj = new TQObject(0, "_ptrpriv_root");
- 
- TQGuardedPtrPrivate::TQGuardedPtrPrivate( TQObject* o)
--    : TQObject(__ptrpriv_root_obj, "_ptrpriv" ), obj( o )
-+    : TQObject(0, "_ptrpriv" ), obj( o )
- {
-     if ( obj )
- 	connect( obj, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) );
diff --git a/arch/tde-core/tde-tqtinterface/PKGBUILD b/arch/tde-core/tde-tqtinterface/PKGBUILD
index 8eb2a85bd..30e6e470b 100644
--- a/arch/tde-core/tde-tqtinterface/PKGBUILD
+++ b/arch/tde-core/tde-tqtinterface/PKGBUILD
@@ -8,7 +8,7 @@ _cat=dependencies/
 _kdemod="${_mod/tde/kde}"
 
 pkgname="tde-${_mod}"
-pkgver=14.1.0
+pkgver=14.1.1
 pkgrel=1
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
 url="https://scm.trinitydesktop.org/scm/git/${_mod}"
@@ -24,7 +24,7 @@ replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!emptydirs' '!strip')
 
 source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('d7c803486ad808715e7539b6f8843c29')
+md5sums=('59025eebafd8cf125e94ca14bc9a4fd7')
 
 install="trinity-${_mod}.install"