ArchLinux: Update to R14.0.11

+ Add standalone package tde-cmake-trinity
+ Switch CMake builds to use Ninja
+ Switch some packages to CMake
+ Add tde-tqca and tde-akode
+ Add tde-i18n packages

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1838e1a41f)

arch/PKGBUILD.template

@@ -4,8 +4,9 @@
 _mod=tdepowersave
 _cat=applications/
 _kdemod="${_mod/tde/kde}"
+
 pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Trinity Desktop Enviroment $_cat$_mod"
 arch=('i686' 'x86_64')
@@ -17,12 +18,12 @@ depends=(
   'tde-tdelibs'
 )
 makedepends=(
+  'tde-cmake-trinity'
   'autoconf'
-  'cmake'
   'pkgconfig'
 )
 optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
 replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
 install=
@@ -40,18 +41,19 @@ build() {
 
   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_GCC_VISIBILITY=ON
+    -DWITH_ALL_OPTIONS=ON
 
   msg "Building - ${pkgname}..."
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - ${pkgname}-${pkgver}"
   cd "$srcdir/build"
-  make -j1 DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -j1 install
 }

arch/build.sh

@@ -17,10 +17,10 @@ compile_directory() {
 }
 
 ### Build Packages
-compile_directory tde-core "tqt3 tqtinterface arts dbus-tqt dbus-1-tqt tqca-tls libart-lgpl avahi-tqt tdelibs tdebase"
+compile_directory tde-core "cmake-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt tqca tqca-tls libart-lgpl avahi-tqt tdelibs tdebase"
 compile_directory tde-libs "libcaldav libcarddav libkdcraw libkexiv2"
-compile_directory tde-base "tdeartwork tdebindings tdegraphics tdeutils tdeadmin"
+compile_directory tde-base "tde-i18n tdeartwork tdebindings tdegraphics tdeutils tdeadmin"
-compile_directory tde-extra "tdepim tdemultimedia tdenetwork tdeedu tdegames tdetoys tdeaccessibility tdeaddons gtk-qt-engine gtk3-tqt-engine systemsettings abakus amarok basket kmplayer krusader ksplash-engine-moodin style-qtcurve tdenetworkmanager tdepowersave tdesudo tdmtheme tork twin-style-crystal yakuake"
+compile_directory tde-extra "akode tdepim tdemultimedia tdenetwork tdeedu tdegames tdetoys tdeaccessibility tdeaddons gtk-qt-engine gtk3-tqt-engine systemsettings abakus amarok basket kmplayer krusader ksplash-engine-moodin style-qtcurve tdenetworkmanager tdepowersave tdesudo tdmtheme tork twin-style-crystal yakuake"
 compile_directory tde-devel "tdesdk tdevelop tdewebdev"
 
 ### Copy completed packages to out folder and download dependencies to out folder
@@ -29,7 +29,7 @@ mkdir -p $tdesrc/out
 cp $(find $tdesrc -name *.pkg.tar.zst) $tdesrc/out
 wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/htdig-3.2.0b6-11-x86_64.pkg.tar.xz -O $tdesrc/out/htdig-3.2.0b6-11-x86_64.pkg.tar.xz
 wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/lcms-1.19-7-x86_64.pkg.tar.xz -O $tdesrc/out/lcms-1.19-7-x86_64.pkg.tar.xz
-wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/pod2man-5.30.2-1-x86_64.pkg.tar.zst
+wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/pod2man-5.30.2-1-x86_64.pkg.tar.zst -O $tdesrc/out/pod2man-5.30.2-1-x86_64.pkg.tar.zst
 wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/python2-lcms-1.19-7-x86_64.pkg.tar.xz -O $tdesrc/out/python2-lcms-1.19-7-x86_64.pkg.tar.xz
 
 ### Create trinity pacman repo

arch/tde-base/tde-i18n/PKGBUILD

@@ -0,0 +1,148 @@
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=tde-i18n
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgbase="tde-${_mod/tde-}"
+pkgname=("$pkgbase")
+pkgver=14.0.11
+pkgrel=1
+pkgdesc="Internationalized (i18n) files for TDE"
+arch=('any')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-base')
+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')
+install=''
+
+_languages=(
+  'af               "Afrikaans"'
+  'ar               "Arabic"'
+  'az               "Azerbaijani"'
+  'be               "Belarusian"'
+  'bg               "Bulgarian"'
+  'bn               "Bengali"'
+  'br               "Breton"'
+  'bs               "Bosnian"'
+  'ca               "Catalan"'
+  'cs               "Czech"'
+  'csb              "Kashubian"'
+  'cy               "Welsh"'
+  'da               "Danish"'
+  'de               "German"'
+  'el               "Greek"'
+  'en_GB            "English (British)"'
+  'eo               "Esperanto"'
+  'es               "Spanish"'
+  'es_AR            "Spanish (Argentina)"'
+  'et               "Estonian"'
+  'eu               "Basque"'
+  'fa               "Persian"'
+  'fi               "Finnish"'
+  'fr               "French"'
+  'fy               "Frisian"'
+  'ga               "Irish"'
+  'gl               "Galician"'
+  'he               "Hebrew"'
+  'hi               "Hindi"'
+  'hr               "Croatian"'
+  'hu               "Hungarian"'
+  'is               "Icelandic"'
+  'it               "Italian"'
+  'ja               "Japanese"'
+  'kk               "Kazakh"'
+  'km               "Khmer"'
+  'ko               "Korean"'
+  'lt               "Lithuanian"'
+  'lv               "Latvian"'
+  'mk               "Macedonian"'
+  'mn               "Mongolian"'
+  'ms               "Malay"'
+  'nb               "Norwegian Bokmål"'
+  'nds              "Low Saxon"'
+  'nl               "Dutch"'
+  'nn               "Norwegian Nynorsk"'
+  'pa               "Punjabi"'
+  'pl               "Polish"'
+  'pt               "Portuguese"'
+  'pt_BR            "Portuguese (Brazil)"'
+  'ro               "Romanian"'
+  'ru               "Russian"'
+  'rw               "Kinyarwanda"'
+  'se               "Northern Sami"'
+  'sk               "Slovak"'
+  'sl               "Slovenian"'
+  'sr               "Serbian"'
+  'sr@Latn          "Serbian Latin"'
+  'ss               "Swati"'
+  'sv               "Swedish"'
+  'ta               "Tamil"'
+  'te               "Telugu"'
+  'tg               "Tajik"'
+  'th               "Thai"'
+  'tr               "Turkish"'
+  'uk               "Ukrainian"'
+  'uz               "Uzbek"'
+  'uz@cyrillic      "Uzbek (Cyrillic)"'
+  'vi               "Vietnamese"'
+  'wa               "Walloon"'
+  'zh_CN            "Chinese (Simplified)"'
+  'zh_TW            "Chinese (Traditional)"'
+)
+
+_pkglangs=()
+for _lang in "${_languages[@]}"; do
+  _locale=${_lang%% *}
+  _pkglang=$(echo ${_locale,,} | tr '[:upper:]' '[:lower:]' | \
+             sed "s|@latn|latin|" | \
+             tr -d "_" | tr -d "@")
+  _pkgname=${pkgbase}-${_pkglang}
+
+  pkgname+=($_pkgname)
+  _pkglangs+=($_pkgname)
+  eval "package_$_pkgname() {
+    _package $_pkglang $_lang
+  }"
+done
+
+_package() {
+  pkgdesc="$3 ($2) internationalized (i18n) files for TDE"
+  provides=("${_mod}-${1}")
+  conflicts=("trinity-${_kdemod}-${1}" "kdemod3-${_kdemod}-${1}")
+  replaces=("trinity-${_mod}-${1}")
+
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install-${2/@/_}
+}
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+     -GNinja \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package_tde-i18n() {
+  pkgdesc="All languages (all) internationalized (i18n) files for TDE"
+  provides=("${_mod}")
+  conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+  replaces=("trinity-${_mod}")
+  depends+=(${_pkglangs[@]})
+}

arch/tde-base/tde-tdeadmin/PKGBUILD

@@ -1,48 +1,52 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tdeadmin
+_mod=tdeadmin
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="The TDE system administration utilities"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-base')
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
 optdepends=()
-provides=("${pkgname#*-}")
+provides=("${_mod}")
-conflicts=("trinity-${pkgname#*-}")
+conflicts=("trinity-${_mod}")
-replaces=("${pkgname#*-}")
+replaces=("${_mod}")
 options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeadmin-trinity-${pkgver}.tar.xz")
+md5sums=('1cdc7261b0a07b2b5767024ee699d852')
-md5sums=('401907e03f80ad2433614761af6978b1')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
      -DBUILD_ALL=ON \
-     -DBUILD_KNETWORKCONF=OFF
+     -DBUILD_KNETWORKCONF=OFF \
+     -DWITH_ALL_OPTIONS=ON
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-base/tde-tdeartwork/PKGBUILD

@@ -1,48 +1,51 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tdeartwork
+_mod=tdeartwork
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdeartwork'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-base')
 pkgdesc="Trinity Desktop Development Ingegration Components - TDE upstream GIT"
 depends=('tde-tdebase' 'xscreensaver' 'libxss')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
 optdepends=()
-provides=('tdeartwork')
+provides=("${_mod}")
-conflicts=('trinity-tdeartwork' 'trinity-kdeartwork')
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
-replaces=('trinity-tdeartwork')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeartwork-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('71830a98f9d130a37ba1b3c6107fdd66')
+md5sums=('fc7ac94e49b18619699b7872339fe8d1')
-# install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-  cd $srcdir
   msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
+  mkdir -p ${srcdir}/build
-  cd build
+  cd ${srcdir}/build
 
   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
   msg "Starting cmake..."
   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+    -GNinja \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-    -DWITH_ARTS=ON \
+    -DBUILD_ALL=ON \
-    -DBUILD_ALL=ON
+    -DWITH_ALL_OPTIONS=ON
 
   msg "Building - ${pkgname#*-}..."
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-base/tde-tdebindings/PKGBUILD

