TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

ArchLinux: Update tdeaccessibility, tdeaddons, tdeedu and tdetoys to R14.0.10.

Browse Source 
Backport patches to tdeedu to resolve FTBFS.
Switch tdeaccessibility and tdeedu to CMake.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/107/head
Slávek Banko 3 years ago committed by TDE Gitea
parent 7821de9ce7
commit a57aaa1cd8
6 changed files with 93 additions and 109 deletions
Show Stats Download Patch File Download Diff File

56
arch/tde-extra/tde-tdeaccessibility/PKGBUILD
Unescape View File

@ -1,60 +1,46 @@
# Maintainer: David C. Rankin <drankinatty at gmail dot com> # Maintainer: David C. Rankin <drankinatty at gmail dot com>
pkgname=tde-tdeaccessibility pkgname=tde-tdeaccessibility
pkgver=14.0.5 pkgver=14.0.10
pkgrel=1 pkgrel=1
pkgdesc="Accessibility utilities for the TDE Desktop" pkgdesc="Accessibility utilities for the TDE Desktop"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://scm.trinitydesktop.org/scm/git/${pkgname#*-}" url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
license=('GPL') license=('GPL')
groups=('tde-extra') groups=('tde-extra')
depends=('tde-tdebase') depends=('tde-tdebase')
makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake') makedepends=('pkgconfig' 'cmake' 'tde-tdemultimedia')
optdepends=() optdepends=()
provides=("${pkgname#*-}") provides=("${pkgname#*-}")
conflicts=("trinity-${pkgname#*-}") conflicts=("trinity-${pkgname#*-}")
replaces=("trinity-${pkgname#*-}") replaces=("trinity-${pkgname#*-}")
options=('staticlibs' 'libtool' '!emptydirs') options=('staticlibs' 'libtool' '!emptydirs')
# install='pkgname.install' # install='pkgname.install'
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdeaccessibility-R${pkgver}.tar.bz2") source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeaccessibility-trinity-${pkgver}.tar.xz")
md5sums=('e6b46859ddc8bb22e6b4e5cd21f989e1') md5sums=('0fb53257ee9b5dbd464a6ca8f30ef5b6')
build() { [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
cd ${srcdir}/${pkgname#*-}
## Generate config files and update with autoreconf
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 build() {
msg "Configuring - ${pkgname}..." cd $srcdir
./configure \ msg "Creating out-of-source build directory: ${srcdir}/build"
--prefix=${TDEDIR} \ mkdir -p build
--with-qt-dir=${QTDIR} \ cd build
--with-extra-libs=${TDEDIR}/lib/trinity \
--localstatedir=/var \
--enable-kttsd-epos=no \
--enable-kttsd-festivalint=no \
--enable-kttsd-flite=no \
--enable-kttsd-freetts=no \
--enable-kttsd-hadifix=no \
--enable-debug=full \
--enable-closure
msg "Building - ${pkgname}..." export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
make $NUMJOBS msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON
msg "Building - ${pkgname#*-}..."
make $NUMJOBS
} }
package() { package() {
msg "Packaging - $pkgname-$pkgver" msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
cd ${srcdir}/${pkgname#*-} # use for non-out-of-source make -j1 DESTDIR="${pkgdir}" install
make -j1 DESTDIR="$pkgdir" install
} }

15
arch/tde-extra/tde-tdeaddons/PKGBUILD
Unescape View File

@ -1,10 +1,10 @@
# Contributor: e1z0 <justinas at eofnet dot lt> # Contributor: e1z0 <justinas at eofnet dot lt>
pkgname=tde-tdeaddons pkgname=tde-tdeaddons
pkgver=14.0.5 pkgver=14.0.10
pkgrel=1 pkgrel=1
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://scm.trinitydesktop.org/scm/git/tdeaddons' url='https://scm.trinitydesktop.org/scm/git/tdeaddons'
license=('GPL') license=('GPL')
groups=('tde-extra') groups=('tde-extra')
pkgdesc="Trinity Desktop Addons" pkgdesc="Trinity Desktop Addons"
@ -14,21 +14,24 @@ provides=('tdeaddons')
conflicts=('trinity-tdeaddons' 'trinity-kdeaddons') conflicts=('trinity-tdeaddons' 'trinity-kdeaddons')
replaces=('trinity-tdeaddons') replaces=('trinity-tdeaddons')
options=('staticlibs' 'libtool' '!strip') options=('staticlibs' 'libtool' '!strip')
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdeaddons-R${pkgver}.tar.bz2") source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeaddons-trinity-${pkgver}.tar.xz")
md5sums=('b730d4d465d867755a19f77e6efc9e88') md5sums=('27557921bf86569042c72d597b87c877')
# install='' # install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() { build() {
cd $srcdir cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build" msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build mkdir -p build
cd build cd build
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
msg "Starting cmake..." msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-} \ cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \ -DCMAKE_INSTALL_PREFIX=$TDEDIR \
-DWITH_SPEEX=ON \
-DWITH_ARTS=ON \ -DWITH_ARTS=ON \
-DBUILD_ALL=ON -DBUILD_ALL=ON

74
arch/tde-extra/tde-tdeedu/PKGBUILD
Unescape View File

@ -1,75 +1,51 @@
# Maintainer: e1z0 <justinas at eofnet dot lt> # Maintainer: e1z0 <justinas at eofnet dot lt>
pkgname=tde-tdeedu pkgname=tde-tdeedu
pkgver=14.0.5 pkgver=14.0.10
pkgrel=1 pkgrel=1
pkgdesc="Educational utilities for the TDE Desktop" pkgdesc="Educational utilities for the TDE Desktop"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://scm.trinitydesktop.org/scm/git/${pkgname#*-}" url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}"
license=('GPL') license=('GPL')
groups=('tde-extra') groups=('tde-extra')
depends=('tde-tdebase') depends=('tde-tdebase')
makedepends=('pkgconfig' 'autoconf') makedepends=('pkgconfig' 'cmake' 'texlive-bin')
optdepends=() optdepends=()
provides=("${pkgname#*-}") provides=("${pkgname#*-}")
conflicts=("trinity-${pkgname#*-}") conflicts=("trinity-${pkgname#*-}")
replaces=("trinity-${pkgname#*-}") replaces=("trinity-${pkgname#*-}")
options=('staticlibs' 'libtool' '!emptydirs') options=('staticlibs' 'libtool' '!emptydirs')
# install='pkgname.install' # install='pkgname.install'
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdeedu-R${pkgver}.tar.bz2" source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeedu-trinity-${pkgver}.tar.xz"
"kmplot.patch") 'bp000-0cb84fb9.diff')
md5sums=('b6ceb82d93d19e3862dfb01c45457774' md5sums=('3859da24d70f0d787c0cc7f41540772d'
'3b00bf93b77d020d69d9d92ef80041d2') '5ae3959dc2dc62f1f7421620b198d175')
build() { [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
cd ${srcdir}/${pkgname#*-}
## Generate config files and update with autoreconf
msg "Patching for kmplot..."
patch -p1 -i ${srcdir}/kmplot.patch
msg "Copying system libtool files...." build() {
cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh patch -p1 < ${srcdir}/bp000-0cb84fb9.diff
msg "Running make -f admin/Makefile.common ...."
make -f admin/Makefile.common
## configure cd $srcdir
msg "Configuring - ${pkgname}..." msg "Creating out-of-source build directory: ${srcdir}/build"
./configure \ mkdir -p build
--prefix=${TDEDIR} \ cd build
--with-qt-dir=${QTDIR} \
--with-extra-libs=${TDEDIR}/lib/trinity \
--localstatedir=/var \
--enable-kttsd-epos=no \
--enable-kttsd-festivalint=no \
--enable-kttsd-flite=no \
--enable-kttsd-freetts=no \
--enable-kttsd-hadifix=no \
--enable-debug=full \
--enable-closure
msg "Building - ${pkgname}..." #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
make $NUMJOBS msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DBUILD_ALL=ON
msg "Building - ${pkgname#*-}..."
make $NUMJOBS
} }
package() { package() {
msg "Packaging - $pkgname-$pkgver" msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
cd ${srcdir}/${pkgname#*-} # use for non-out-of-source make -j1 DESTDIR="${pkgdir}" install
make -j1 DESTDIR="$pkgdir" install
# # remove icons that conflict with tdelibs
# msg "Removing kttsd.png icons that conflict with tdelibs..."
# rm ${pkgdir}/opt/trinity/share/icons/crystalsvg/16x16/apps/kttsd.png
# rm ${pkgdir}/opt/trinity/share/icons/crystalsvg/22x22/apps/kttsd.png
# rm ${pkgdir}/opt/trinity/share/icons/crystalsvg/32x32/apps/kttsd.png
# rm ${pkgdir}/opt/trinity/share/icons/crystalsvg/48x48/apps/kttsd.png
# rm ${pkgdir}/opt/trinity/share/icons/crystalsvg/64x64/apps/kttsd.png
# rm ${pkgdir}/opt/trinity/share/icons/crystalsvg/128x128/apps/kttsd.png
# rm ${pkgdir}/opt/trinity/share/icons/crystalsvg/scalable/apps/kttsd.svgz
} }

31
arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff
Unescape View File

@ -0,0 +1,31 @@
From 0cb84fb9036ce7bc7c757a3971fdb0c619d0c011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
Date: Tue, 11 May 2021 09:15:26 +0200
Subject: Fix FTBFS on Fedora 34
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
error: static assertion failed: comparison object must be invocable as const
Signed-off-by: François Andriot <francois.andriot@free.fr>
---
kiten/learn.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
index 94e77b9a..a1b685d4 100644
--- a/kiten/learn.cpp
+++ b/kiten/learn.cpp
@@ -762,7 +762,7 @@ void Learn::qupdate()
struct Learn::scoreCompare
{
- bool operator()(const TQListViewItem* v1, const TQListViewItem* v2)
+ bool operator()(const TQListViewItem* v1, const TQListViewItem* v2) const
{
return v1->text(4).toInt() < v2->text(4).toInt();
}
--
cgit v1.2.1

12
arch/tde-extra/tde-tdeedu/kmplot.patch
Unescape View File

@ -1,12 +0,0 @@
diff -Naur tdeedu-orig/kmplot/kmplot/Makefile.am tdeedu/kmplot/kmplot/Makefile.am
--- tdeedu-orig/kmplot/kmplot/Makefile.am 2018-08-25 10:03:05.000000000 +0000
+++ tdeedu/kmplot/kmplot/Makefile.am 2019-01-31 21:39:42.000000000 +0000
@@ -28,6 +28,8 @@
kmplot_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP
kmplot_LDADD = $(LIB_TDEPARTS)
+kmplot_COMPILE_FIRST = FktDlgData.h qminmax.h settings.h
+
# this is where the desktop file will go
appmimedir = $(kde_mimedir)/application
appmime_DATA = x-kmplot.desktop

14
arch/tde-extra/tde-tdetoys/PKGBUILD
Unescape View File

@ -1,10 +1,10 @@
# Contributor: e1z0 <justinas at eofnet dot lt> # Contributor: e1z0 <justinas at eofnet dot lt>
pkgname=tde-tdetoys pkgname=tde-tdetoys
pkgver=14.0.5 pkgver=14.0.10
pkgrel=1 pkgrel=1
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://scm.trinitydesktop.org/scm/git/tdetoys' url='https://scm.trinitydesktop.org/scm/git/tdetoys'
license=('GPL') license=('GPL')
groups=('tde-extra') groups=('tde-extra')
pkgdesc="Trinity Desktop Toys" pkgdesc="Trinity Desktop Toys"
@ -14,10 +14,12 @@ provides=('tdetoys')
conflicts=('trinity-tdetoys' 'trinity-kdetoys') conflicts=('trinity-tdetoys' 'trinity-kdetoys')
replaces=('trinity-tdetoys') replaces=('trinity-tdetoys')
options=('staticlibs' 'libtool' '!strip') options=('staticlibs' 'libtool' '!strip')
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdetoys-R${pkgver}.tar.bz2") source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdetoys-trinity-${pkgver}.tar.xz")
md5sums=('bc2324f104aa0c9db1caf2e8419b76fb') md5sums=('f91d22efed453b5053e2110782d85d93')
# install='' # install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
build() { build() {
cd $srcdir cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build" msg "Creating out-of-source build directory: ${srcdir}/build"
@ -25,11 +27,9 @@ build() {
cd build cd build
msg "Starting cmake..." msg "Starting cmake..."
cmake ${srcdir}/${pkgname#*-} \ cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=$TDEDIR \ -DCMAKE_INSTALL_PREFIX=$TDEDIR \
-DWITH_SPEEX=ON \
-DWITH_ARTS=ON \
-DBUILD_ALL=ON -DBUILD_ALL=ON
msg "Building - ${pkgname#*-}..." msg "Building - ${pkgname#*-}..."

Write Preview
Loading…
Cancel
Save