summaryrefslogtreecommitdiffstats
path: root/arch/tde-extra
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-09-20 21:13:29 +0200
committerTDE Gitea <gitea@mirror.git.trinitydesktop.org>2021-09-29 06:38:40 +0000
commit6beb7211c30f0b4feeb7e487dc25899507ae72b3 (patch)
tree1f6e4676d128ab333e8c75bef0886164c8be8b5c /arch/tde-extra
parentb53b39c5b11eee058afe12dc28a2cc5a1ada4fb3 (diff)
downloadtde-packaging-6beb7211c30f0b4feeb7e487dc25899507ae72b3.tar.gz
tde-packaging-6beb7211c30f0b4feeb7e487dc25899507ae72b3.zip
ArchLinux: Update tdepim, tdemultimedia, tdenetwork, tdegraphics and tdegames to R14.0.10.
Backport patches to tdegraphics to resolve FTBFS. Switch tdemultimedia to CMake. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'arch/tde-extra')
-rw-r--r--arch/tde-extra/tde-tdegames/PKGBUILD15
-rw-r--r--arch/tde-extra/tde-tdemultimedia/PKGBUILD67
-rw-r--r--arch/tde-extra/tde-tdemultimedia/stat.patch15
-rw-r--r--arch/tde-extra/tde-tdenetwork/PKGBUILD14
-rw-r--r--arch/tde-extra/tde-tdepim/PKGBUILD12
5 files changed, 53 insertions, 70 deletions
diff --git a/arch/tde-extra/tde-tdegames/PKGBUILD b/arch/tde-extra/tde-tdegames/PKGBUILD
index d3d4d5b00..cce98cd89 100644
--- a/arch/tde-extra/tde-tdegames/PKGBUILD
+++ b/arch/tde-extra/tde-tdegames/PKGBUILD
@@ -1,10 +1,10 @@
# Contributor: e1z0 <justinas at eofnet dot lt>
pkgname=tde-tdegames
-pkgver=14.0.5
+pkgver=14.0.10
pkgrel=1
arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/tdegames'
+url='https://scm.trinitydesktop.org/scm/git/tdegames'
license=('GPL')
groups=('tde-extra')
pkgdesc="Trinity Desktop Games"
@@ -14,21 +14,24 @@ provides=('tdegames')
conflicts=('trinity-tdegames' 'trinity-kdegames')
replaces=('trinity-tdegames')
options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdegames-R${pkgver}.tar.bz2")
-md5sums=('8832d778231615da0dc6b4d1e083f9ba')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdegames-trinity-${pkgver}.tar.xz")
+md5sums=('870352e848a991f1ff0045ef5590bc47')
# 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_SPEEX=ON \
-DWITH_ARTS=ON \
-DBUILD_ALL=ON
diff --git a/arch/tde-extra/tde-tdemultimedia/PKGBUILD b/arch/tde-extra/tde-tdemultimedia/PKGBUILD
index 01378237c..2efbe8767 100644
--- a/arch/tde-extra/tde-tdemultimedia/PKGBUILD
+++ b/arch/tde-extra/tde-tdemultimedia/PKGBUILD
@@ -2,59 +2,48 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-tdemultimedia
-pkgver=14.0.5
+pkgver=14.0.10
pkgrel=1
pkgdesc="Trinity Desktop MultiMedia Components"
arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/tdemultimedia'
+url='https://scm.trinitydesktop.org/scm/git/tdemultimedia'
license=('GPL')
groups=('tde-extra')
-depends=('tde-tdebase')
+depends=('tde-tdebase' 'cdparanoia' 'lame' 'libtheora' 'taglib' 'xine-lib')
makedepends=('pkgconfig' 'cmake')
provides=('tdemultimedia')
conflicts=('trinity-tdemultimedia' 'trinity-kdemultimedia')
replaces=('trinity-tdemultimedia')
options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdemultimedia-R${pkgver}.tar.bz2"
- "stat.patch")
-md5sums=('35df868eecb8a7d794c156fe6e6e038c'
- '19a31ab61d45477149dd7ab6b85a17cd')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdemultimedia-trinity-${pkgver}.tar.xz")
+md5sums=('f1f40920c9eed566eaa98a81b838b7b8')
# install=''
-build() {
- ## 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 "Patching to not use linux/stat.h"
- patch -p1 -i ${srcdir}/stat.patch
-
- msg "Running make -f admin/Makefile.common ...."
- make -f admin/Makefile.common
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
- ## 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 \
- --sysconfdir=${TDEDIR}/etc \
- --localstatedir=/var \
- --enable-closure
-
- msg "Building - ${pkgname#*-}..."
- make $NUMJOBS
+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#*-}-trinity-${pkgver} \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_INSTALL_PREFIX=$TDEDIR \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_ARTS_AKODE=OFF \
+ -DBUILD_ALL=ON \
+ -DBUILD_JUK=OFF
+
+ msg "Building - ${pkgname#*-}..."
+ make $NUMJOBS
}
package() {
- msg "Packaging - $pkgname-$pkgver"
- cd ${srcdir}/${pkgname#*-} # use for libtool
-
- make -j1 DESTDIR="${pkgdir}" install
+ msg "Packaging - $pkgname-$pkgver"
+ cd ${srcdir}/build
+ make -j1 DESTDIR="${pkgdir}" install
}
diff --git a/arch/tde-extra/tde-tdemultimedia/stat.patch b/arch/tde-extra/tde-tdemultimedia/stat.patch
deleted file mode 100644
index 167ee6cfc..000000000
--- a/arch/tde-extra/tde-tdemultimedia/stat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur tdemultimedia-orig/kscd/kcompactdisc.cpp tdemultimedia/kscd/kcompactdisc.cpp
---- tdemultimedia-orig/kscd/kcompactdisc.cpp 2018-08-25 05:29:23.000000000 +0000
-+++ tdemultimedia/kscd/kcompactdisc.cpp 2019-01-31 10:16:44.000000000 +0000
-@@ -42,11 +42,6 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
-
--/* this is for glibc 2.x which the ust structure in ustat.h not stat.h */
--#ifdef __GLIBC__
--#include <sys/ustat.h>
--#endif
--
- #ifdef __FreeBSD__
- #include <sys/param.h>
- #include <sys/ucred.h>
diff --git a/arch/tde-extra/tde-tdenetwork/PKGBUILD b/arch/tde-extra/tde-tdenetwork/PKGBUILD
index b67f24858..e45011bc2 100644
--- a/arch/tde-extra/tde-tdenetwork/PKGBUILD
+++ b/arch/tde-extra/tde-tdenetwork/PKGBUILD
@@ -2,10 +2,10 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-tdenetwork
-pkgver=14.0.5
+pkgver=14.0.10
pkgrel=1
arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/tdenetwork'
+url='https://scm.trinitydesktop.org/scm/git/tdenetwork'
license=('GPL')
groups=('tde-extra')
pkgdesc="Trinity Desktop Network Components"
@@ -15,18 +15,22 @@ provides=('tdenetwork')
conflicts=('trinity-tdenetwork' 'trinity-kdenetwork')
replaces=('trinity-tdenetwork')
options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdenetwork-R${pkgver}.tar.bz2")
-md5sums=('a8bf7062f8955179955aa6a52e58112c')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdenetwork-trinity-${pkgver}.tar.xz")
+md5sums=('c3d26523623fbcc65993a044bd83d0f6')
# 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_SPEEX=ON \
diff --git a/arch/tde-extra/tde-tdepim/PKGBUILD b/arch/tde-extra/tde-tdepim/PKGBUILD
index d2d17a9b0..0d6eb36c5 100644
--- a/arch/tde-extra/tde-tdepim/PKGBUILD
+++ b/arch/tde-extra/tde-tdepim/PKGBUILD
@@ -2,11 +2,11 @@
# Contributor: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-tdepim
-pkgver=14.0.5
+pkgver=14.0.10
pkgrel=1
pkgdesc="Trinity Desktop PIM Components"
arch=('i686' 'x86_64')
-url='http://scm.trinitydesktop.org/scm/git/tdepim'
+url='https://scm.trinitydesktop.org/scm/git/tdepim'
license=('GPL')
groups=('tde-extra')
depends=('tde-tdenetwork' 'boost' 'boost-libs' 'gnokii' 'libxss' 'xscreensaver' 'tde-libcaldav' 'tde-libcarddav')
@@ -14,8 +14,10 @@ makedepends=('pkgconfig' 'cmake' )
provides=('tdepim')
replaces=('trinity-tdepim')
options=('staticlibs' 'libtool' '!strip')
-source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdepim-R${pkgver}.tar.bz2")
-md5sums=('0dfd3561ff0ffc440fc9ead221021333')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdepim-trinity-${pkgver}.tar.xz")
+md5sums=('894562acd7c895da37d8af30b4f1fc61')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() {
cd $srcdir
@@ -25,7 +27,7 @@ build() {
cd build
msg "Starting cmake..."
- cmake ${srcdir}/${pkgname#*-} \
+ cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
-DCMAKE_C_FLAGS="-fpermissive" \
-DCMAKE_CXX_FLAGS="-fpermissive" \
-DCMAKE_VERBOSE_MAKEFILE=ON \