summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-09-21 12:47:39 +0200
committerTDE Gitea <gitea@mirror.git.trinitydesktop.org>2021-09-29 06:38:40 +0000
commit5f439b5fb15fe16760a165a0dbc5827f4f89b7f5 (patch)
tree80be2c331dc807227c5c190440aced544786c01a
parent6beb7211c30f0b4feeb7e487dc25899507ae72b3 (diff)
downloadtde-packaging-5f439b5fb15fe16760a165a0dbc5827f4f89b7f5.tar.gz
tde-packaging-5f439b5fb15fe16760a165a0dbc5827f4f89b7f5.zip
ArchLinux: Update tdeadmin, tdeartwork and tdeutils to R14.0.10.
Switch tdeadmin and tdeutils to CMake. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--arch/tde-base/tde-tdeadmin/PKGBUILD65
-rw-r--r--arch/tde-base/tde-tdeartwork/PKGBUILD18
-rw-r--r--arch/tde-base/tde-tdeutils/PKGBUILD35
3 files changed, 52 insertions, 66 deletions
diff --git a/arch/tde-base/tde-tdeadmin/PKGBUILD b/arch/tde-base/tde-tdeadmin/PKGBUILD
index 6794fdbf3..b1869ae7f 100644
--- a/arch/tde-base/tde-tdeadmin/PKGBUILD
+++ b/arch/tde-base/tde-tdeadmin/PKGBUILD
@@ -2,64 +2,47 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-tdeadmin
-pkgver=14.0.5
+pkgver=14.0.10
pkgrel=1
pkgdesc="The TDE system administration utilities"
arch=('i686' 'x86_64')
-url="http://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
license=('GPL')
groups=('tde-base')
depends=('tde-tdebase' 'tde-libkexiv2' 'tde-libkdcraw')
-makedepends=('pkgconfig' 'autoconf' 'imake')
+makedepends=('pkgconfig' 'cmake')
optdepends=()
provides=("${pkgname#*-}")
conflicts=("trinity-${pkgname#*-}")
replaces=("${pkgname#*-}")
options=('staticlibs' 'libtool' '!emptydirs')
# install='pkgname.install'
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdeadmin-R${pkgver}.tar.bz2")
-md5sums=('bd80a30280c39cd28f2f751ca19946b3')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeadmin-trinity-${pkgver}.tar.xz")
+md5sums=('401907e03f80ad2433614761af6978b1')
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
- export CFLAGS="${CFLAGS} -fpermissive"
- export CXXFLAGS="${CXXFLAGS} -fpermissive"
- export DO_NOT_COMPILE="knetworkconf"
-
- ## Generate config files and update with autoreconf
- cd ${srcdir}/${pkgname#*-}
-
- 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
-
- msg "Running make -f admin/Makefile.common ...."
- make -f admin/Makefile.common
-
- ## configure
- msg "Configuring - ${pkgname}..."
- CFLAGS="${CFLAGS} -fpermissive" \
- CXXFLAGS="${CXXFLAGS} -fpermissive" \
- ./configure \
- --prefix=${TDEDIR} \
- --with-qt-dir=${QTDIR} \
- --with-qt-includes=${QTDIR}/include \
- --with-qt-libraries=${QTDIR}/lib \
- --with-extra-includes=${TDEDIR}/include/tde \
- --with-extra-libs=${TDEDIR}/lib/trinity \
- --localstatedir=/var \
- --enable-debug=full \
- --enable-closure
-
- ## make $NUMJOBS
- msg "Building - ${pkgname}..."
- make $NUMJOBS
+ cd $srcdir
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p build
+ cd build
+
+ export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DBUILD_ALL=ON \
+ -DBUILD_KNETWORKCONF=OFF
+
+ msg "Building - ${pkgname#*-}..."
+ make $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
-
- cd ${srcdir}/${pkgname#*-} # use for non-out-of-source
-
- make -j1 DESTDIR="$pkgdir" install
+ cd ${srcdir}/build
+ make -j1 DESTDIR="${pkgdir}" install
}
diff --git a/arch/tde-base/tde-tdeartwork/PKGBUILD b/arch/tde-base/tde-tdeartwork/PKGBUILD
index 73045cd6e..d5a66134c 100644
--- a/arch/tde-base/tde-tdeartwork/PKGBUILD
+++ b/arch/tde-base/tde-tdeartwork/PKGBUILD
@@ -2,10 +2,10 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-tdeartwork
-pkgver=14.0.5
+pkgver=14.0.10
pkgrel=1
arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/tdeartwork'
+url='https://scm.trinitydesktop.org/scm/git/tdeartwork'
license=('GPL')
groups=('tde-base')
pkgdesc="Trinity Desktop Development Ingegration Components - TDE upstream GIT"
@@ -16,27 +16,29 @@ provides=('tdeartwork')
conflicts=('trinity-tdeartwork' 'trinity-kdeartwork')
replaces=('trinity-tdeartwork')
options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdeartwork-R${pkgver}.tar.bz2")
-md5sums=('292af8c2fa2ad695f1dd00cd1ecdc5f6')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeartwork-trinity-${pkgver}.tar.xz")
+md5sums=('71830a98f9d130a37ba1b3c6107fdd66')
# install=''
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
build() {
cd $srcdir
-
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
+ export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
msg "Starting cmake..."
- cmake ${srcdir}/${pkgname#*-} \
+ cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DWITH_ARTS=ON \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
-DBUILD_ALL=ON
msg "Building - ${pkgname#*-}..."
- make -j1
+ make $NUMJOBS
}
package() {
diff --git a/arch/tde-base/tde-tdeutils/PKGBUILD b/arch/tde-base/tde-tdeutils/PKGBUILD
index 3f25fd4af..41d37e733 100644
--- a/arch/tde-base/tde-tdeutils/PKGBUILD
+++ b/arch/tde-base/tde-tdeutils/PKGBUILD
@@ -1,45 +1,46 @@
# Maintainer: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-tdeutils
-pkgver=14.0.5
+pkgver=14.0.10
pkgrel=1
pkgdesc="The TDE something - with Trinity upstream"
arch=('i686' 'x86_64')
-url="http://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
+url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
license=('GPL')
groups=('tde-base')
depends=('tde-tdebase' 'xmms2')
-makedepends=('pkgconfig' 'autoconf' 'automake' 'libtool')
+makedepends=('pkgconfig' 'cmake')
optdepends=()
provides=("${pkgname#*-}")
conflicts=("trinity-${pkgname#*-}")
replaces=("trinity-${pkgname#*-}")
options=('staticlibs' 'libtool' '!emptydirs')
# install='pkgname.install'
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdeutils-R${pkgver}.tar.bz2")
-md5sums=('fa80d40539342071baf2e70514887791')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeutils-trinity-${pkgver}.tar.xz")
+md5sums=('95e778a8775b416739fd7e836e4ecdcd')
-build() {
- cd ${srcdir}
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
- # CMAKE - create out of source build directory
+build() {
+ cd ${srcdir}
msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
mkdir -p build
cd build
- ## cmake call
+ ## cmake call
msg "Starting cmake..."
- cmake ../tdeutils \
- -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -DWITH_DPMS=ON \
- -DBUILD_ALL=ON
+ cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DWITH_DPMS=ON \
+ -DBUILD_ALL=ON
- make VERBOSE=1
+ msg "Building - ${pkgname#*-}..."
+ make $NUMJOBS
}
package() {
msg "Packaging - $pkgname-$pkgver"
- cd ${srcdir}/build # cmake
-
- make -j1 DESTDIR="$pkgdir" install
+ cd ${srcdir}/build
+ make -j1 DESTDIR="${pkgdir}" install
}