@@ -3,26 +3,23 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tdebindings
+_mod=tdebindings
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url='https//scm.trinitydesktop.org/scm/git/tdebindings'
+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')
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebindings-trinity-${pkgver}.tar.xz"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-        'bp000-817f960e.diff'
+md5sums=('3f4933a66c0e1b32011148b9b4733579')
-        'bp001-8301a3c8.diff'
-        'bp002-33697c89.diff')
-md5sums=('47294367d80fa79fefa80d755a6bf93d'
-         '79e6de2ddfec059b7601fac3f3a1adc5'
-         '8267435e92a265b83efbf07db5e36c01'
-         'feb8afbd1b3467c3e36f1dffb8c5ca53')
-# install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
@@ -31,11 +28,6 @@ build() {
   ## Generate config files and update with autoreconf
   cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
 
-  msg "Apply backported patches..."
-  patch -p1 < ${srcdir}/bp000-817f960e.diff
-  patch -p1 < ${srcdir}/bp001-8301a3c8.diff
-  patch -p1 < ${srcdir}/bp002-33697c89.diff
-
   msg "Copying system libtool files...."
   cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
   cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh

arch/tde-base/tde-tdebindings/bp000-817f960e.diff

@@ -1,31 +0,0 @@
-From 817f960e8ecca5074171cfc8267dcebbb1a7f514 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Mon, 10 May 2021 20:45:41 +0200
-Subject: Fix FTBFS on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Qt.cpp:2643:17: error: ordered comparison of pointer with integer zero ('void*' and 'int')
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- qtruby/rubylib/qtruby/Qt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
-index 834cc3b2..abb44588 100644
---- a/qtruby/rubylib/qtruby/Qt.cpp
-+++ b/qtruby/rubylib/qtruby/Qt.cpp
-@@ -2640,7 +2640,7 @@ isObject(VALUE /*self*/, VALUE obj)
- {
-     void * ptr = 0;
-     ptr = value_to_ptr(obj);
--    return (ptr > 0 ? Qtrue : Qfalse);
-+    return (ptr != 0 ? Qtrue : Qfalse);
- }
- 
- static VALUE
--- 
-cgit v1.2.1
-

arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff

@@ -1,401 +0,0 @@
-From 8301a3c8e542675e9b5f310d79ad24b9a12baaf8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
-Date: Wed, 22 Sep 2021 20:38:45 +0200
-Subject: Add check whether Ruby requires explicit specification of C++
- standard.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
----
- korundum/bin/Makefile.am                  |  2 +
- korundum/configure.in.in                  | 90 +++++++++++++++++++++++++++++++
- korundum/rubylib/korundum/Makefile.am     |  2 +
- korundum/rubylib/korundum/configure.in.in | 59 --------------------
- qtruby/bin/Makefile.am                    |  2 +
- qtruby/configure.in.in                    | 90 +++++++++++++++++++++++++++++++
- qtruby/rubylib/designer/uilib/Makefile.am |  2 +
- qtruby/rubylib/qtruby/Makefile.am         |  2 +
- qtruby/rubylib/qtruby/configure.in.in     | 59 --------------------
- 9 files changed, 190 insertions(+), 118 deletions(-)
- create mode 100644 korundum/configure.in.in
- delete mode 100644 korundum/rubylib/korundum/configure.in.in
- create mode 100644 qtruby/configure.in.in
- delete mode 100644 qtruby/rubylib/qtruby/configure.in.in
-
-diff --git a/korundum/bin/Makefile.am b/korundum/bin/Makefile.am
-index 508f7731..47a8bb02 100644
---- a/korundum/bin/Makefile.am
-+++ b/korundum/bin/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
- 
- bin_PROGRAMS = krubyinit
-diff --git a/korundum/configure.in.in b/korundum/configure.in.in
-new file mode 100644
-index 00000000..c420adc9
---- /dev/null
-+++ b/korundum/configure.in.in
-@@ -0,0 +1,90 @@
-+AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
-+
-+if test -z "RUBY_EXECUTABLE"; then
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE korundum"
-+else
-+  RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-+  RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
-+
-+  RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+  RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-+  RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-+  RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-+  RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-+  RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
-+
-+  RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-+  if test "$RUBY_SERIES" -ge "19"; then
-+     AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-+  fi
-+
-+  if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-+     RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-+     if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-+        RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-+     else
-+        RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-+        RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-+     fi
-+     RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-+  else
-+     RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+     RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-+  fi
-+
-+  # check if Ruby requires explicit specification of C++ standard
-+  AC_LANG_SAVE
-+  AC_LANG_CPLUSPLUS
-+  SAVED_CXXFLAGS="$CXXFLAGS"
-+  for CXX_STD_TEST in "" 11 14 17; do
-+    CXXFLAGS="$SAVED_CXXFLAGS"
-+    if test "x$CXX_STD_TEST" = "x"; then
-+      AC_MSG_CHECKING([Ruby build with default C++ standard])
-+      RUBY_CXXFLAGS=""
-+    else
-+      AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST])
-+      RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST"
-+    fi
-+    CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS"
-+    AC_TRY_COMPILE([
-+        #include <ruby.h>
-+      ],[ ],
-+      ruby_cxx_std=yes,
-+      ruby_cxx_std=no
-+    )
-+    if test "x$ruby_cxx_std" = "xyes"; then
-+      AC_SUBST(RUBY_CXXFLAGS)
-+      AC_MSG_RESULT(yes)
-+      break
-+    else
-+      AC_MSG_RESULT(no)
-+    fi
-+  done
-+  CXXFLAGS="$SAVED_CXXFLAGS"
-+  AC_LANG_RESTORE
-+
-+  # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-+  RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-+  RUBY_SITEDIR=${RUBY_SITEDIR%/}
-+  RUBY_LIBDIR=${RUBY_LIBDIR%/}
-+  RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
-+
-+  AC_MSG_RESULT([\
-+                  archdir $RUBY_ARCHDIR,
-+                  sitearchdir $RUBY_SITEARCHDIR,
-+                  sitedir $RUBY_SITEDIR,
-+                  rubylibdir $RUBY_RUBYLIBDIR,
-+                  libdir $RUBY_LIBDIR,
-+                  includedir $RUBY_INCLUDEDIR,
-+                  librubyarg $RUBY_LIBRUBYARG,
-+                  cflags $RUBY_CFLAGS,
-+                  cxxflags $RUBY_CXXFLAGS])
-+  AC_SUBST(RUBY_ARCHDIR)
-+  AC_SUBST(RUBY_SITEARCHDIR)
-+  AC_SUBST(RUBY_SITEDIR)
-+  AC_SUBST(RUBY_RUBYLIBDIR)
-+  AC_SUBST(RUBY_LIBDIR)
-+  AC_SUBST(RUBY_INCLUDEDIR)
-+  AC_SUBST(RUBY_LIBRUBYARG)
-+  AC_SUBST(RUBY_CFLAGS)
-+fi
-diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am
-index 840b6ab6..74995c3d 100644
---- a/korundum/rubylib/korundum/Makefile.am
-+++ b/korundum/rubylib/korundum/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
- 
- rubylibdir = $(RUBY_ARCHDIR)
-diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in
-deleted file mode 100644
-index 0a987639..00000000
---- a/korundum/rubylib/korundum/configure.in.in
-+++ /dev/null
-@@ -1,59 +0,0 @@
--AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
--
--if test -z "RUBY_EXECUTABLE"; then
--  DO_NOT_COMPILE="$DO_NOT_COMPILE korundum"
--else
--  RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
--  RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
--
--  RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
--  RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
--  RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
--  RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
--  RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
--  RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
--
--  RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
--  if test "$RUBY_SERIES" -ge "19"; then
--     AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
--  fi
--
--  if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
--     RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
--     if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
--        RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
--     else
--        RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
--        RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
--     fi
--     RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
--  else
--     RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
--     RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
--  fi
--
--  # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
--  RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
--  RUBY_SITEDIR=${RUBY_SITEDIR%/}
--  RUBY_LIBDIR=${RUBY_LIBDIR%/}
--  RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
--
--  AC_MSG_RESULT([\
--                  archdir $RUBY_ARCHDIR,
--                  sitearchdir $RUBY_SITEARCHDIR,
--                  sitedir $RUBY_SITEDIR,
--                  rubylibdir $RUBY_RUBYLIBDIR,
--                  libdir $RUBY_LIBDIR,
--                  includedir $RUBY_INCLUDEDIR,
--                  librubyarg $RUBY_LIBRUBYARG,
--                  cflags $RUBY_CFLAGS])
--  AC_SUBST(RUBY_ARCHDIR)
--  AC_SUBST(RUBY_SITEARCHDIR)
--  AC_SUBST(RUBY_SITEDIR)
--  AC_SUBST(RUBY_RUBYLIBDIR)
--  AC_SUBST(RUBY_LIBDIR)
--  AC_SUBST(RUBY_INCLUDEDIR)
--  AC_SUBST(RUBY_LIBRUBYARG)
--  AC_SUBST(RUBY_CFLAGS)
--fi
--
-diff --git a/qtruby/bin/Makefile.am b/qtruby/bin/Makefile.am
-index a1005f0b..988ba3d4 100644
---- a/qtruby/bin/Makefile.am
-+++ b/qtruby/bin/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
- 
- bin_PROGRAMS = qtrubyinit
-diff --git a/qtruby/configure.in.in b/qtruby/configure.in.in
-new file mode 100644
-index 00000000..84ad88ec
---- /dev/null
-+++ b/qtruby/configure.in.in
-@@ -0,0 +1,90 @@
-+AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
-+
-+if test -z "RUBY_EXECUTABLE"; then
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
-+else
-+  RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-+  RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
-+
-+  RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+  RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-+  RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-+  RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-+  RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-+  RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
-+
-+  RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-+  if test "$RUBY_SERIES" -ge "19"; then
-+     AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-+  fi
-+
-+  if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-+     RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-+     if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-+        RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-+     else
-+        RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-+        RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-+     fi
-+     RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-+  else
-+     RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-+     RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-+  fi
-+
-+  # check if Ruby requires explicit specification of C++ standard
-+  AC_LANG_SAVE
-+  AC_LANG_CPLUSPLUS
-+  SAVED_CXXFLAGS="$CXXFLAGS"
-+  for CXX_STD_TEST in "" 11 14 17; do
-+    CXXFLAGS="$SAVED_CXXFLAGS"
-+    if test "x$CXX_STD_TEST" = "x"; then
-+      AC_MSG_CHECKING([Ruby build with default C++ standard])
-+      RUBY_CXXFLAGS=""
-+    else
-+      AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST])
-+      RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST"
-+    fi
-+    CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS"
-+    AC_TRY_COMPILE([
-+        #include <ruby.h>
-+      ],[ ],
-+      ruby_cxx_std=yes,
-+      ruby_cxx_std=no
-+    )
-+    if test "x$ruby_cxx_std" = "xyes"; then
-+      AC_SUBST(RUBY_CXXFLAGS)
-+      AC_MSG_RESULT(yes)
-+      break
-+    else
-+      AC_MSG_RESULT(no)
-+    fi
-+  done
-+  CXXFLAGS="$SAVED_CXXFLAGS"
-+  AC_LANG_RESTORE
-+
-+  # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-+  RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-+  RUBY_SITEDIR=${RUBY_SITEDIR%/}
-+  RUBY_LIBDIR=${RUBY_LIBDIR%/}
-+  RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
-+
-+  AC_MSG_RESULT([\
-+                  archdir $RUBY_ARCHDIR,
-+                  sitearchdir $RUBY_SITEARCHDIR,
-+                  sitedir $RUBY_SITEDIR,
-+                  rubylibdir $RUBY_RUBYLIBDIR,
-+                  libdir $RUBY_LIBDIR,
-+                  includedir $RUBY_INCLUDEDIR,
-+                  librubyarg $RUBY_LIBRUBYARG,
-+                  cflags $RUBY_CFLAGS,
-+                  cxxflags $RUBY_CXXFLAGS])
-+  AC_SUBST(RUBY_ARCHDIR)
-+  AC_SUBST(RUBY_SITEARCHDIR)
-+  AC_SUBST(RUBY_SITEDIR)
-+  AC_SUBST(RUBY_RUBYLIBDIR)
-+  AC_SUBST(RUBY_LIBDIR)
-+  AC_SUBST(RUBY_INCLUDEDIR)
-+  AC_SUBST(RUBY_LIBRUBYARG)
-+  AC_SUBST(RUBY_CFLAGS)
-+fi
-diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/qtruby/rubylib/designer/uilib/Makefile.am
-index 45876ed6..80363009 100644
---- a/qtruby/rubylib/designer/uilib/Makefile.am
-+++ b/qtruby/rubylib/designer/uilib/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
- 
- rubylibdir = $(RUBY_ARCHDIR)
-diff --git a/qtruby/rubylib/qtruby/Makefile.am b/qtruby/rubylib/qtruby/Makefile.am
-index 7083719c..c273c599 100644
---- a/qtruby/rubylib/qtruby/Makefile.am
-+++ b/qtruby/rubylib/qtruby/Makefile.am
-@@ -1,3 +1,5 @@
-+CXXFLAGS += $(RUBY_CXXFLAGS)
-+
- INCLUDES = -I$(top_srcdir)/smoke $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
- 
- noinst_HEADERS = qtruby.h marshall.h smokeruby.h extconf.rb 
-diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
-deleted file mode 100644
-index db0594a3..00000000
---- a/qtruby/rubylib/qtruby/configure.in.in
-+++ /dev/null
-@@ -1,59 +0,0 @@
--AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
--
--if test -z "RUBY_EXECUTABLE"; then
--  DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
--else
--  RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
--  RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
--
--  RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
--  RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
--  RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
--  RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
--  RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
--  RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
--
--  RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
--  if test "$RUBY_SERIES" -ge "19"; then
--     AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
--  fi
--
--  if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
--     RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
--     if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
--        RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
--     else
--        RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
--        RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
--     fi
--     RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
--  else
--     RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
--     RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
--  fi
--
--  # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
--  RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
--  RUBY_SITEDIR=${RUBY_SITEDIR%/}
--  RUBY_LIBDIR=${RUBY_LIBDIR%/}
--  RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
--
--  AC_MSG_RESULT([\
--                  archdir $RUBY_ARCHDIR,
--                  sitearchdir $RUBY_SITEARCHDIR,
--                  sitedir $RUBY_SITEDIR,
--                  rubylibdir $RUBY_RUBYLIBDIR,
--                  libdir $RUBY_LIBDIR,
--                  includedir $RUBY_INCLUDEDIR,
--                  librubyarg $RUBY_LIBRUBYARG,
--                  cflags $RUBY_CFLAGS])
--  AC_SUBST(RUBY_ARCHDIR)
--  AC_SUBST(RUBY_SITEARCHDIR)
--  AC_SUBST(RUBY_SITEDIR)
--  AC_SUBST(RUBY_RUBYLIBDIR)
--  AC_SUBST(RUBY_LIBDIR)
--  AC_SUBST(RUBY_INCLUDEDIR)
--  AC_SUBST(RUBY_LIBRUBYARG)
--  AC_SUBST(RUBY_CFLAGS)
--fi
--
--- 
-cgit v1.2.1
-

arch/tde-base/tde-tdebindings/bp002-33697c89.diff

@@ -1,24 +0,0 @@
-commit 5092f046c4f6b678a728bb1156123e0f0e45380f
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date:   Fri Sep 24 15:02:20 2021 +0200
-
-    Fix FTBFS in dcopjava in case TQt3 is not installed in the system directory.
-    
-    Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-    (cherry picked from commit 33697c89a362c187fbf375c2d05b0a8d6beb9429)
-
-diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am
-index be90dd10..2fe8e5d5 100644
---- a/dcopjava/binding/Makefile.am
-+++ b/dcopjava/binding/Makefile.am
-@@ -1,8 +1,8 @@
- lib_LTLIBRARIES = libjavadcop.la
- 
- libjavadcop_la_SOURCES = client.cpp 
--libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
--libjavadcop_la_LIBADD = $(LIB_TDECORE)
-+libjavadcop_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(KDE_PLUGIN)
-+libjavadcop_la_LIBADD = $(LIB_TDECORE) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
- 
- INCLUDES = $(jni_includes) $(all_includes)
- 

