ArchLinux: Update all remaining tde-core modules to R14.0.10.

Switch avahi-tqt, libart-lgpl and tqca-tls to CMake.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 331073bb83)
pull/158/head
Slávek Banko 3 years ago
parent 9a0e5d3caf
commit 910a49dadf
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -4,11 +4,11 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-arts
pkgver=14.0.5
pkgver=14.0.10
pkgrel=1
pkgdesc="Trinity ARTS Sound System and libraries"
arch=('i686' 'x86_64')
url='http://scm.trinitydesktop.org/scm/git/arts'
url='https://scm.trinitydesktop.org/scm/git/arts'
license=('GPL')
groups=('tde-core')
depends=('alsa-plugins'
@ -31,10 +31,12 @@ provides=('arts')
conflicts=('kdemod3-arts' 'arts')
replaces=('trinity-arts')
options=('staticlibs' 'libtool' '!emptydirs')
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/arts-R${pkgver}.tar.bz2")
md5sums=('2632ad0a5045b24a5f01ed1aebcf2fa8')
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/arts-trinity-${pkgver}.tar.xz")
md5sums=('d9d719e824acd5397dda709ed5352feb')
install='tde-arts.install'
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
@ -42,19 +44,16 @@ build() {
cd build
msg "Starting cmake..."
cmake ${srcdir}/dependencies/arts/ \
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DWITH_GCC_VISIBILITY=ON
msg "Building $pkgname..."
make $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
make -j1 DESTDIR="$pkgdir" install
}

@ -2,43 +2,41 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-avahi-tqt
pkgver=14.0.5
pkgver=14.0.10
pkgrel=1
pkgdesc="Trinity Avahi-TQt"
arch=('i686' 'x86_64')
url='http://scm.trinitydesktop.org/scm/git/avahi-tqt'
url='https://scm.trinitydesktop.org/scm/git/avahi-tqt'
license=('GPL')
groups=('tde-core')
depends=('tde-tqtinterface' 'avahi' 'nss-mdns')
# nss-mdns should probably move to tdelibs depends
makedepends=('pkgconfig')
makedepends=('pkgconfig' 'cmake')
provides=('avahi-tqt')
replaces=('trinity-avahi-tqt')
options=('staticlibs' 'libtool' '!strip')
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/avahi-tqt-R${pkgver}.tar.bz2")
md5sums=('3b296fb5e6131c14dec4f299b0c9d1d6')
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/avahi-tqt-trinity-${pkgver}.tar.xz")
md5sums=('6cce8423a3030505bb56a8c73f6235d6')
build() {
cd ${srcdir}
## adjust pkgconfig path
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/trinity/tqt3/lib/pkgconfig"
cd ${srcdir}/dependencies/${pkgname#*-}
msg "Starting configure..."
./autogen.sh --prefix=${TDEDIR} \
--sysconfdir=${TDEDIR}/etc \
--localstatedir=/var
msg "Building - $pkgname..."
make $NUMJOBS
[ -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}/ \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DWITH_GCC_VISIBILITY=ON
msg "Building - $pkgname..."
make $NUMJOBS
}
package() {
msg "Packaging - $pkgname"
cd ${srcdir}/dependencies/${pkgname#*-}
make -j1 DESTDIR="${pkgdir}" install
msg "Packaging - $pkgname"
cd ${srcdir}/build
make -j1 DESTDIR="$pkgdir" install
}

@ -4,11 +4,11 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-dbus-1-tqt
pkgver=14.0.5
pkgver=14.0.10
pkgrel=1
pkgdesc="Trinity D-Bus TQtInterface Wrapper - from TDE upstream GIT"
arch=('i686' 'x86_64')
url='http://www.trinitydesktop.org'
url='https://scm.trinitydesktop.org/scm/git/dbus-1-tqt'
license=('GPL')
groups=('tde-core' 'tde-base')
depends=('tde-tqtinterface' 'dbus')
@ -17,10 +17,12 @@ provides=('dbus-1-tqt')
conflicts=('trinity-dbus-1-tqt')
replaces=('trinity-dbus-1-tqt' 'trinity-dbus-1-qt3' 'dbus-1-qt3' 'tde-dbus-tqt-1')
options=('staticlibs' 'libtool' '!strip')
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/dbus-1-tqt-R${pkgver}.tar.bz2")
md5sums=('727b960ac3fbb5bf92d53215e70f58a6')
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/dbus-1-tqt-trinity-${pkgver}.tar.xz")
md5sums=('4954efb83544c72272ba803eb44b72ec')
install='trinity-dbus-1-tqt.install'
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
@ -28,12 +30,12 @@ build() {
cd build
msg "Starting cmake..."
cmake ${srcdir}/dependencies/${pkgname#*-} \
-DCMAKE_INSTALL_PREFIX=${TDEDIR}
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DWITH_GCC_VISIBILITY=ON
msg "Building - $pkgname..."
make $NUMJOBS
}
package() {

@ -4,10 +4,10 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-dbus-tqt
pkgver=14.0.5
pkgver=14.0.10
pkgrel=1
arch=('i686' 'x86_64')
url='http://scm.trinitydesktop.org/scm/git/dbus-tqt'
url='https://scm.trinitydesktop.org/scm/git/dbus-tqt'
license=('GPL')
groups=('tde-core')
pkgdesc="Trinity TQt DBus wrapper"
@ -15,10 +15,12 @@ depends=('tde-arts' 'dbus')
makedepends=('pkgconfig' 'cmake')
provides=('dbus-tqt')
options=('staticlibs' 'libtool' '!strip')
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/dbus-tqt-R${pkgver}.tar.bz2")
md5sums=('619e65a35e2e750900f1d10931b6698c')
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/dbus-tqt-trinity-${pkgver}.tar.xz")
md5sums=('5a3577b3f43b3cfeb4701bb4a4e0a951')
install='trinity-dbus-tqt.install'
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
@ -26,8 +28,9 @@ build() {
cd build
msg "Starting cmake..."
cmake ${srcdir}/dependencies/${pkgname#*-} \
-DCMAKE_INSTALL_PREFIX=$TDEDIR
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
-DWITH_GCC_VISIBILITY=ON
msg "Building - $pkgname..."
make $NUMJOBS

@ -2,31 +2,43 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-libart-lgpl
pkgver=14.0.5
pkgver=14.0.10
pkgrel=1
pkgdesc="Trinity Desktop LGPL'd Component"
arch=('i686' 'x86_64')
url="http://scm.trinitydesktop.org/scm/git/libart-lgpl"
url="https://scm.trinitydesktop.org/scm/git/libart-lgpl"
license=('LGPL')
groups=('tde-core')
depends=('tde-tqtinterface')
makedepends=()
makedepends=('pkgconfig' 'cmake')
optdepends=()
provides=('libart-lgpl')
conflicts=()
replaces=()
options=('staticlibs' 'libtool' '!strip')
install=
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/libart-lgpl-R${pkgver}.tar.bz2")
md5sums=('89ee9f3901fdd8622b24e789638818e6')
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libart-lgpl-trinity-${pkgver}.tar.xz")
md5sums=('e3cae1bd69671c21b27d10bd9b29bb8c')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
cd $srcdir/dependencies/${pkgname#*-}
./configure --prefix=${TDEDIR}
make
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
-DWITH_GCC_VISIBILITY=ON
msg "Building - $pkgname..."
make $NUMJOBS
}
package() {
cd $srcdir/dependencies/${pkgname#*-}
make -j1 DESTDIR=$pkgdir install
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
make -j1 DESTDIR="${pkgdir}" install
}

@ -2,11 +2,11 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname='tde-tdebase'
pkgver=14.0.5
pkgver=14.0.10
pkgrel=1
pkgdesc="Trinity Desktop Enviroment base components"
arch=('i686' 'x86_64')
url='http://scm.trinitydesktop.org/scm/git/tdebase'
url='https://scm.trinitydesktop.org/scm/git/tdebase'
license=('GPL')
provides=('tdebase')
groups=('tde-core')
@ -16,7 +16,6 @@ depends=('libraw1394'
'libxss'
'lm_sensors'
'tde-tdelibs'
'tde-dbus-tqt'
'tde-dbus-1-tqt'
'ttf-dejavu'
'ttf-freefont'
@ -50,7 +49,7 @@ replaces=('trinity-tdebase')
options=('staticlibs' 'libtool' '!strip')
install='trinity-tdebase.install'
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdebase-R${pkgver}.tar.bz2"
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebase-trinity-${pkgver}.tar.xz"
'arch-kdeshutdown.png'
'kdm-default-face.png'
'agent-shutdown.sh'
@ -58,12 +57,9 @@ source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdebas
'tdm-trinity'
'trinity.desktop'
'tdm.service'
'xsession.patch'
'stat.patch'
'rpcfix.patch'
'config_fix.patch')
'xsession.patch')
md5sums=('aed6cd45278faa17b9a448b34cbb5127'
md5sums=('bca895dfc2b88c4b74e307d5690108bf'
'2dac928c6177b9fa0f4e751d7dddc62e'
'81eb97f16b66a2152e592358727a30c7'
'18e8d01124b19f7df2937c06e177bf7f'
@ -71,32 +67,21 @@ md5sums=('aed6cd45278faa17b9a448b34cbb5127'
'bb4c25e560fa719e8e8f49ef80bd1c99'
'091f4e1045867bbbc15bf323731aae82'
'e0ddb96fc86bd081ce691744a68d2f9a'
'a761787a4d2f917389ced194552addca'
'9ed22bf950f1b8c722aad0078e270774'
'409bccfb0632c4eda71130e744676b9d'
'b75b47ff872e80ef2853389237665e9f')
'a761787a4d2f917389ced194552addca')
build() {
cd ${srcdir}/${pkgname#*-}
msg "Patching to use new rpc/rpc.h include path"
patch -p1 -i ${srcdir}/rpcfix.patch
msg "Patching to not use linux/stat.h"
patch -p1 -i ${srcdir}/stat.patch
msg "Patching CMakeLists.txt to fix config bug"
patch -p1 -i ${srcdir}/config_fix.patch
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p ../build
cd ../build
mkdir -p build
cd build
msg "Starting cmake..."
export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
cmake ${srcdir}/tdebase \
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DWITH_SASL=ON \
@ -159,7 +144,7 @@ package() {
ln -sf $TDEDIR/bin/starttde ${pkgdir}$TDEDIR/bin/starttrinity
# install mkpamserv script, so we can auto-generate pam.d configs in post_install()
install -D -m755 ${srcdir}/tdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv
install -D -m755 ${srcdir}/${pkgname#*-}-trinity-${pkgver}/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv
# Install nice arch logo to use in the shutdown dialog
install -D -m 644 $srcdir/arch-kdeshutdown.png ${pkgdir}$TDEDIR/share/apps/ksmserver/pics/shutdownkonq.png

@ -1,13 +0,0 @@
diff -Naur tdebase-orig/tdm/kfrontend/CMakeLists.txt tdebase/tdm/kfrontend/CMakeLists.txt
--- tdebase-orig/tdm/kfrontend/CMakeLists.txt 2018-08-25 10:01:35.000000000 +0000
+++ tdebase/tdm/kfrontend/CMakeLists.txt 2019-01-30 19:27:06.000000000 +0000
@@ -48,7 +48,7 @@
##### tdm_config (executable) ###################
-set_property( SOURCE tdm_config.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci )
+set_property( SOURCE tdm_config.c tdm_greet.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci )
tde_add_executable( tdm_config
SOURCES tdm_config.c

@ -1,21 +0,0 @@
--- tdebase-orig/CMakeLists.txt 2016-11-06 21:13:18.000000000 -0800
+++ tdebase/CMakeLists.txt 2018-06-11 20:56:07.988765200 -0700
@@ -23,6 +23,8 @@
##### include essential cmake modules ###########
+include_directories( /usr/include/tirpc ) # FIX For ArchLinux
+
include( FindPkgConfig )
include( CheckIncludeFile )
include( CheckIncludeFiles )
--- tdebase-orig/tdeioslave/nfs/CMakeLists.txt 2016-11-06 21:13:18.000000000 -0800
+++ tdebase/tdeioslave/nfs/CMakeLists.txt 2018-06-11 21:22:40.661414000 -0700
@@ -41,6 +41,6 @@
tde_add_kpart( ${target} AUTOMOC
SOURCES tdeio_nfs.cpp mount_xdr.c nfs_prot_xdr.c
- LINK tdeio-shared
+ LINK tdeio-shared tirpc
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -1,12 +0,0 @@
diff -Naur tdebase-orig/kdesktop/lock/lockprocess.cc tdebase/kdesktop/lock/lockprocess.cc
--- tdebase-orig/kdesktop/lock/lockprocess.cc 2018-08-25 10:01:35.000000000 +0000
+++ tdebase/kdesktop/lock/lockprocess.cc 2019-01-22 23:24:54.000000000 +0000
@@ -80,7 +80,7 @@
#include <kcrash.h>
#ifdef __linux__
+//#include <linux/stat.h>
-#include <linux/stat.h>
#endif
#include <pthread.h>

@ -4,11 +4,11 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-tdelibs
pkgver=14.0.5
pkgver=14.0.10
pkgrel=1
pkgdesc="Trinity Desktop core libraries and applications"
arch=('i686' 'x86_64')
url='http://scm.trinitydesktop.org/scm/git/tdelibs'
url='https://scm.trinitydesktop.org/scm/git/tdelibs'
license=('GPL')
groups=('tde-core')
depends=('aspell'
@ -36,24 +36,24 @@ provides=('tdelibs')
conflicts=('trinity-kdelibs' 'trinity-tdelibs' 'kdemod3-kdelibs' 'kdelibs3')
replaces=('trinity-kdelibs' 'trinity-tdelibs')
options=('staticlibs' 'libtool' '!makeflags' '!strip')
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdelibs-R${pkgver}.tar.bz2")
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdelibs-trinity-${pkgver}.tar.xz")
md5sums=('03e4bdd2f36d1f5df1427b731a7c75ae')
md5sums=('cbb77407a886b588b4749524ae8e5edd')
install='trinity-tdelibs.install'
build() {
cd "${srcdir}/tdelibs"
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
msg "Starting cmake..."
cmake ${srcdir}/tdelibs \
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
-DCMAKE_VERBOSE_MAKEFILE=ON \

@ -4,35 +4,44 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-tqca-tls
pkgver=14.0.5
pkgver=14.0.10
pkgrel=1
pkgdesc="Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)"
arch=('i686' 'x86_64')
url='http://scm.trinitydesktop.org/scm/git/tqca-tls'
url='https://scm.trinitydesktop.org/scm/git/tqca-tls'
license=('GPL')
groups=('tde-core')
depends=('tde-tqtinterface' 'openssl-1.0')
makedepends=('pkgconfig')
makedepends=('pkgconfig' 'cmake')
provides=('tqca-tls')
conflicts=('trinity-tqca-tls')
replaces=('trinity-tqca-tls')
options=('staticlibs' 'libtool' '!strip')
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/tqca-tls-R${pkgver}.tar.bz2")
md5sums=('21dd2d8680bdfccbbb68616682d5e898')
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqca-tls-trinity-${pkgver}.tar.xz")
md5sums=('6347f50dd8b44cc1f7a35329bd578ba1')
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
build() {
cd ${srcdir}/dependencies/${pkgname#*-}
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
export PKG_CONFIG_PATH=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting configure..."
./configure --qtdir=${QTDIR} --with-openssl-inc=/usr/include/openssl-1.0 \
--with-openssl-lib=/usr/lib/openssl-1.0
msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \
-DWITH_GCC_VISIBILITY=ON
msg "Building - $pkgname..."
make || return 1
msg "Building - $pkgname..."
make $NUMJOBS
}
package() {
msg "Packaging - $pkgname"
cd ${srcdir}/dependencies/${pkgname#*-}
make INSTALL_ROOT="${pkgdir}" install
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
make -j1 DESTDIR="${pkgdir}" install
}

@ -4,10 +4,10 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-tqtinterface
pkgver=14.0.5
pkgver=14.0.10
pkgrel=1
arch=('i686' 'x86_64')
url="http://trinity.pearsoncomputing.net"
url="https://scm.trinitydesktop.org/scm/git/tqtinterface"
license=('GPL2')
groups=('tde-core')
pkgdesc="TQt interface for the TDE desktop"
@ -19,10 +19,10 @@ replaces=('trinity-tqtinterface')
# makeopts=('libtool' '!emptydirs' '!strip')
options=('staticlibs' 'libtool' '!emptydirs' '!strip')
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/tqtinterface-R${pkgver}.tar.bz2"
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqtinterface-trinity-${pkgver}.tar.xz"
'tqtpc-location.patch')
md5sums=('b1d086bbcc0cd62dfbb5833ff0af71a2'
md5sums=('76b04fce54a40edf46a7421a5f3e176f'
'c15745c944d98cb7c4cb553f0ca421d4')
install='trinity-tqtinterface.install'
@ -30,6 +30,8 @@ install='trinity-tqtinterface.install'
_prefix=/usr
_tdedir=/opt/trinity
[ -n "$QTDIR" ] || QTDIR=${_tdedir}/tqt3
build() {
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
@ -37,7 +39,7 @@ build() {
cd build
msg "Starting cmake..."
cmake "../dependencies/tqtinterface" \
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
-DCMAKE_INSTALL_PREFIX=${_prefix} \
-DQT_PREFIX_DIR=${QTDIR} \
-DQT_INCLUDE_DIR=${QTDIR}/include \

Loading…
Cancel
Save