From 1838e1a41f12414ad989d5f1c712ef0c62df9bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Wed, 27 Oct 2021 22:43:21 +0200
Subject: 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
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>
---
 arch/tde-core/tde-tqtinterface/PKGBUILD            | 43 ++++++++++++----------
 .../tde-core/tde-tqtinterface/tqtpc-location.patch | 11 ------
 2 files changed, 23 insertions(+), 31 deletions(-)
 delete mode 100644 arch/tde-core/tde-tqtinterface/tqtpc-location.patch

(limited to 'arch/tde-core/tde-tqtinterface')

diff --git a/arch/tde-core/tde-tqtinterface/PKGBUILD b/arch/tde-core/tde-tqtinterface/PKGBUILD
index 43774f594..6d59ac7c7 100644
--- a/arch/tde-core/tde-tqtinterface/PKGBUILD
+++ b/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
-pkgver=14.0.10
+_mod=tqtinterface
+_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')
-provides=('tqtinterface')
-conflicts=('kdemod3-tqtinterface' 'trinity-tqtinterface')
-replaces=('trinity-tqtinterface')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+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"
-        'tqtpc-location.patch')
-
-md5sums=('76b04fce54a40edf46a7421a5f3e176f'
-         'c15745c944d98cb7c4cb553f0ca421d4')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('4f2001045468bce4483819d91fef113a')
 
-install='trinity-tqtinterface.install'
+install="trinity-${_mod}.install"
 
 _prefix=/usr
-_tdedir=/opt/trinity
-
-[ -n "$QTDIR" ] || QTDIR=${_tdedir}/tqt3
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -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/trinity >> $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
 }
diff --git a/arch/tde-core/tde-tqtinterface/tqtpc-location.patch b/arch/tde-core/tde-tqtinterface/tqtpc-location.patch
deleted file mode 100644
index f256e925c..000000000
--- a/arch/tde-core/tde-tqtinterface/tqtpc-location.patch
+++ /dev/null
@@ -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 ######################
-- 
cgit v1.2.1