arch/tde-base/tde-tdegraphics/PKGBUILD

@@ -1,54 +1,55 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: e1z0 <marcinkeviciusjustinas at gmail dot com>
 
-pkgname=tde-tdegraphics
+_mod=tdegraphics
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Trinity Desktop Graphics Components"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdegraphics'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-base')
-depends=('tde-tdelibs' 'libgphoto2' 'fribidi' 'sane')
+depends=('tde-tdelibs' 'fribidi' 'imlib' 'libgphoto2' 'libpaper' 'poppler' 'sane' 't1lib')
-makedepends=('pkgconfig' 'cmake' 'imlib')
+makedepends=('tde-cmake-trinity')
-provides=('tdegraphics')
+provides=("${_mod}")
-conflicts=('trinity-tdegraphics' 'trinity-kdegraphics')
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
-replaces=('trinity-tdegraphics')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdegraphics-trinity-${pkgver}.tar.xz"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-        'bp000-d19460fd6e.diff'
+md5sums=('04d2c95040a3a5664c4b0dca8556d10d')
-        'bp001-866f96c1f4.diff')
-md5sums=('0b069eb140a9f8b8bbe4556f1bd313d9'
-         'c5ccbf331b4b0b6a0af61687cc3308a5'
-         'bd4a586fb17963697afceef79adc35a5')
 # install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
-   patch -p1 < ${srcdir}/bp000-d19460fd6e.diff
-   patch -p1 < ${srcdir}/bp001-866f96c1f4.diff
-
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-     -DBUILD_ALL=ON
+     -DBUILD_ALL=ON \
+     -DWITH_T1LIB=ON \
+     -DWITH_PAPER=ON \
+     -DWITH_TIFF=ON \
+     -DWITH_OPENEXR=ON \
+     -DWITH_PDF=ON
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff

