From b1f147263512a1138ec327834de0671364822ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Thu, 23 Sep 2021 15:12:44 +0200
Subject: [PATCH] ArchLinux: Add pkgbuilds for abakus, basket, tork and
 yakuake.
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>
(cherry picked from commit bf62f0f62cfe90dcc81f151af4c3558c51760676)
---
 arch/tde-extra/tde-abakus/PKGBUILD          | 56 ++++++++++++++++++
 arch/tde-extra/tde-basket/PKGBUILD          | 59 +++++++++++++++++++
 arch/tde-extra/tde-tork/PKGBUILD            | 63 +++++++++++++++++++++
 arch/tde-extra/tde-tork/bp000-7576a4bf.diff | 31 ++++++++++
 arch/tde-extra/tde-yakuake/PKGBUILD         | 56 ++++++++++++++++++
 arch/tde-meta/PKGBUILD                      |  4 ++
 6 files changed, 269 insertions(+)
 create mode 100644 arch/tde-extra/tde-abakus/PKGBUILD
 create mode 100644 arch/tde-extra/tde-basket/PKGBUILD
 create mode 100644 arch/tde-extra/tde-tork/PKGBUILD
 create mode 100644 arch/tde-extra/tde-tork/bp000-7576a4bf.diff
 create mode 100644 arch/tde-extra/tde-yakuake/PKGBUILD

diff --git a/arch/tde-extra/tde-abakus/PKGBUILD b/arch/tde-extra/tde-abakus/PKGBUILD
new file mode 100644
index 000000000..c8961c7d7
--- /dev/null
+++ b/arch/tde-extra/tde-abakus/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=abakus
+_cat=applications/
+_kdemod="${_mod/tde/kde}"
+pkgname="tde-${_mod}"
+pkgver=14.0.10
+pkgrel=1
+pkgdesc="Calculator for TDE"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'cmake'
+  'pkgconfig'
+)
+optdepends=()
+confilicts=("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=('90fa9e728b8b48ad5e51c95eb5d05dc7')
+
+[ -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}-trinity-${pkgver} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  make $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  make -j1 DESTDIR="$pkgdir" install
+}
diff --git a/arch/tde-extra/tde-basket/PKGBUILD b/arch/tde-extra/tde-basket/PKGBUILD
new file mode 100644
index 000000000..f166dd4cf
--- /dev/null
+++ b/arch/tde-extra/tde-basket/PKGBUILD
@@ -0,0 +1,59 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=basket
+_cat=applications/
+_kdemod="${_mod/tde/kde}"
+pkgname="tde-${_mod}"
+pkgver=14.0.10
+pkgrel=1
+pkgdesc="A multi-purpose note-taking application for KDE"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+  'tde-tdepim'
+)
+makedepends=(
+  'cmake'
+  'pkgconfig'
+)
+optdepends=()
+confilicts=("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=('6a70768661d810eeeba5281075215803')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  make $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  make -j1 DESTDIR="$pkgdir" install
+}
diff --git a/arch/tde-extra/tde-tork/PKGBUILD b/arch/tde-extra/tde-tork/PKGBUILD
new file mode 100644
index 000000000..e5660beb6
--- /dev/null
+++ b/arch/tde-extra/tde-tork/PKGBUILD
@@ -0,0 +1,63 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tork
+_cat=applications/
+_kdemod="${_mod/tde/kde}"
+pkgname="tde-${_mod}"
+pkgver=14.0.10
+pkgrel=1
+pkgdesc="Anonymity manager for TDE"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+  'geoip'
+  'torsocks'
+)
+makedepends=(
+  'cmake'
+  'pkgconfig'
+)
+optdepends=()
+confilicts=("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"
+        'bp000-7576a4bf.diff')
+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} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  make $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  make -j1 DESTDIR="$pkgdir" install
+}
diff --git a/arch/tde-extra/tde-tork/bp000-7576a4bf.diff b/arch/tde-extra/tde-tork/bp000-7576a4bf.diff
new file mode 100644
index 000000000..64db42995
--- /dev/null
+++ b/arch/tde-extra/tde-tork/bp000-7576a4bf.diff
@@ -0,0 +1,31 @@
+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
+
diff --git a/arch/tde-extra/tde-yakuake/PKGBUILD b/arch/tde-extra/tde-yakuake/PKGBUILD
new file mode 100644
index 000000000..81977b50f
--- /dev/null
+++ b/arch/tde-extra/tde-yakuake/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=yakuake
+_cat=applications/
+_kdemod="${_mod/tde/kde}"
+pkgname="tde-${_mod}"
+pkgver=14.0.10
+pkgrel=1
+pkgdesc="A Quake-style terminal emulator based on TDE Konsole technology"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'cmake'
+  'pkgconfig'
+)
+optdepends=()
+confilicts=("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')
+
+[ -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}-trinity-${pkgver} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  make $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  make -j1 DESTDIR="$pkgdir" install
+}
diff --git a/arch/tde-meta/PKGBUILD b/arch/tde-meta/PKGBUILD
index c441abd10..f27694004 100644
--- a/arch/tde-meta/PKGBUILD
+++ b/arch/tde-meta/PKGBUILD
@@ -6,8 +6,10 @@ arch=('any')
 url="https://www.trinitydesktop.org/"
 license=('GPL')
 depends=(
+    'tde-abakus'
     'tde-arts'
     'tde-avahi-tqt'
+    'tde-basket'
     'tde-dbus-1-tqt'
     'tde-dbus-tqt'
     'tde-gtk-qt-engine'
@@ -42,10 +44,12 @@ depends=(
     'tde-tdevelop'
     'tde-tdewebdev'
     'tde-tdmtheme'
+    'tde-tork'
     'tde-tqca-tls'
     'tde-tqt3'
     'tde-tqt3-docs'
     'tde-tqtinterface'
+    'tde-yakuake'
 )
 
 package() {