diff options
Diffstat (limited to 'arch/tde-extra/tde-tork')
| -rw-r--r-- | arch/tde-extra/tde-tork/PKGBUILD | 26 | ||||
| -rw-r--r-- | arch/tde-extra/tde-tork/bp000-7576a4bf.diff | 31 |
2 files changed, 10 insertions, 47 deletions
diff --git a/arch/tde-extra/tde-tork/PKGBUILD b/arch/tde-extra/tde-tork/PKGBUILD index e5660beb6..ff7dbd53b 100644 --- a/arch/tde-extra/tde-tork/PKGBUILD +++ b/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=( - 'cmake' - 'pkgconfig' -) +makedepends=('tde-cmake-trinity') 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" - 'bp000-7576a4bf.diff') -md5sums=('1f17070b8891a8fdd883b45cea74c72d' - '132b051287bfbfd41e2c50110027525b') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('5833c06b815dc333f921dfdc6d7d844b') [ -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 } diff --git a/arch/tde-extra/tde-tork/bp000-7576a4bf.diff b/arch/tde-extra/tde-tork/bp000-7576a4bf.diff deleted file mode 100644 index 64db42995..000000000 --- a/arch/tde-extra/tde-tork/bp000-7576a4bf.diff +++ /dev/null @@ -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 - |