@@ -1,33 +0,0 @@
-From d19460fd6eae693832e4c5160aa2071bf71062f6 Mon Sep 17 00:00:00 2001
-From: Mavridis Philippe <mavridisf@gmail.com>
-Date: Thu, 8 Jul 2021 23:14:10 +0300
-Subject: Corrected boolean usage to conform with C++17 standard.
-
-This resolves a FTBFS on some systems.
-
-Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
----
- kfaxview/libkfaximage/faxinit.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kfaxview/libkfaximage/faxinit.cpp b/kfaxview/libkfaximage/faxinit.cpp
-index aa6166aa..fa4517d2 100644
---- a/kfaxview/libkfaximage/faxinit.cpp
-+++ b/kfaxview/libkfaximage/faxinit.cpp
-@@ -319,11 +319,11 @@ FillTable(struct tabent *T, int Size, const struct proto *P, int State)
- void
- fax_init_tables(void)
- {
--    static bool already_initialized = 0;
-+    static bool already_initialized = false;
-     if (already_initialized)
- 	return;
- 
--    ++already_initialized;
-+    already_initialized = true;
- 
-     FillTable(MainTable, 7, Pass, S_Pass);
-     FillTable(MainTable, 7, Horiz, S_Horiz);
--- 
-cgit v1.2.1
-

arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff

@@ -1,63 +0,0 @@
-From 866f96c1f45c0d8302267c3bc3b286369cf9dcfe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
-Date: Thu, 8 Jul 2021 19:46:45 +0200
-Subject: Use FindOpenGL instead of pkg_search_module( GLU ). This resolves
- FTBFS on FreeBSD 13.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
----
- kpovmodeler/CMakeLists.txt        | 4 ++--
- kpovmodeler/ConfigureChecks.cmake | 9 +++++----
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/kpovmodeler/CMakeLists.txt b/kpovmodeler/CMakeLists.txt
-index 6ec98ae4..b589117f 100644
---- a/kpovmodeler/CMakeLists.txt
-+++ b/kpovmodeler/CMakeLists.txt
-@@ -19,7 +19,7 @@ include_directories(
-   ${CMAKE_BINARY_DIR}
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
--  ${GLU_INCLUDE_DIRS}
-+  ${OPENGL_INCLUDE_DIRS}
-   ${FREETYPE_INCLUDE_DIRS}
- )
- 
-@@ -112,7 +112,7 @@ tde_add_library( kpovmodeler SHARED AUTOMOC
-     pmlibraryiconview.cpp pmlibraryobjectsearch.cpp pmpluginmanager.cpp
-     pmpartiface.skel
-   VERSION 0.0.0
--  LINK tdeparts-shared ${GLU_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
-+  LINK tdeparts-shared ${OPENGL_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
-   DESTINATION ${LIB_INSTALL_DIR}
- )
- 
-diff --git a/kpovmodeler/ConfigureChecks.cmake b/kpovmodeler/ConfigureChecks.cmake
-index f4fdd1c0..a55045d4 100644
---- a/kpovmodeler/ConfigureChecks.cmake
-+++ b/kpovmodeler/ConfigureChecks.cmake
-@@ -10,13 +10,14 @@
- #################################################
- 
- # glu
--pkg_search_module( GLU glu )
--if( NOT GLU_FOUND )
-+set( OpenGL_GL_PREFERENCE LEGACY )
-+find_package( OpenGL )
-+if( NOT OPENGL_FOUND )
-   check_include_file ( GL/glu.h HAVE_GLU )
-   if( NOT HAVE_GLU )
--    tde_message_fatal( "glu is required, but was not found on your system" )
-+    tde_message_fatal( "OpenGL (glu) is required, but was not found on your system" )
-   endif ( )
--  set( GLU_LIBRARIES "-lGL -lGLU" )
-+  set( OPENGL_LIBRARIES "-lGL -lGLU" )
- endif( )
- 
- 
--- 
-cgit v1.2.1
-

arch/tde-base/tde-tdeutils/PKGBUILD

@@ -1,46 +1,50 @@
 # Maintainer: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tdeutils
+_mod=tdeutils
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="The TDE something - with Trinity upstream"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-base')
 depends=('tde-tdebase' 'xmms2')
-makedepends=('pkgconfig' 'cmake' 'python2')
+makedepends=('tde-cmake-trinity' 'python2')
 optdepends=()
-provides=("${pkgname#*-}")
+provides=("${_mod}")
-conflicts=("trinity-${pkgname#*-}")
+conflicts=("trinity-${_mod}")
-replaces=("trinity-${pkgname#*-}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeutils-trinity-${pkgver}.tar.xz")
+md5sums=('9d5bc073642e7f540f9c168e7d8ea989')
-md5sums=('95e778a8775b416739fd7e836e4ecdcd')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd ${srcdir}
    msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    ## cmake call
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON \
      -DWITH_DPMS=ON \
-     -DBUILD_ALL=ON
+     -DWITH_XSCREENSAVER=ON
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-core/tde-arts/PKGBUILD

@@ -3,12 +3,16 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-arts
+_mod=arts
-pkgver=14.0.10
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
-pkgdesc="Trinity ARTS Sound System and libraries"
+pkgdesc="Trinity aRts Sound System and libraries"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/arts'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core')
 depends=('alsa-plugins'
@@ -21,39 +25,41 @@ depends=('alsa-plugins'
 	'libvorbis'
 	'pulseaudio-alsa'
 	'tde-tqtinterface')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
 optdepends=('audio-convert: A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma'
 	'lame: A high quality MPEG Audio Layer III (MP3) encoder'
 	'libmp3splt: Library for splitting mp3 and ogg files without decoding'
 	'mpd: Music daemon that plays MP3, FLAC, and Ogg Vorbis files'
 	'vorbis-tools: Extra tools for Ogg-Vorbis')
-provides=('arts')
+provides=("${_mod}")
-conflicts=('kdemod3-arts' 'arts')
+conflicts=("kdemod3-${_mod}" "${_mod}")
-replaces=('trinity-arts')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!emptydirs')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/arts-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('d9d719e824acd5397dda709ed5352feb')
+md5sums=('8906e1030ed7caa3ce72e8c41288b320')
-install='tde-arts.install'
+install="tde-${_mod}.install"
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DWITH_GCC_VISIBILITY=ON
+      -DWITH_ALL_OPTIONS=ON \
+      -DWITH_ESOUND=OFF \
+      -DWITH_JACK=OFF
 
    msg "Building $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="$pkgdir" install
+   DESTDIR="$pkgdir" ninja -j1 install
 }

arch/tde-core/tde-avahi-tqt/PKGBUILD

@@ -1,42 +1,46 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-avahi-tqt
+_mod=avahi-tqt
-pkgver=14.0.10
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Trinity Avahi-TQt"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/avahi-tqt'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core')
 depends=('tde-tqtinterface' 'avahi' 'nss-mdns')
 # nss-mdns should probably move to tdelibs depends
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-provides=('avahi-tqt')
+provides=("${_mod}")
-replaces=('trinity-avahi-tqt')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/avahi-tqt-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('6cce8423a3030505bb56a8c73f6235d6')
+md5sums=('e9e31775dc7ad94159e9e8ea0edf028c')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd ${srcdir}
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DWITH_GCC_VISIBILITY=ON
+      -DWITH_ALL_OPTIONS=ON
 
    msg "Building - $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname"
    cd ${srcdir}/build
-   make -j1 DESTDIR="$pkgdir" install
+   DESTDIR="$pkgdir" ninja -j1 install
 }

arch/tde-core/tde-cmake-trinity/PKGBUILD

@@ -0,0 +1,51 @@
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=cmake-trinity
+_cat=common/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=1
+pkgdesc="TDE CMake modules"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/tde-common-cmake"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-core')
+depends=(
+  'cmake'
+  'perl'
+  'ninja'
+  'pkgconfig'
+)
+makedepends=()
+optdepends=()
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-${pkgver}.tar.xz")
+md5sums=('954185aabae978ef840c78efd940bee0')
+
+[ -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"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}

arch/tde-core/tde-dbus-1-tqt/PKGBUILD

@@ -3,43 +3,47 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-dbus-1-tqt
+_mod=dbus-1-tqt
-pkgver=14.0.10
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Trinity D-Bus TQtInterface Wrapper - from TDE upstream GIT"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/dbus-1-tqt'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core' 'tde-base')
 depends=('tde-tqtinterface' 'dbus')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-provides=('dbus-1-tqt')
+provides=("${_mod}")
-conflicts=('trinity-dbus-1-tqt')
+conflicts=("trinity-${_mod}")
-replaces=('trinity-dbus-1-tqt' 'trinity-dbus-1-qt3' 'dbus-1-qt3' 'tde-dbus-tqt-1')
+replaces=("tde-${_mod}" "trinity-${_mod}" 'trinity-dbus-1-qt3' 'dbus-1-qt3')
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/dbus-1-tqt-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('4954efb83544c72272ba803eb44b72ec')
+md5sums=('c801be15308438c85043d5f52f28bcc9')
-install='trinity-dbus-1-tqt.install'
+install="trinity-${_mod}.install"
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DWITH_GCC_VISIBILITY=ON
+      -DWITH_ALL_OPTIONS=ON
 
    msg "Building - $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-core/tde-dbus-tqt/PKGBUILD

@@ -3,41 +3,44 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-dbus-tqt
+_mod=dbus-tqt
-pkgver=14.0.10
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/dbus-tqt'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core')
 pkgdesc="Trinity TQt DBus wrapper"
 depends=('tde-tqtinterface' 'dbus')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-provides=('dbus-tqt')
+provides=("${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/dbus-tqt-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('5a3577b3f43b3cfeb4701bb4a4e0a951')
+md5sums=('fd23c1a0f57d7ed08f443b3e2a2f98d6')
-install='trinity-dbus-tqt.install'
+install="trinity-${_mod}.install"
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
-      -DCMAKE_INSTALL_PREFIX=$TDEDIR \
+      -GNinja \
-      -DWITH_GCC_VISIBILITY=ON
+      -DCMAKE_INSTALL_PREFIX=$TDEDIR
 
    msg "Building - $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-core/tde-libart-lgpl/PKGBUILD

@@ -1,24 +1,28 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-libart-lgpl
+_mod=libart-lgpl
-pkgver=14.0.10
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Trinity Desktop LGPL'd Component"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/libart-lgpl"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('LGPL')
 groups=('tde-core')
 #depends=('')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
 optdepends=()
-provides=('libart-lgpl')
+provides=("${_mod}")
 conflicts=()
 replaces=()
 options=('staticlibs' 'libtool' '!strip')
 install=
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libart-lgpl-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('e3cae1bd69671c21b27d10bd9b29bb8c')
+md5sums=('02e9f48e719c1a189638ddb1f932cea3')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
@@ -30,15 +34,16 @@ build() {
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
       -DWITH_GCC_VISIBILITY=ON
 
    msg "Building - $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-core/tde-tdebase/PKGBUILD

@@ -1,16 +1,19 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname='tde-tdebase'
+_mod=tdebase
-pkgver=14.0.10
+_cat=core/
-pkgrel=2
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=1
 pkgdesc="Trinity Desktop Enviroment base components"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdebase'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
-provides=('tdebase')
+provides=("${_mod}")
 groups=('tde-core')
-# depends=('hal'
 depends=('libraw1394'
          'libxtst'
          'libxss'
@@ -23,10 +26,7 @@ depends=('libraw1394'
          'xorg-xinit'
          'htdig'
          'openssl-1.0')
-makedepends=('autoconf'
+makedepends=('tde-cmake-trinity'
-	     'cmake'
-	     'imake'
-	     'pkgconfig'
          'libxkbfile'
          'smbclient'
          'rpcsvc-proto'
@@ -44,12 +44,12 @@ optdepends=('desktop-file-utils: Command line utilities for working with desktop
             'tde-tqca-tls: Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)'
             'xorg-fonts-75dpi: X.org 75dpi fonts collection'
             'xscreensaver: Screen saver and locker for the X Window System')
-confilicts=('trinity-kdebase ''kdemod3-kdebase')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
-replaces=('trinity-tdebase')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-install='trinity-tdebase.install'
+install="trinity-${_mod}.install"
 
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebase-trinity-${pkgver}.tar.xz"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
         'agent-shutdown.sh'
         'agent-startup.sh'
         'tdm-trinity'
@@ -57,7 +57,7 @@ source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/
         'tdm.service'
         'xsession.patch')
 
-md5sums=('bca895dfc2b88c4b74e307d5690108bf'
+md5sums=('38d71c4d3fa51219b4f734b9d862308e'
          '18e8d01124b19f7df2937c06e177bf7f'
          'c963ef6e37c9051119972a58c67f05fb'
          'bb4c25e560fa719e8e8f49ef80bd1c99'
@@ -68,16 +68,16 @@ md5sums=('bca895dfc2b88c4b74e307d5690108bf'
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-  cd $srcdir
   msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
+  mkdir -p ${srcdir}/build
-  cd build
+  cd ${srcdir}/build
 
   msg "Starting cmake..."
 
   export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
 
   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DWITH_SASL=ON \
@@ -89,8 +89,6 @@ build() {
     -DWITH_XFIXES=ON \
     -DWITH_XRANDR=ON \
     -DWITH_XRENDER=ON \
-    -DWITH_XDAMAGE=ON \
-    -DWITH_XEXT=ON \
     -DWITH_XTEST=ON \
     -DWITH_OPENGL=ON \
     -DWITH_XSCREENSAVER=ON \
@@ -111,13 +109,13 @@ build() {
     -DTDM_PAM_SERVICE=tde \
     -DTDESCREENSAVER_PAM_SERVICE=tde-screensaver
 
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd $srcdir/build
-  make -j1 DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -j1 install
 
   # install X11 session file /usr/share/xsessions (changed from /etc/X11 sessions)
   install -d -m755 ${pkgdir}/usr/share/xsessions

arch/tde-core/tde-tdelibs/PKGBUILD

@@ -3,12 +3,16 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tdelibs
+_mod=tdelibs
-pkgver=14.0.10
+_cat=core/
-pkgrel=2
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=1
 pkgdesc="Trinity Desktop core libraries and applications"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdelibs'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core')
 depends=('aspell'
@@ -32,29 +36,28 @@ depends=('aspell'
 	'xorg-xprop'
 	'xorg-xset'
 	'xorg-xsetroot')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-provides=('tdelibs')
+provides=("${_mod}")
-conflicts=('trinity-kdelibs' 'trinity-tdelibs' 'kdemod3-kdelibs' 'kdelibs3')
+conflicts=("trinity-${_kdemod}" "trinity-${_mod}" "kdemod3-${_kdemod}" "${_kdemod}")
-replaces=('trinity-kdelibs' 'trinity-tdelibs')
+replaces=("trinity-${_kdemod}" "trinity-${_mod}")
 options=('staticlibs' 'libtool' '!makeflags' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdelibs-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-
+md5sums=('6a93917c4879d0a34764264f53e8519f')
-md5sums=('cbb77407a886b588b4749524ae8e5edd')
 
-install='trinity-tdelibs.install'
+install="trinity-${_mod}.install"
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-  cd $srcdir
   msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
+  mkdir -p ${srcdir}/build
-  cd build
+  cd ${srcdir}/build
 
   export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
 
   msg "Starting cmake..."
   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -84,13 +87,13 @@ build() {
     -DWITH_HSPELL=ON
 
   msg "Building - $pkgname..."
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -j1 install
   msg "Removing conflicting images"
   rm ${pkgdir}/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
 }

arch/tde-core/tde-tqca-tls/PKGBUILD

@@ -3,45 +3,51 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tqca-tls
+_mod=tqca-tls
-pkgver=14.0.10
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tqca-tls'
+url="https://scm.trinitydesktop.org/scm/git/${_mod%-tls}"
 license=('GPL')
 groups=('tde-core')
 depends=('tde-tqtinterface' 'openssl-1.0')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-provides=('tqca-tls')
+provides=(${_mod})
-conflicts=('trinity-tqca-tls')
+conflicts=("trinity-${_mod}")
-replaces=('trinity-tqca-tls')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqca-tls-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod%-tls}-trinity-${pkgver}.tar.xz")
-md5sums=('6347f50dd8b44cc1f7a35329bd578ba1')
+md5sums=('2b149701a8ad80d4ea69f97f83089b8a')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    export PKG_CONFIG_PATH=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
-   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+   cmake ${srcdir}/${_mod%-tls}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
-      -DWITH_GCC_VISIBILITY=ON
+      -DBUILD_ALL=OFF \
+      -DBUILD_TQCA_TLS=ON \
+      -DWITH_ALL_OPTIONS=ON
 
    msg "Building - $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-core/tde-tqca/PKGBUILD

@@ -0,0 +1,54 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=tqca
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=1
+pkgdesc="Trinity SSL/TLS interface for TQt Cryptographic Architecture (TQCA)"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-core')
+depends=('tde-tqtinterface' 'openssl-1.0')
+makedepends=('tde-cmake-trinity')
+provides=(${_mod})
+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=('2b149701a8ad80d4ea69f97f83089b8a')
+
+[ -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=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=$QTDIR \
+      -DBUILD_ALL=OFF \
+      -DBUILD_TQCA=ON \
+      -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}

arch/tde-core/tde-tqt3/PKGBUILD

@@ -3,13 +3,17 @@
 # Contributor: Calvin Morrison <MutantTurkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgbase=tde-tqt3
+_mod=tqt3
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgbase="tde-${_mod}"
 pkgname=("$pkgbase" "${pkgbase}-docs")
-pkgver=14.0.10
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/tqt3"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core')
 options=('staticlibs' 'libtool' '!emptydirs' '!strip')
@@ -22,19 +26,16 @@ makedepends=('libcups'
         'libmng'
         'xorg-xrandr'
         'libxft'
+        'libxmu'
         'glu')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqt3-trinity-${pkgver}.tar.xz"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-        'bp000-fix-build-key.diff')
+md5sums=('3923dc1a1460c556ef5d1fc296211f3a')
-md5sums=('47d8495fcf444c5db2cf56843be3f746'
-         '950e3885135fd9844de856c770f19767')
 
 _prefix="/opt/trinity/tqt3"
 
 build() {
 
-  cd ${srcdir}/tqt3-trinity-${pkgver}
+  cd ${srcdir}/${_mod}-trinity-${pkgver}
-
-  patch -p1 < ${srcdir}/bp000-fix-build-key.diff
 
   # These are probably arch-specific. They were present in old qt3
   # PKGBULD, they were present in kdemod3 PKGBUILD, they are present
@@ -54,7 +55,7 @@ build() {
   sed -i "s|read acceptance|acceptance=yes|" configure
 
   msg "Setting enviroment variables..."
-  export QTDIR="${srcdir}/tqt3-trinity-${pkgver}"
+  export QTDIR="${srcdir}/${_mod}-trinity-${pkgver}"
   export PATH=${QTDIR}/bin:${PATH}
   export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
   export QMAKESPEC=$QTDIR/mkspecs/linux-g++
@@ -94,6 +95,7 @@ build() {
     -platform linux-g++${ARCH} \
     -no-exceptions \
     -thread \
+    -enable-opengl \
     -dlopen-opengl \
     -no-ipv6
 

arch/tde-core/tde-tqt3/bp000-fix-build-key.diff

@@ -1,21 +0,0 @@
-commit 0d60417c83fd2bd8b6fccb6dd7171b113296860a
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date:   Wed Sep 22 15:00:08 2021 +0200
-
-    Fix buildkey for GCC >= 7 if the version is listed including minor numbers.
-    
-    Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-
-diff --git a/configure b/configure
-index 92cec273..f021f563 100755
---- a/configure
-+++ b/configure
-@@ -2828,7 +2828,7 @@ g++*)
-     3.*)
- 	COMPILER_VERSION="3.*"
- 	;;
--    [1-9][0-9]|[7-9]|[4-6].*)
-+    [1-9][0-9]|[1-9][0-9].*|[7-9]|[4-9].*)
- 	COMPILER_VERSION="4.*"
- 	;;
-     *)

arch/tde-core/tde-tqtinterface/PKGBUILD

@@ -3,34 +3,34 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tqtinterface
+_mod=tqtinterface
-pkgver=14.0.10
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/tqtinterface"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL2')
 groups=('tde-core')
 pkgdesc="TQt interface for the TDE desktop"
 depends=('tde-tqt3' 'glu')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-provides=('tqtinterface')
+provides=("${_mod}")
-conflicts=('kdemod3-tqtinterface' 'trinity-tqtinterface')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
-replaces=('trinity-tqtinterface')
+replaces=("trinity-${_mod}")
 # makeopts=('libtool' '!emptydirs' '!strip')
 options=('staticlibs' 'libtool' '!emptydirs' '!strip')
 
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqtinterface-trinity-${pkgver}.tar.xz"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-        'tqtpc-location.patch')
+md5sums=('4f2001045468bce4483819d91fef113a')
-
-md5sums=('76b04fce54a40edf46a7421a5f3e176f'
-         'c15745c944d98cb7c4cb553f0ca421d4')
 
-install='trinity-tqtinterface.install'
+install="trinity-${_mod}.install"
 
 _prefix=/usr
-_tdedir=/opt/trinity
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
-
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
-[ -n "$QTDIR" ] || QTDIR=${_tdedir}/tqt3
 
 build() {
    cd $srcdir
@@ -38,24 +38,27 @@ build() {
    mkdir -p build
    cd build
 
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+     -GNinja \
      -DCMAKE_INSTALL_PREFIX=${_prefix} \
      -DQT_PREFIX_DIR=${QTDIR} \
      -DQT_INCLUDE_DIR=${QTDIR}/include \
      -DMOC_EXECUTABLE=${QTDIR}/bin/moc \
      -DQT_VERSION=3
 
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 
    # Create and install ld.so.conf.d file
    install -d -m755 $pkgdir/etc/ld.so.conf.d/
-   echo ${_tdedir}/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
+   echo ${TDEDIR}/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
-   echo ${_tdedir}/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf
+   echo ${TDEDIR}/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf
 }

arch/tde-core/tde-tqtinterface/tqtpc-location.patch

@@ -1,11 +0,0 @@
---- dependencies/tqtinterface/CMakeLists.txt	2011-03-28 00:12:24.000000000 +0200
-+++ dependencies/tqtinterface/CMakeLists.txt.new	2012-01-29 12:15:16.000000000 +0100
-@@ -35,7 +35,7 @@
- tde_setup_install_path( BIN_INSTALL_DIR       "${EXEC_INSTALL_PREFIX}/bin"  )
- tde_setup_install_path( LIB_INSTALL_DIR       "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
- tde_setup_install_path( INCLUDE_INSTALL_DIR   "${CMAKE_INSTALL_PREFIX}/include/tqt" )
--tde_setup_install_path( PKGCONFIG_INSTALL_DIR "/usr/lib${LIB_SUFFIX}/pkgconfig" )
-+tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" )
- 
- 
- ##### tqtinterface sources ######################

arch/tde-devel/tde-tdesdk/PKGBUILD

@@ -1,46 +1,49 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tdesdk
+_mod=tdesdk
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdesdk'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-devel')
 pkgdesc="Trinity Desktop Development Tools"
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake' 'flex' 'subversion' 'pod2man')
+makedepends=('tde-cmake-trinity' 'flex' 'subversion' 'pod2man')
-provides=('tdesdk')
+provides=("${_mod}")
-conflicts=('trinity-tdesdk' 'trinity-kdesdk')
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
-replaces=('trinity-tdesdk')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdesdk-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('5d117cbbe1cd938624656917646eebab')
+md5sums=('36895ffc0ee52be3c30bfef9019cf424')
-# install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
      -DBUILD_ALL=ON
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-devel/tde-tdevelop/PKGBUILD

@@ -1,53 +1,51 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tdevelop
+_mod=tdevelop
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdevelop'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-devel')
 pkgdesc="Trinity Desktop Developer Tools"
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake' 'tde-tdesdk' 'subversion')
+makedepends=('tde-cmake-trinity' 'tde-tdesdk' 'subversion')
-provides=('tdevelop')
+provides=("${_mod}")
-conflicts=('trinity-tdevelop' 'trinity-kdevelop')
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
-replaces=('trinity-tdevelop')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdevelop-trinity-${pkgver}.tar.xz"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-        'bp000-ba5f58bf.diff')
+md5sums=('2323f9116e354a28e72da92a4f820641')
-md5sums=('ec9eb0b745d984bf77f74bdc959d5fc8'
-         'e7519ea06bd63b4fc9aa7e0ac5076576')
-# install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
 
 build() {
-   cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
-   patch -p1 < ${srcdir}/bp000-ba5f58bf.diff
-
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
    mkdir -p ${srcdir}/build
    cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
       -DCMAKE_VERBOSE_MAKEFILE=ON \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
+      -DBUILD_ALL=ON \
       -DWITH_BUILDTOOL_ALL=ON \
       -DWITH_LANGUAGE_ALL=ON \
-      -DWITH_VCS_ALL=ON \
+      -DWITH_VCS_ALL=ON
-      -DBUILD_ALL=ON
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-devel/tde-tdewebdev/PKGBUILD

@@ -1,43 +1,47 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-tdewebdev
+_mod=tdewebdev
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdewebdev'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-devel')
 pkgdesc="Trinity Web Developer Tools"
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity' 'tde-tdesdk')
-provides=('tdewebdev')
+provides=("${_mod}")
-conflicts=('trinity-tdewebdev' 'trinity-kdewebdev')
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
-replaces=('trinity-tdewebdev')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdewebdev-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('96bcdfdcd4308b0721ed23d7d5b9954f')
+md5sums=('e345b611edd878ca09a65d9d9e0739e0')
-# install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
       -DCMAKE_VERBOSE_MAKEFILE=ON \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
-      -DBUILD_ALL=ON
+      -DBUILD_ALL=ON \
+      -DWITH_ALL_OPTIONS=ON
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-abakus/PKGBUILD

@@ -2,10 +2,11 @@
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
 _mod=abakus
-_cat=applications/
+_cat=applications/utilities/
 _kdemod="${_mod/tde/kde}"
+
 pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Calculator for TDE"
 arch=('i686' 'x86_64')
@@ -17,17 +18,16 @@ depends=(
   'tde-tdelibs'
 )
 makedepends=(
-  'cmake'
+  'tde-cmake-trinity'
-  'pkgconfig'
 )
 optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+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=('90fa9e728b8b48ad5e51c95eb5d05dc7')
+md5sums=('5f8e3779d9d4f7ddad3c436cb5bbfd03')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
@@ -39,6 +39,7 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
@@ -46,11 +47,11 @@ build() {
     -DWITH_ALL_OPTIONS=ON
 
   msg "Building - ${pkgname}..."
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - ${pkgname}-${pkgver}"
   cd "$srcdir/build"
-  make -j1 DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -j1 install
 }

arch/tde-extra/tde-akode/PKGBUILD

@@ -0,0 +1,54 @@
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=akode
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=1
+pkgdesc="akode plugin for aRts"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('alsa-plugins'
+	'alsa-tools'
+	'alsa-utils'
+	'audiofile'
+	'libmad'
+	'libogg'
+	'libvorbis'
+	'pulseaudio-alsa')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+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=('64f003d3a2098535d07a6dc9a210f148')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+      -DWITH_ALL_OPTIONS=ON \
+      -DWITH_JACK_SINK=OFF
+
+   msg "Building $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="$pkgdir" ninja -j1 install
+}

arch/tde-extra/tde-akode/tde-akode.install

@@ -0,0 +1,11 @@
+post_install() {
+   ldconfig &> /dev/null
+}
+
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   post_install
+}

arch/tde-extra/tde-amarok/PKGBUILD

@@ -1,47 +1,60 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-amarok
+_mod=amarok
-pkgver=14.0.10
+_cat=applications/multimedia/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="TDE Amarok"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/amarok'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase' 'taglib' 'xine-lib')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity' 'tde-akode' 'ruby' 'libmtp' 'libvisual' 'sdl')
-#provides=('tde-amarok')
+provides=("${_mod}")
-#conflicts=('tde-amarok')
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
-#replaces=('tde-amarok')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/amarok-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('fab4ed783d4027711e4aaca098bb04b1')
+md5sums=('4542cc22dc8104f46e6dd1640ea54cb7')
-# install=''
+install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
      -DBUILD_ALL=ON \
+     -DWITH_ALL_OPTIONS=ON \
+     -DWITH_YAUAP=OFF \
+     -DWITH_NJB=OFF \
+     -DWITH_IFP=OFF \
+     -DWITH_IPOD=OFF \
+     -DWITH_MP4V2=OFF \
      -DWITH_EMBEDDED_SQLITE=ON \
-     -DWITH_OPENGL=ON
+     -DWITH_SYSTEM_SQLITE=OFF \
+     -DWITH_MYSQL=OFF \
+     -DWITH_POSTGRESQL=OFF \
+     -DWITH_AMAZON=OFF
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-basket/PKGBUILD

@@ -2,10 +2,11 @@
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
 _mod=basket
-_cat=applications/
+_cat=applications/office/
 _kdemod="${_mod/tde/kde}"
+
 pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="A multi-purpose note-taking application for KDE"
 arch=('i686' 'x86_64')
@@ -17,22 +18,28 @@ depends=(
   'tde-tdelibs'
 )
 makedepends=(
-  'cmake'
+  'tde-cmake-trinity'
-  'pkgconfig'
   'tde-tdepim'
 )
 optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+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")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
-md5sums=('6a70768661d810eeeba5281075215803')
+        'bp000-fix-crash-on-export-basket-archive.diff')
+md5sums=('1b078e8c8d67c2ce110080fa687bd5cb'
+         '402c273bb65646cf377ff9d1be762f07')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
 
+prepare() {
+  cd ${srcdir}/${_mod}-trinity-${pkgver}
+  patch -p1 <${srcdir}/bp000-fix-crash-on-export-basket-archive.diff
+}
+
 build() {
   msg "Creating out-of-source build directory: ${srcdir}/build"
   mkdir -p "$srcdir/build"
@@ -42,6 +49,7 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
@@ -49,11 +57,11 @@ build() {
     -DWITH_ALL_OPTIONS=ON
 
   msg "Building - ${pkgname}..."
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - ${pkgname}-${pkgver}"
   cd "$srcdir/build"
-  make -j1 DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -j1 install
 }

arch/tde-extra/tde-basket/bp000-fix-crash-on-export-basket-archive.diff

@@ -0,0 +1,60 @@
+commit 6ccb5528ecff0cf0db5fe2f81b26a79959e87902
+Author: Slávek Banko <slavek.banko@axis.cz>
+Date:   Fri Oct 29 03:47:53 2021 +0200
+
+    Prevent null pointer deference in methods for selection.
+    This resolves the crash when exporting the Basket archive.
+    
+    Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
+    (cherry picked from commit a08c6ac9e3c8ac162ce08b730fd6108e2f71213c)
+
+diff --git a/src/archive.cpp b/src/archive.cpp
+index 3f3377c..aec789f 100644
+--- a/src/archive.cpp
++++ b/src/archive.cpp
+@@ -228,7 +228,8 @@ void Archive::saveBasketToArchive(Basket *basket, bool recursive, KTar *tar, TQS
+ 
+ 	// Recursively save child baskets:
+ 	BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket);
+-	if (recursive && item->firstChild()) {
++	if (recursive && item && item->firstChild())
++	{
+ 		for (BasketListViewItem *child = (BasketListViewItem*) item->firstChild(); child; child = (BasketListViewItem*) child->nextSibling()) {
+ 			saveBasketToArchive(child->basket(), recursive, tar, backgrounds, tempFolder, progress);
+ 		}
+diff --git a/src/basket.cpp b/src/basket.cpp
+index a4edb31..67107d2 100644
+--- a/src/basket.cpp
++++ b/src/basket.cpp
+@@ -4469,12 +4469,20 @@ void Basket::noteUngroup()
+ 
+ void Basket::unplugSelection(NoteSelection *selection)
+ {
++	if (!selection)
++	{
++		return;
++	}
+ 	for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked())
+ 		unplugNote(toUnplug->note);
+ }
+ 
+ void Basket::insertSelection(NoteSelection *selection, Note *after)
+ {
++	if (!selection)
++	{
++		return;
++	}
+ 	for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) {
+ 		if (toUnplug->note->isGroup()) {
+ 			Note *group = new Note(this);
+@@ -4496,6 +4504,10 @@ void Basket::insertSelection(NoteSelection *selection, Note *after)
+ 
+ void Basket::selectSelection(NoteSelection *selection)
+ {
++	if (!selection)
++	{
++		return;
++	}
+ 	for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) {
+ 		if (toUnplug->note->isGroup())
+ 			selectSelection(toUnplug);

arch/tde-extra/tde-gtk-qt-engine/PKGBUILD

@@ -1,46 +1,50 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-gtk-qt-engine
+_mod=gtk-qt-engine
-pkgver=14.0.10
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="gtk qt engine"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/gtk-qt-engine'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdelibs' 'gtk2')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-#provides=('gtk-qt-engine')
+provides=("${_mod}")
-#conflicts=('gtk-qt-engine')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
-#replaces=('gtk-qt-engine')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/gtk-qt-engine-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('419342ad15dca93e5e4424eb7b0a2e59')
+md5sums=('60aa938573a877aa4589e49ee312253e')
-# install=''
+install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-  cd $srcdir
   msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p "$srcdir/build"
+  mkdir -p ${srcdir}/build
-  cd "$srcdir/build"
+  cd ${srcdir}/build
 
   msg "Starting cmake..."
 
   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DBUILD_ALL=ON \
     -DWITH_GCC_VISIBILITY=ON
 
   msg "Building - ${pkgname#*-}..."
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD

@@ -1,25 +1,27 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-gtk3-tqt-engine
+_mod=gtk3-tqt-engine
-pkgver=14.0.10
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="gtk3 tqt engine"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/gtk3-tqt-engine'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdelibs' 'gtk3')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-#provides=('tdemultimedia')
+provides=("${_mod}")
-#conflicts=('gtk3-tqt-engine')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
-#replaces=('gtk3-tqt-engine')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/gtk3-tqt-engine-trinity-${pkgver}.tar.xz"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-        'bp000-0e2c727907.diff')
+md5sums=('00a83443141c5c588f41e72ef74ceaf7')
-md5sums=('1f94fd009a3c062e042f914c21d49984'
+install=''
-         '280b56843ebeb41b9ee74120b0ef28b6')
-# install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
@@ -28,8 +30,6 @@ build() {
   ## Generate config files and update with autoreconf
   cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
 
-  patch -p1 < ${srcdir}/bp000-0e2c727907.diff
-
   msg "Copying system libtool files...."
   cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
   cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh

arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff

@@ -1,32 +0,0 @@
-commit b1327f977ffaa5b1789fd5987f621fa9b35a2a08
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date:   Fri Sep 24 14:54:59 2021 +0200
-
-    Fix FTBFS in case TQt3 is not installed in the system directory.
-    
-    Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-    (cherry picked from commit 0e2c72790799d6043225910bd437bd54f5cc6989)
-
-diff --git a/tdegtk/Makefile.am b/tdegtk/Makefile.am
-index 54a5db3..f1886dc 100644
---- a/tdegtk/Makefile.am
-+++ b/tdegtk/Makefile.am
-@@ -44,9 +44,8 @@ libtdegtk_la_SOURCES = $(source_h) $(source_c)
- libtdegtk_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
- libtdegtk_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
- 
--libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(all_libraries) $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
--
--libtdegtk_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
-+libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
-+libtdegtk_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
- 
- lib_LTLIBRARIES = libtqtcairo.la
- 
-@@ -56,5 +55,4 @@ libtqtcairo_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
- libtqtcairo_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
- 
- libtqtcairo_la_LIBADD = $(KDE_LIBADD) $(LIB_QT) $(LIB_TDEUI)
--
--libtqtcairo_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)
-+libtqtcairo_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)

arch/tde-extra/tde-kmplayer/PKGBUILD

@@ -1,48 +1,53 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-kmplayer
+_mod=kmplayer
-pkgver=14.0.10
+_cat=applications/multimedia/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="TDE KMPlayer"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/kmplayer'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase' 'tde-dbus-tqt' 'dbus-glib')
-makedepends=('pkgconfig' 'cmake' 'mplayer' 'xine-lib' 'nspr' 'gtk2')
+makedepends=('tde-cmake-trinity' 'mplayer' 'xine-lib' 'nspr' 'gtk2')
-#provides=('kmplayer')
+provides=("${_mod}")
-#conflicts=('kmplayer')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
-#replaces=('kmplayer')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/kmplayer-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('e817acc32c3f87cc475be8d8c7a1b4a7')
+md5sums=('bafbf516d47a05cfe2e943f27a93408c')
-# install=''
+install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
      -DBUILD_ALL=ON \
      -DBUILD_KOFFICE_PLUGIN=OFF \
-     -DBUILD_KGSTPLAYER=OFF
+     -DBUILD_KGSTPLAYER=OFF \
+     -DWITH_ALL_OPTIONS=ON
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-krusader/PKGBUILD

@@ -1,22 +1,26 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-krusader
+_mod=krusader
-pkgver=14.0.10
+_cat=applications/system/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="TDE Krusader"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/krusader'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase')
 makedepends=('pkgconfig' 'automake')
-#provides=('krusader')
+provides=("${_mod}")
-#conflicts=('krusader')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
-#replaces=('krusader')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/krusader-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('1491538ca6e616ec5bdfaa9c9f86c9b2')
+md5sums=('2040364b94ba52f8c8c8961b50e7296f')
-# install=''
+install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3

arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD

@@ -1,46 +1,50 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-ksplash-engine-moodin
+_mod=ksplash-engine-moodin
-pkgver=14.0.10
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="TDE KSplash Engine Moodin"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/ksplash-engine-moodin'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-#provides=('ksplash-engine-moodin')
+provides=("${_mod}")
-#conflicts=('ksplash-engine-moodin')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
-#replaces=('ksplash-engine-moodin')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/ksplash-engine-moodin-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('3a10d2089ed4e165ff74994e9efbf262')
+md5sums=('dcb22daf00d9604f284d1315b2870f5e')
-# install=''
+install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
      -DBUILD_ALL=ON \
      -DWITH_ALL_OPTIONS=ON
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-style-qtcurve/PKGBUILD

@@ -1,22 +1,26 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-style-qtcurve
+_mod=tde-style-qtcurve
-pkgver=14.0.10
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="TDE Style QTCurve"
 arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/applications/tde-style-qtcurve'
+url="http://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-#provides=('tde-style-qtcurve')
+provides=("${_mod}")
-#conflicts=('tde-style-qtcurve')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
-#replaces=('tde-style-qtcurve')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tde-style-qtcurve-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('b5bff2af06e5891d9b4bbeb5b3c83835')
+md5sums=('145c6de3ab7c8910feff4d3b2e2e0dc4')
-# install=''
+install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
@@ -27,17 +31,18 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DBUILD_ALL=ON \
     -DWITH_GCC_VISIBILITY=ON
 
   msg "Building - ${pkgname}..."
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-systemsettings/PKGBUILD

@@ -1,22 +1,26 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-systemsettings
+_mod=tde-systemsettings
-pkgver=14.0.10
+_cat=applications/settings/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="TDE System Settings"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/tde-systemsettings'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-#provides=('tde-systemsettings')
+provides=("${_mod}")
-#conflicts=('tde-systemsettings')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
-#replaces=('tde-systemsettings')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tde-systemsettings-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('aa7b76706221850c5ef5519360247e7b')
+md5sums=('17d6a2c9a6135680162a10de6ca0f4ae')
-# install=''
+install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
@@ -27,17 +31,18 @@ build() {
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+     -GNinja \
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
      -DBUILD_ALL=ON \
      -DBUILD_KNETWORKCONF=OFF
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-tdeaccessibility/PKGBUILD

@@ -1,46 +1,50 @@
 # Maintainer: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tdeaccessibility
+_mod=tdeaccessibility
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Accessibility utilities for the TDE Desktop"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake' 'tde-tdemultimedia')
+makedepends=('tde-cmake-trinity' 'tde-tdemultimedia')
 optdepends=()
-provides=("${pkgname#*-}")
+provides=("${_mod}")
-conflicts=("trinity-${pkgname#*-}")
+conflicts=("trinity-${_mod}")
-replaces=("trinity-${pkgname#*-}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeaccessibility-trinity-${pkgver}.tar.xz")
+md5sums=('f364bf5a1a460c2278f78b99ded4d646')
-md5sums=('0fb53257ee9b5dbd464a6ca8f30ef5b6')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-     -DBUILD_ALL=ON
+     -DBUILD_ALL=ON \
+     -DWITH_ALL_OPTIONS=ON
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-tdeaddons/PKGBUILD

@@ -1,46 +1,50 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-tdeaddons
+_mod=tdeaddons
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdeaddons'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 pkgdesc="Trinity Desktop Addons"
 depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake' 'tde-tdegames' 'tde-tdemultimedia' 'tde-tdepim')
+makedepends=('tde-cmake-trinity' 'tde-tdegames' 'tde-tdemultimedia' 'tde-tdepim' 'sdl')
-provides=('tdeaddons')
+provides=("${_mod}")
-conflicts=('trinity-tdeaddons' 'trinity-kdeaddons')
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
-replaces=('trinity-tdeaddons')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeaddons-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('27557921bf86569042c72d597b87c877')
+md5sums=('70b3c7131761a0c405942614ea8f5243')
-# install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
       -DCMAKE_VERBOSE_MAKEFILE=ON \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
-      -DWITH_ARTS=ON \
+      -DBUILD_ALL=ON \
-      -DBUILD_ALL=ON
+      -DWITH_ALL_OPTIONS=ON \
+      -DWITH_XMMS=OFF
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-tdeedu/PKGBUILD

@@ -1,51 +1,52 @@
 # Maintainer: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-tdeedu
+_mod=tdeedu
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Educational utilities for the TDE Desktop"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake' 'boost' 'boost-libs' 'doxygen' 'python' 'texlive-bin')
+makedepends=('tde-cmake-trinity' 'boost' 'boost-libs' 'doxygen' 'python' 'texlive-bin')
 optdepends=()
-provides=("${pkgname#*-}")
+provides=("${_mod}")
-conflicts=("trinity-${pkgname#*-}")
+conflicts=("trinity-${_mod}")
-replaces=("trinity-${pkgname#*-}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeedu-trinity-${pkgver}.tar.xz"
+md5sums=('10d3f00e8539e7bb74ecb02c6a91c507')
-        'bp000-0cb84fb9.diff')
-md5sums=('3859da24d70f0d787c0cc7f41540772d'
-         '5ae3959dc2dc62f1f7421620b198d175')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
-   patch -p1 < ${srcdir}/bp000-0cb84fb9.diff
-
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
-   #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-     -DBUILD_ALL=ON
+     -DBUILD_ALL=ON \
+     -DWITH_ALL_OPTIONS=ON \
+     -DWITH_OCAML_SOLVER=OFF \
+     -DWITH_LIBUSB=OFF
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff

@@ -1,31 +0,0 @@
-From 0cb84fb9036ce7bc7c757a3971fdb0c619d0c011 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Tue, 11 May 2021 09:15:26 +0200
-Subject: Fix FTBFS on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-error: static assertion failed: comparison object must be invocable as const
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- kiten/learn.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kiten/learn.cpp b/kiten/learn.cpp
-index 94e77b9a..a1b685d4 100644
---- a/kiten/learn.cpp
-+++ b/kiten/learn.cpp
-@@ -762,7 +762,7 @@ void Learn::qupdate()
- 
- struct Learn::scoreCompare 
- {
--	bool operator()(const TQListViewItem* v1, const TQListViewItem* v2)
-+	bool operator()(const TQListViewItem* v1, const TQListViewItem* v2) const
- 	{
- 		return v1->text(4).toInt() < v2->text(4).toInt();
- 	}
--- 
-cgit v1.2.1
-

arch/tde-extra/tde-tdegames/PKGBUILD

@@ -1,46 +1,49 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-tdegames
+_mod=tdegames
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdegames'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 pkgdesc="Trinity Desktop Games"
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-provides=('tdegames')
+provides=("${_mod}")
-conflicts=('trinity-tdegames' 'trinity-kdegames')
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
-replaces=('trinity-tdegames')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdegames-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('870352e848a991f1ff0045ef5590bc47')
+md5sums=('ef150b0d95ed82704e6d622da077dd60')
-# install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
       -DCMAKE_VERBOSE_MAKEFILE=ON \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
-      -DWITH_ARTS=ON \
+      -DBUILD_ALL=ON \
-      -DBUILD_ALL=ON
+      -DWITH_ALL_OPTIONS=ON
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-tdemultimedia/PKGBUILD

@@ -1,49 +1,52 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tdemultimedia
+_mod=tdemultimedia
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Trinity Desktop MultiMedia Components"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdemultimedia'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
-depends=('tde-tdelibs' 'cdparanoia' 'lame' 'libtheora' 'taglib' 'xine-lib')
+depends=('tde-tdelibs' 'tde-akode' 'cdparanoia' 'lame' 'libtheora' 'taglib' 'xine-lib')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-provides=('tdemultimedia')
+provides=("${_mod}")
-conflicts=('trinity-tdemultimedia' 'trinity-kdemultimedia')
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
-replaces=('trinity-tdemultimedia')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdemultimedia-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('f1f40920c9eed566eaa98a81b838b7b8')
+md5sums=('dc18c8aa1cdd7f4cbbb6628378ad0e82')
 # install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
       -DCMAKE_VERBOSE_MAKEFILE=ON \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
-      -DWITH_ALL_OPTIONS=ON \
-      -DWITH_ARTS_AKODE=OFF \
       -DBUILD_ALL=ON \
-      -DBUILD_JUK=OFF
+      -DWITH_ALL_OPTIONS=ON \
+      -DWITH_GSTREAMER=OFF
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-tdenetwork/PKGBUILD

@@ -1,48 +1,60 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tdenetwork
+_mod=tdenetwork
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdenetwork'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 pkgdesc="Trinity Desktop Network Components"
-depends=('tde-tdelibs' 'speex' 'wireless_tools' 'wpa_supplicant')
+depends=('tde-tdelibs' 'tde-tqca' 'libgadu' 'wireless_tools' 'wpa_supplicant')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-provides=('tdenetwork')
+provides=("${_mod}")
-conflicts=('trinity-tdenetwork' 'trinity-kdenetwork')
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
-replaces=('trinity-tdenetwork')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdenetwork-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('c3d26523623fbcc65993a044bd83d0f6')
+md5sums=('c5ec9a45b636c8da74d71194ed384b81')
 # install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
-   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
       -DCMAKE_VERBOSE_MAKEFILE=ON \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
-      -DWITH_SPEEX=ON \
+      -DBUILD_ALL=ON \
-      -DWITH_ARTS=ON \
+      -DWITH_ALL_OPTIONS=ON \
-      -DBUILD_ALL=ON
+      -DWITH_JINGLE=OFF \
+      -DWITH_SPEEX=OFF \
+      -DWITH_XMMS=OFF \
+      -DWITH_SLP=OFF \
+      -DBUILD_KOPETE_PROTOCOL_ALL=ON \
+      -DBUILD_KOPETE_PROTOCOL_SMS=OFF \
+      -DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF \
+      -DBUILD_KOPETE_PLUGIN_ALL=ON
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-tdenetworkmanager/PKGBUILD

@@ -1,55 +1,48 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-tdenetworkmanager
+_mod=tdenetworkmanager
-pkgver=14.0.10
+_cat=applications/settings/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="gtk qt engine"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/tdenetworkmanager'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-#provides=('tdenetworkmanager')
+provides=("${_mod}")
-#conflicts=('tdenetworkmanager')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
-#replaces=('tdenetworkmanager')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=(
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-    "https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdenetworkmanager-trinity-${pkgver}.tar.xz"
+md5sums=('9e36a8f2697081bdb92589ea914980f0')
-    'bp000-ea2b20ed7a.diff'
+install=''
-    'bp001-e4e7853030.diff'
-)
-md5sums=(
-    '2edab1bc48066a52f0b53a19457495a2'
-    '40f95a5c7c02471e629e109aeca86ce3'
-    'd292626fb10780eb68bbc1a60c1e7ed7'
-)
-# install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
-  patch -p1 < ${srcdir}/bp000-ea2b20ed7a.diff
-  patch -p1 < ${srcdir}/bp001-e4e7853030.diff
-
   msg "Creating out-of-source build directory: ${srcdir}/build"
   mkdir -p "${srcdir}/build"
   cd "${srcdir}/build"
 
   msg "Starting cmake..."
   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DBUILD_ALL=ON \
     -DWITH_GCC_VISIBILITY=ON
 
   msg "Building - ${pkgname#*-}..."
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-tdenetworkmanager/bp000-ea2b20ed7a.diff

@@ -1,78 +0,0 @@
-commit ea2b20ed7ab3e83b8585e20d2febdbb5f2d356c1
-Author: Michele Calgaro <michele.calgaro@yahoo.it>
-Date:   Mon Aug 2 11:24:50 2021 +0900
-
-    Removed unused hardwareEvent code.
-    
-    Initialization of TDEHardwareDevices() always happens before the signal
-    was connected. The constructor of TDEHardwareDevices() is the only place
-    that was triggering the signal emission, so the code was non functional.
-    
-    Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-
-diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp
-index 5f1f26e..085435c 100644
---- a/tdenetworkmanager/src/devicetraycomponent.cpp
-+++ b/tdenetworkmanager/src/devicetraycomponent.cpp
-@@ -74,8 +74,6 @@ DeviceTrayComponent::DeviceTrayComponent(TQString device, KSystemTray * parent,
- 
- 	TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
- 
--	// Listen for hardware change events
--	connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString)));
- 	// Trigger an initial hardware information update
- 	tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
- 
-diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp
-index 9427679..173464f 100644
---- a/tdenetworkmanager/src/tdenetman-tray.cpp
-+++ b/tdenetworkmanager/src/tdenetman-tray.cpp
-@@ -963,14 +963,6 @@ void Tray::slotGenericDeviceRemoved(TDEGenericDevice *dev)
- 	}
- }
- 
--void Tray::slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent event, TQString)
--{
--	if (event == TDEHardwareEvent::HardwareListModified) {
--		updateDeviceTrays();
--		connectTrayDeviceManager();
--	}
--}
--
- void Tray::slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType event, TQString message)
- {
- 	if (event == TDENetworkVPNEventType::LoginBanner) {
-@@ -1094,7 +1086,6 @@ Tray::Tray() : KSystemTray()
- 	// get notified about new/removed devices
- 	connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceAdded(TDEGenericDevice*)));
- 	connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceRemoved(TDEGenericDevice*)));
--	connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)));
- 
- 	// Notifications
- 	connect(TDEGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
-diff --git a/tdenetworkmanager/src/tdenetman-tray.h b/tdenetworkmanager/src/tdenetman-tray.h
-index d086902..6f4fdea 100644
---- a/tdenetworkmanager/src/tdenetman-tray.h
-+++ b/tdenetworkmanager/src/tdenetman-tray.h
-@@ -115,7 +115,6 @@ class Tray : public KSystemTray
- 	private slots:
- 		void slotGenericDeviceAdded(TDEGenericDevice*);
- 		void slotGenericDeviceRemoved(TDEGenericDevice*);
--		void slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString);
- 		void slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType event, TQString message);
- 
- 	private:
-diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-index 2d4eccb..9b855ec 100644
---- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-@@ -487,9 +487,6 @@ WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, cons
- 	setPixmapForState(TDENetworkConnectionStatus::Disconnected, "wireless");
- 	setPixmapForState(TDENetworkConnectionStatus::Connected, "nm_signal_50");
- 
--	// Listen for hardware change events
--	connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString)));
--
- 	// Trigger an initial hardware information update
- 	tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
- }

arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff

@@ -1,121 +0,0 @@
-commit e4e7853030d8efbf14e5ad6631c4cfb6b3601269
-Author: Michele Calgaro <michele.calgaro@yahoo.it>
-Date:   Mon Aug 2 23:19:04 2021 +0900
-
-    Removed unused hardwareEvent code - part 2.
-    
-    Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-
-diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp
-index 085435c..2ea4e35 100644
---- a/tdenetworkmanager/src/devicetraycomponent.cpp
-+++ b/tdenetworkmanager/src/devicetraycomponent.cpp
-@@ -75,7 +75,11 @@ DeviceTrayComponent::DeviceTrayComponent(TQString device, KSystemTray * parent,
- 	TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
- 
- 	// Trigger an initial hardware information update
--	tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
-+	TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device));
-+	TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
-+
-+	connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), TQT_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
-+	connect(deviceConnMan, TQT_SIGNAL(networkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)), this, TQT_SLOT(deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)));
- 
- 	m_pixmaps[TDENetworkConnectionStatus::Invalid] = "nm_no_connection";
- 	m_pixmaps[TDENetworkConnectionStatus::UnManaged] = "nm_no_connection";
-@@ -110,18 +114,6 @@ TQString DeviceTrayComponent::device() const
- 	return m_device;
- }
- 
--void DeviceTrayComponent::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString)
--{
--	if (event == TDEHardwareEvent::HardwareListModified) {
--		TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
--		TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device));
--		TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
--
--		connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), TQT_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
--		connect(deviceConnMan, TQT_SIGNAL(networkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)), this, TQT_SLOT(deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)));
--	}
--}
--
- void DeviceTrayComponent::deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType event, TQString message) {
- 	kdDebug() << "DeviceTrayComponent::deviceEventHandler" << endl;
- 
-diff --git a/tdenetworkmanager/src/devicetraycomponent.h b/tdenetworkmanager/src/devicetraycomponent.h
-index af0ccea..c3c40e1 100644
---- a/tdenetworkmanager/src/devicetraycomponent.h
-+++ b/tdenetworkmanager/src/devicetraycomponent.h
-@@ -59,7 +59,6 @@ class DeviceTrayComponent : public TrayComponent
- 		void deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString);
- 
- 	private slots:
--		void tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString);
- 		void deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType event, TQString message);
- 
- 	protected:
-diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-index 9b855ec..8811650 100644
---- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
-@@ -428,25 +428,6 @@ void WirelessDeviceTray::slotAccessPointRemoved(TDEMACAddress)
- 	KNotifyClient::event( tray()->winId(), "tdenm-nm-network-gone", i18n("TDENetworkManager Wireless Network Disappeared") );
- }
- 
--void WirelessDeviceTray::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString)
--{
--	if (event == TDEHardwareEvent::HardwareListModified) {
--		TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
--		TDENetworkConnectionManager* deviceConnMan = (dev)?dev->connectionManager():NULL;
--
--		// get notified when the device state changes
--		connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
--	
--		// get notified of all AP changes
--		connect(deviceConnMan, TQT_SIGNAL(accessPointStatusChanged(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)), this, TQT_SLOT(tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)));
--
--		// force status update to ensure correct icon is shown on startup
--		if ((dev) && (deviceConnMan)) {
--			slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, dev->deviceNode());
--		}
--	}
--}
--
- void WirelessDeviceTray::tdeAccessPointStatusChangedHandler(TDEMACAddress BSSID, TDENetworkAPEventType::TDENetworkAPEventType event) {
- 	TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
- 	TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
-@@ -487,8 +468,20 @@ WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, cons
- 	setPixmapForState(TDENetworkConnectionStatus::Disconnected, "wireless");
- 	setPixmapForState(TDENetworkConnectionStatus::Connected, "nm_signal_50");
- 
--	// Trigger an initial hardware information update
--	tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
-+	// initial hardware information update
-+	TDENetworkDevice* netdev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
-+	TDENetworkConnectionManager* deviceConnMan = (netdev)?netdev->connectionManager():NULL;
-+
-+	// get notified when the device state changes
-+	connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
-+
-+	// get notified of all AP changes
-+	connect(deviceConnMan, TQT_SIGNAL(accessPointStatusChanged(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)), this, TQT_SLOT(tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)));
-+
-+	// force status update to ensure correct icon is shown on startup
-+	if ((netdev) && (deviceConnMan)) {
-+		slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, netdev->deviceNode());
-+	}
- }
- 
- WirelessDeviceTray::~WirelessDeviceTray ()
-diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
-index 59a24a1..eb429b9 100644
---- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
-+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
-@@ -66,7 +66,6 @@ class WirelessDeviceTray : public DeviceTrayComponent
- 		void slotAccessPointRemoved(TDEMACAddress);
- 
- 	private slots:
--		void tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString);
- 		void tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType);
- 		void sendUpdateUI();
- 

arch/tde-extra/tde-tdepim/PKGBUILD

@@ -1,33 +1,36 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tdepim
+_mod=tdepim
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Trinity Desktop PIM Components"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdepim'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('boost' 'boost-libs' 'gnokii' 'libxss' 'xscreensaver' 'tde-tdelibs' 'tde-libcaldav' 'tde-libcarddav')
-makedepends=('pkgconfig' 'cmake' )
+makedepends=('tde-cmake-trinity')
-provides=('tdepim')
+provides=("${_mod}")
-replaces=('trinity-tdepim')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdepim-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('894562acd7c895da37d8af30b4f1fc61')
+md5sums=('55519a87ac6c16da15c4b1364e2c33f3')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-  cd $srcdir
-
   msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
+  mkdir -p ${srcdir}/build
-  cd build
+  cd ${srcdir}/build
 
   msg "Starting cmake..."
   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+    -GNinja \
     -DCMAKE_C_FLAGS="-fpermissive" \
     -DCMAKE_CXX_FLAGS="-fpermissive" \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -36,13 +39,13 @@ build() {
     -DBUILD_ALL=ON
 
   msg "Building - ${pkgname#*-}..."
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
   # Removing /opt/trinity/share/icons/default.tde to prevent a conflict
   rm -rf ${pkgdir}/opt/trinity/share/icons/default.tde
 }

arch/tde-extra/tde-tdepowersave/PKGBUILD

@@ -2,34 +2,32 @@
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
 _mod=tdepowersave
-_cat=applications/
+_cat=applications/system/
 _kdemod="${_mod/tde/kde}"
-pkgname="tde-$_mod"
+
-pkgver=14.0.10
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.11
 pkgrel=1
-pkgdesc="Trinity Desktop Enviroment $_cat$_mod"
+pkgdesc="Trinity Desktop Enviroment - ${_mod}"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/$_mod"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
-#provides=("$_mod")
+provides=("${_mod}")
 groups=('tde-extra')
 depends=(
   'tde-tdelibs'
   'tde-dbus-1-tqt'
   'libxss'
 )
-makedepends=(
+makedepends=('tde-cmake-trinity')
-  'cmake'
-  'pkgconfig'
-)
 optdepends=()
-confilicts=("trinity-$_kdemod" "kdemod3-$_kdemod")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
-#replaces=("trinity-$_mod")
+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")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('64daecf2c9061f3797b2cab8f0ad347b')
+md5sums=('68686e75e26795c31d051cf84e0fd06a')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
@@ -42,17 +40,18 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DBUILD_ALL=ON \
     -DWITH_GCC_VISIBILITY=ON
 
   msg "Building - ${pkgname#*-}..."
-  make VERBOSE=1 $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd "$srcdir/build"
-  make -j1 DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -j1 install
 }

arch/tde-extra/tde-tdesudo/PKGBUILD

@@ -1,31 +1,30 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-tdesudo
+_mod=tdesudo
-pkgver=14.0.10
+_cat=applications/settings/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="TDE Sudo"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/tdesudo'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-#provides=('tdesudo')
+provides=("${_mod}")
-#conflicts=('tdesudo')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
-#replaces=('tdesudo')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdesudo-trinity-${pkgver}.tar.xz"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-        'bp000-1136b8150f.diff')
+md5sums=('5943e82101e4a19499fcfd8cc21388e4')
-md5sums=('ff1b28acd12998c216e4256ca94f795b'
+install=''
-         '6ba546544bfab644bbbba972f31a137b')
-# install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
-   patch -p1 < $srcdir/bp000-1136b8150f.diff
-
    msg "Creating out-of-source build directory: ${srcdir}/build"
    mkdir -p $srcdir/build
    cd $srcdir/build
@@ -34,16 +33,18 @@ build() {
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-     -DBUILD_ALL=ON
+     -DBUILD_ALL=ON \
+     -DWITH_ALL_OPTIONS=ON
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-tdesudo/bp000-1136b8150f.diff

@@ -1,31 +0,0 @@
-From 1136b8150f58e909eaa094d991dcefa81b8f6a60 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Tue, 11 May 2021 19:45:01 +0200
-Subject: Fix ftbfs on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-error: ordered comparison of pointer with integer zero ('char*' and 'int')
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- tdesudo/tdesudo.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tdesudo/tdesudo.cpp b/tdesudo/tdesudo.cpp
-index c255d0f..83158ab 100644
---- a/tdesudo/tdesudo.cpp
-+++ b/tdesudo/tdesudo.cpp
-@@ -205,7 +205,7 @@ TdeSudo::TdeSudo(TQWidget *parent, const char *name,const TQString& icon, const
- 		chmod(m_tmpname.ascii(),0644);
- 	
- 	QCStringList output;
--	while (fgets(buf, 1024, f) > 0)
-+	while (fgets(buf, 1024, f) != NULL)
- 		output += buf; 
- 	if (pclose(f) < 0) {
- 		kdError() << k_lineinfo << "Could not run xauth.\n";
--- 
-cgit v1.2.1
-

arch/tde-extra/tde-tdetoys/PKGBUILD

@@ -1,43 +1,46 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-tdetoys
+_mod=tdetoys
-pkgver=14.0.10
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdetoys'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 pkgdesc="Trinity Desktop Toys"
 depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-provides=('tdetoys')
+provides=("${_mod}")
-conflicts=('trinity-tdetoys' 'trinity-kdetoys')
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
-replaces=('trinity-tdetoys')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdetoys-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('f91d22efed453b5053e2110782d85d93')
+md5sums=('2bb8f5d47d4e094e459597b5069b7a3d')
-# install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
       -DCMAKE_VERBOSE_MAKEFILE=ON \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
       -DBUILD_ALL=ON
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-tdmtheme/PKGBUILD

@@ -1,22 +1,26 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-tdmtheme
+_mod=tdmtheme
-pkgver=14.0.10
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="TDM Theme"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/tdmtheme'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdelibs')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-#provides=('tdmtheme')
+provides=("${_mod}")
-#conflicts=('tdmtheme')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
-#replaces=('tdmtheme')
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdmtheme-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('b085fa2792024415fb2174633875adbe')
+md5sums=('6428e97a82389819dd02e1608cd43b8b')
-# install=''
+install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
@@ -27,16 +31,18 @@ build() {
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
      -DCMAKE_VERBOSE_MAKEFILE=ON \
      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-     -DBUILD_ALL=ON
+     -DBUILD_ALL=ON \
+     -DWITH_ALL_OPTIONS=ON
 
    msg "Building - ${pkgname#*-}..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -j1 install
 }

arch/tde-extra/tde-tork/PKGBUILD

@@ -2,10 +2,11 @@
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
 _mod=tork
-_cat=applications/
+_cat=applications/internet/
 _kdemod="${_mod/tde/kde}"
+
 pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Anonymity manager for TDE"
 arch=('i686' 'x86_64')
@@ -18,34 +19,27 @@ depends=(
   'geoip'
   'torsocks'
 )
-makedepends=(
+makedepends=('tde-cmake-trinity')
-  'cmake'
-  'pkgconfig'
-)
 optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+conflicts=("trinity-${_kdemod}" "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"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-        'bp000-7576a4bf.diff')
+md5sums=('5833c06b815dc333f921dfdc6d7d844b')
-md5sums=('1f17070b8891a8fdd883b45cea74c72d'
-         '132b051287bfbfd41e2c50110027525b')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
 
 build() {
-  cd ${srcdir}/${_mod}-trinity-${pkgver}
-  patch -p1 < ${srcdir}/bp000-7576a4bf.diff
-
   msg "Creating out-of-source build directory: ${srcdir}/build"
   mkdir -p "$srcdir/build"
   cd "$srcdir/build"
 
   msg "Starting cmake..."
   cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
@@ -53,11 +47,11 @@ build() {
     -DWITH_ALL_OPTIONS=ON
 
   msg "Building - ${pkgname}..."
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - ${pkgname}-${pkgver}"
   cd "$srcdir/build"
-  make -j1 DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -j1 install
 }

arch/tde-extra/tde-tork/bp000-7576a4bf.diff

@@ -1,31 +0,0 @@
-From 7576a4bfe86835552ede116488e70baae64df9e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
-Date: Tue, 11 May 2021 20:34:45 +0200
-Subject: Fix ftbfs on Fedora 34
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-error: ordered comparison of pointer with integer zero (‘TQListViewItem*’ and ‘int’)
-
-Signed-off-by: François Andriot <francois.andriot@free.fr>
----
- src/torkview.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/torkview.cpp b/src/torkview.cpp
-index 1dd8b5d..ce32aea 100644
---- a/src/torkview.cpp
-+++ b/src/torkview.cpp
-@@ -1312,7 +1312,7 @@ void torkView::activeServersUpdated( const TQStringList &servers)
- 	{
- 		if ((*it).isEmpty())
- 			continue;
--        if ( (tm = serverList->findItem((*it),1)) > 0){
-+        if ( (tm = serverList->findItem((*it),1)) != NULL){
-             tm->setPixmap(0,TQPixmap(SmallIcon("tork_green")));
-         }else{
-             tm = new TQListViewItem(serverList, (*it));
--- 
-cgit v1.2.1
-

arch/tde-extra/tde-twin-style-crystal/PKGBUILD

@@ -1,54 +1,50 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-twin-style-crystal
+_mod=twin-style-crystal
-pkgver=14.0.10
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="TDE TWin Style Crystal"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/applications/twin-style-crystal'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
-#provides=('twin-style-crystal')
+provides=("${_mod}")
-#conflicts=('twin-style-crystal')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
-#replaces=('twin-style-crystal')
+replaces=("trinity-${_kdemod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/twin-style-crystal-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('b87b5ad84ba492e6e56c583c05ba4d40')
+md5sums=('b435ddeae50565fd440dc3705f503218')
-# install=''
+install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
 
 build() {
-  ## Generate config files and update with autoreconf
+  msg "Creating out-of-source build directory: ${srcdir}/build"
-  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
+  mkdir -p "$srcdir/build"
-
+  cd "$srcdir/build"
-  msg "Copying system libtool files...."
+
-  cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
+  msg "Starting cmake..."
-  cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
-
+    -GNinja \
-  msg "Running make -f admin/Makefile.common ...."
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
-  make -f admin/Makefile.common
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-  ## configure
+    -DBUILD_ALL=ON \
-  msg "Configuring - ${pkgname#*-}..."
+    -DWITH_ALL_OPTIONS=ON
-  ./configure \
+
-    --prefix=${TDEDIR} \
+  msg "Building - ${pkgname}..."
-    --with-qt-dir=${QTDIR} \
+  ninja $NUMJOBS
-    --with-qt-includes=${QTDIR}/include \
-    --with-qt-libraries=${QTDIR}/lib \
-    --sysconfdir=${TDEDIR}/etc \
-    --localstatedir=/var \
-    --enable-closure
-
-  msg "Building - ${pkgname#*-}..."
-  make $NUMJOBS
 }
 
 package() {
-  msg "Packaging - $pkgname-$pkgver"
+  msg "Packaging - ${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
+  cd "$srcdir/build"
-  make -j1 DESTDIR="${pkgdir}" install
+  DESTDIR="$pkgdir" ninja -j1 install
 }

arch/tde-extra/tde-yakuake/PKGBUILD

@@ -2,10 +2,11 @@
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
 _mod=yakuake
-_cat=applications/
+_cat=applications/system/
 _kdemod="${_mod/tde/kde}"
+
 pkgname="tde-${_mod}"
-pkgver=14.0.10
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="A Quake-style terminal emulator based on TDE Konsole technology"
 arch=('i686' 'x86_64')
@@ -16,18 +17,15 @@ groups=('tde-complete')
 depends=(
   'tde-tdelibs'
 )
-makedepends=(
+makedepends=('tde-cmake-trinity')
-  'cmake'
-  'pkgconfig'
-)
 optdepends=()
-confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+conflicts=("trinity-${_kdemod}" "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=('87c4355c77e561d36d35ea46b66f6375')
+md5sums=('77fb98c6bfd0d5e91b38417ae39083e4')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
@@ -39,6 +37,7 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
@@ -46,11 +45,11 @@ build() {
     -DWITH_ALL_OPTIONS=ON
 
   msg "Building - ${pkgname}..."
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - ${pkgname}-${pkgver}"
   cd "$srcdir/build"
-  make -j1 DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -j1 install
 }

arch/tde-libs/tde-libcaldav/PKGBUILD

@@ -1,44 +1,47 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contribuitor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-libcaldav
+_mod=libcaldav
-pkgver=14.0.10
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="A client library adding support for the CalDAV protocol (rfc4791)"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/libcaldav"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-libs')
 depends=('curl' 'glib2')
-makedepends=('doxygen' 'pkgconfig' 'cmake')
+makedepends=('doxygen' 'tde-cmake-trinity')
 optdepends=()
-provides=('libcaldav')
+provides=("${_mod}")
-# conflicts=()
+replaces=("trinity-${_mod}")
-replaces=('trinity-libcaldav')
 options=('staticlibs' 'libtool' '!strip')
 install=
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libcaldav-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('3d1b4997e4789c5b3a5389f5b58fd4f0')
+md5sums=('75662017b1a02ffc631e5120b7addfd0')
 
 _prefix=/usr
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=${_prefix} \
       -DWITH_GCC_VISIBILITY=ON
 
    msg "Building $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="$pkgdir" install
+   DESTDIR="$pkgdir" ninja -j1 install
 }

arch/tde-libs/tde-libcarddav/PKGBUILD

@@ -1,41 +1,45 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty@gmail.com>
 
-pkgname=tde-libcarddav
+_mod=libcarddav
-pkgver=14.0.10
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="A client library adding support for the CardDAV protocol"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/libcarddav"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 groups=('tde-libs')
 depends=('curl')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
 license=('GPL')
-provides=('libcarddav')
+provides=("${_mod}")
 # conflicts=()
-replaces=('trinity-libcarddav')
+replaces=("trinity-${_mod}")
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libcarddav-trinity-${pkgver}.tar.xz")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-md5sums=('54a5c89bb094ec40cc8cd5734233f743')
+md5sums=('79e1c4e92751eb72c843ce0ddc70e5fe')
 
 _prefix=/usr
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=${_prefix} \
       -DWITH_GCC_VISIBILITY=ON
 
    msg "Building $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="$pkgdir" install
+   DESTDIR="$pkgdir" ninja -j1 install
 }

arch/tde-libs/tde-libkdcraw/PKGBUILD

@@ -1,66 +1,49 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-libkdcraw
+_mod=libkdcraw
-pkgver=14.0.10
+_cat=libraries/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="The EXIV2 Library interface for TDE kipi-plugins"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-libs')
 depends=('tde-tdelibs' 'libraw' 'lcms2')
-makedepends=('pkgconfig' 'autoconf' 'imake')
+makedepends=('tde-cmake-trinity')
 optdepends=()
-provides=("${pkgname#*-}")
+provides=("${_mod}")
-conflicts=("trinity-${pkgname#*-}")
+conflicts=("trinity-${_mod}")
-replaces=("trinity-${pkgname#*-}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/libraries/libkdcraw-trinity-${pkgver}.tar.xz")
+md5sums=('2daaa1a383d0ccdfd914c29db7f05c37')
-md5sums=('fedf15518c80f85174071df185a45c88')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
 
 build() {
-  ## Generate config files and update with autoreconf
+   msg "Creating out-of-source build directory: ${srcdir}/build"
-  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
+   mkdir -p ${srcdir}/build
-
+   cd ${srcdir}/build
-  msg "Copying system libtool files...."
+
-  cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
+   msg "Starting cmake..."
-  cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
-
+      -GNinja \
-  msg "Running autotools, libtoolize, aclocal, autoupdate, autoconf, automake, autoreconf"
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-  aclocal
+      -DBUILD_ALL=ON \
-  autoupdate
+      -DWITH_ALL_OPTIONS=ON
-  autoconf
+
-  automake --add-missing
+   msg "Building $pkgname..."
-
+   ninja $NUMJOBS
-  msg "Running make -f admin/Makefile.common ...."
-  make -f admin/Makefile.common
-
-  ## configure
-  msg "Configuring - ${pkgname}..."
-
-  ./configure \
-    --prefix=${TDEDIR} \
-    --with-qt-dir=${QTDIR} \
-    --with-qt-includes=${QTDIR}/include \
-    --with-qt-libraries=${QTDIR}/lib \
-    --localstatedir=/var \
-    --enable-debug=full \
-    --enable-closure
-
-  ## make $NUMJOBS
-  msg "Building - ${pkgname}..."
-  make $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
-
+   cd ${srcdir}/build
-  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}    # use for non-out-of-source
+   DESTDIR="$pkgdir" ninja -j1 install
-
-  make -j1 DESTDIR="$pkgdir" install
 }

arch/tde-libs/tde-libkexiv2/PKGBUILD

@@ -1,44 +1,48 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-libkexiv2
+_mod=libkexiv2
-pkgver=14.0.10
+_cat=libraries/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="The EXIV2 Library interface for TDE kipi-plugins"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-libs')
 depends=('tde-tdelibs' 'exiv2')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
 optdepends=()
-provides=("${pkgname#*-}")
+provides=("${_mod}")
-conflicts=("trinity-${pkgname#*-}")
+conflicts=("trinity-${_mod}")
-replaces=("trinity-${pkgname#*-}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!emptydirs')
-# install='pkgname.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/libraries/libkexiv2-trinity-${pkgver}.tar.xz")
+md5sums=('94635dfeca198fce57cb45a15d31a222')
-md5sums=('0647354c2cc1da9f54cd0d0707b026a3')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ${srcdir}/build
-   cd build
+   cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DWITH_GCC_VISIBILITY=ON
+      -DWITH_ALL_OPTIONS=ON
 
    msg "Building $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="$pkgdir" install
+   DESTDIR="$pkgdir" ninja -j1 install
 }

arch/tde-meta/PKGBUILD

@@ -1,12 +1,13 @@
 pkgname=tde-meta
-pkgver=14.0.10
+pkgver=14.0.11
-pkgrel=2
+pkgrel=1
 pkgdesc="Trinity Desktop Environment"
 arch=('any')
 url="https://www.trinitydesktop.org/"
 license=('GPL')
 depends=(
     # tde-base
+    'tde-i18n'
     'tde-tdeadmin'
     'tde-tdeartwork'
     'tde-tdebindings'
@@ -16,11 +17,13 @@ depends=(
     # tde-core
     'tde-arts'
     'tde-avahi-tqt'
+    'tde-cmake-trinity'
     'tde-dbus-1-tqt'
     'tde-dbus-tqt'
     'tde-libart-lgpl'
     'tde-tdebase'
     'tde-tdelibs'
+    'tde-tqca'
     'tde-tqca-tls'
     'tde-tqt3'
     'tde-tqtinterface'
@@ -38,6 +41,7 @@ depends=(
 
     # tde-extra
     'tde-abakus'
+    'tde-akode'
     'tde-amarok'
     'tde-basket'
     'tde-gtk3-tqt-engine'