Switch amarok, kmplayer, ksplash-engine-moodin, tde-systemsettings, tdesudo and tdmtheme to CMake. Backport patches to tdesudo to resolve FTBFS. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>pull/107/head
parent
9ef3d4a4b9
commit
08dc2d3a90
@ -1,40 +1,47 @@
|
|||||||
# Contributor: e1z0 <justinas at eofnet dot lt>
|
# Contributor: e1z0 <justinas at eofnet dot lt>
|
||||||
|
|
||||||
pkgname=tde-amarok
|
pkgname=tde-amarok
|
||||||
pkgver=14.0.5
|
pkgver=14.0.10
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="TDE Amarok"
|
pkgdesc="TDE Amarok"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url='http://scm.trinitydesktop.org/scm/git/applications/amarok'
|
url='https://scm.trinitydesktop.org/scm/git/applications/amarok'
|
||||||
license=('GPL')
|
license=('GPL')
|
||||||
groups=('tde-extra')
|
groups=('tde-extra')
|
||||||
depends=('tde-tdebase' 'taglib')
|
depends=('tde-tdebase' 'taglib' 'xine-lib')
|
||||||
makedepends=('pkgconfig' 'cmake')
|
makedepends=('pkgconfig' 'cmake')
|
||||||
#provides=('tde-amarok')
|
#provides=('tde-amarok')
|
||||||
#conflicts=('tde-amarok')
|
#conflicts=('tde-amarok')
|
||||||
#replaces=('tde-amarok')
|
#replaces=('tde-amarok')
|
||||||
options=('staticlibs' 'libtool' '!strip')
|
options=('staticlibs' 'libtool' '!strip')
|
||||||
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/amarok-R${pkgver}.tar.bz2")
|
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/amarok-trinity-${pkgver}.tar.xz")
|
||||||
md5sums=('0351b0d4ee54ae266e2a3ec47cd3accf')
|
md5sums=('fab4ed783d4027711e4aaca098bb04b1')
|
||||||
# install=''
|
# install=''
|
||||||
|
|
||||||
|
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
## Generate config files and update with autoreconf
|
cd $srcdir
|
||||||
cd ${srcdir}/applications/${pkgname#*-}
|
msg "Creating out-of-source build directory: ${srcdir}/build"
|
||||||
|
mkdir -p build
|
||||||
|
cd build
|
||||||
|
|
||||||
msg "Running make -f admin/Makefile.common ...."
|
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
|
||||||
make -f admin/Makefile.common
|
|
||||||
|
|
||||||
## configure
|
msg "Starting cmake..."
|
||||||
msg "Configuring - ${pkgname}..."
|
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
|
||||||
|
-DCMAKE_VERBOSE_MAKEFILE=ON \
|
||||||
|
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
|
||||||
|
-DBUILD_ALL=ON \
|
||||||
|
-DWITH_EMBEDDED_SQLITE=ON \
|
||||||
|
-DWITH_OPENGL=ON
|
||||||
|
|
||||||
./configure --prefix=${TDEDIR}
|
msg "Building - ${pkgname#*-}..."
|
||||||
make $NUMJOBS
|
make $NUMJOBS
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
msg "Packaging - $pkgname-$pkgver"
|
msg "Packaging - $pkgname-$pkgver"
|
||||||
cd ${srcdir}/applications/${pkgname#*-}
|
cd ${srcdir}/build
|
||||||
|
|
||||||
make -j1 DESTDIR="${pkgdir}" install
|
make -j1 DESTDIR="${pkgdir}" install
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,35 +0,0 @@
|
|||||||
diff -Naur kmplayer-orig/src/Makefile.am kmplayer/src/Makefile.am
|
|
||||||
--- kmplayer-orig/src/Makefile.am 2018-08-25 10:16:53.000000000 +0000
|
|
||||||
+++ kmplayer/src/Makefile.am 2019-01-31 21:26:36.000000000 +0000
|
|
||||||
@@ -27,6 +27,7 @@
|
|
||||||
kmplayer_la_SOURCES= main.cpp kmplayerapp.cpp kmplayertvsource.cpp kmplayerbroadcast.cpp kmplayervdr.cpp
|
|
||||||
kmplayer_la_LIBADD= libkmplayercommon.la $(LIB_XTEST)
|
|
||||||
kmplayer_la_LDFLAGS= -module $(KDE_PLUGIN) $(LIB_QT)
|
|
||||||
+kmplayer_la_COMPILE_FIRST= kmplayer_backend_stub.h
|
|
||||||
|
|
||||||
EXTRA_PROGRAMS = kxineplayer kxvplayer kgstplayer
|
|
||||||
if include_kxineplayer
|
|
||||||
@@ -48,14 +49,17 @@
|
|
||||||
kxineplayer_CFLAGS= $(CFLAGS_XINE)
|
|
||||||
kxineplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
|
|
||||||
kxineplayer_SOURCES= xineplayer.cpp
|
|
||||||
+kxineplayer_COMPILE_FIRST= kmplayer_callback_stub.h
|
|
||||||
|
|
||||||
kxvplayer_LDADD= libkmplayerbackend.la -lDCOP -lXv
|
|
||||||
kxvplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
|
|
||||||
kxvplayer_SOURCES= xvplayer.cpp
|
|
||||||
+kxvplayer_COMPILE_FIRST= kmplayer_callback_stub.h
|
|
||||||
|
|
||||||
kgstplayer_LDADD= libkmplayerbackend.la $(LIB_GST) $(LIB_GST_PLUGINS) $(LIB_GST_OVERLAY) -lDCOP
|
|
||||||
kgstplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
|
|
||||||
kgstplayer_SOURCES= gstplayer.cpp
|
|
||||||
+kgstplayer_COMPILE_FIRST= kmplayer_callback_stub.h
|
|
||||||
|
|
||||||
knpplayer_LDADD= $(LIBNSPR_LIBS)
|
|
||||||
knpplayer_LDFLAGS= -lX11 -lgmodule-2.0
|
|
||||||
@@ -79,3 +83,5 @@
|
|
||||||
|
|
||||||
messages: rc.cpp
|
|
||||||
$(XGETTEXT) *.cpp -o $(podir)/kmplayer.pot
|
|
||||||
+
|
|
||||||
+.NOTPARALLEL:
|
|
||||||
@ -1,56 +1,46 @@
|
|||||||
# Contributor: e1z0 <justinas at eofnet dot lt>
|
# Contributor: e1z0 <justinas at eofnet dot lt>
|
||||||
|
|
||||||
pkgname=tde-ksplash-engine-moodin
|
pkgname=tde-ksplash-engine-moodin
|
||||||
pkgver=14.0.5
|
pkgver=14.0.10
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="TDE KSplash Engine Moodin"
|
pkgdesc="TDE KSplash Engine Moodin"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url='http://scm.trinitydesktop.org/scm/git/applications/ksplash-engine-moodin'
|
url='https://scm.trinitydesktop.org/scm/git/applications/ksplash-engine-moodin'
|
||||||
license=('GPL')
|
license=('GPL')
|
||||||
groups=('tde-extra')
|
groups=('tde-extra')
|
||||||
depends=('tde-tdebase')
|
depends=('tde-tdebase')
|
||||||
makedepends=('pkgconfig' 'automake')
|
makedepends=('pkgconfig' 'cmake')
|
||||||
#provides=('ksplash-engine-moodin')
|
#provides=('ksplash-engine-moodin')
|
||||||
#conflicts=('ksplash-engine-moodin')
|
#conflicts=('ksplash-engine-moodin')
|
||||||
#replaces=('ksplash-engine-moodin')
|
#replaces=('ksplash-engine-moodin')
|
||||||
options=('staticlibs' 'libtool' '!strip')
|
options=('staticlibs' 'libtool' '!strip')
|
||||||
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/ksplash-engine-moodin-R${pkgver}.tar.bz2")
|
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/ksplash-engine-moodin-trinity-${pkgver}.tar.xz")
|
||||||
md5sums=('fb580976442327d34fbfcd2fcab63e9e')
|
md5sums=('3a10d2089ed4e165ff74994e9efbf262')
|
||||||
# install=''
|
# install=''
|
||||||
|
|
||||||
build() {
|
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||||
# old ruby1.8 path
|
|
||||||
export PATH=/opt/ruby1.8/bin:$PATH
|
|
||||||
## Generate config files and update with autoreconf
|
|
||||||
cd ${srcdir}/applications/${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
|
build() {
|
||||||
msg "Configuring - ${pkgname}..."
|
cd $srcdir
|
||||||
CFLAGS="${CFLAGS} -fpermissive" \
|
msg "Creating out-of-source build directory: ${srcdir}/build"
|
||||||
CXXFLAGS="${CXXFLAGS} -fpermissive" \
|
mkdir -p build
|
||||||
./configure \
|
cd build
|
||||||
--prefix=${TDEDIR} \
|
|
||||||
--with-qt-dir=${QTDIR} \
|
export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
|
||||||
--with-qt-includes=${QTDIR}/include \
|
|
||||||
--with-qt-libraries=${QTDIR}/lib \
|
msg "Starting cmake..."
|
||||||
--sysconfdir=${TDEDIR}/etc \
|
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
|
||||||
--localstatedir=/var \
|
-DCMAKE_VERBOSE_MAKEFILE=ON \
|
||||||
--enable-closure
|
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
|
||||||
|
-DBUILD_ALL=ON \
|
||||||
msg "Building - ${pkgname#*-}..."
|
-DWITH_ALL_OPTIONS=ON
|
||||||
make $NUMJOBS
|
|
||||||
|
msg "Building - ${pkgname#*-}..."
|
||||||
|
make $NUMJOBS
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
msg "Packaging - $pkgname-$pkgver"
|
msg "Packaging - $pkgname-$pkgver"
|
||||||
cd ${srcdir}/applications/${pkgname#*-} # use for libtool
|
cd ${srcdir}/build
|
||||||
|
make -j1 DESTDIR="${pkgdir}" install
|
||||||
make -j1 DESTDIR="${pkgdir}" install
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,56 +1,49 @@
|
|||||||
# Contributor: e1z0 <justinas at eofnet dot lt>
|
# Contributor: e1z0 <justinas at eofnet dot lt>
|
||||||
|
|
||||||
pkgname=tde-tdesudo
|
pkgname=tde-tdesudo
|
||||||
pkgver=14.0.5
|
pkgver=14.0.10
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="TDE Sudo"
|
pkgdesc="TDE Sudo"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url='http://scm.trinitydesktop.org/scm/git/applications/tdesudo'
|
url='https://scm.trinitydesktop.org/scm/git/applications/tdesudo'
|
||||||
license=('GPL')
|
license=('GPL')
|
||||||
groups=('tde-extra')
|
groups=('tde-extra')
|
||||||
depends=('tde-tdebase')
|
depends=('tde-tdebase')
|
||||||
makedepends=('pkgconfig' 'automake')
|
makedepends=('pkgconfig' 'cmake')
|
||||||
#provides=('tdesudo')
|
#provides=('tdesudo')
|
||||||
#conflicts=('tdesudo')
|
#conflicts=('tdesudo')
|
||||||
#replaces=('tdesudo')
|
#replaces=('tdesudo')
|
||||||
options=('staticlibs' 'libtool' '!strip')
|
options=('staticlibs' 'libtool' '!strip')
|
||||||
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/tdesudo-R${pkgver}.tar.bz2")
|
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdesudo-trinity-${pkgver}.tar.xz"
|
||||||
md5sums=('8f86b7b497a9575979b27fd2911b0106')
|
'bp000-1136b8150f.diff')
|
||||||
|
md5sums=('ff1b28acd12998c216e4256ca94f795b'
|
||||||
|
'6ba546544bfab644bbbba972f31a137b')
|
||||||
# install=''
|
# install=''
|
||||||
|
|
||||||
|
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
# old ruby1.8 path
|
cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
|
||||||
export PATH=/opt/ruby1.8/bin:$PATH
|
patch -p1 < $srcdir/bp000-1136b8150f.diff
|
||||||
## Generate config files and update with autoreconf
|
|
||||||
cd ${srcdir}/applications/${pkgname#*-}
|
msg "Creating out-of-source build directory: ${srcdir}/build"
|
||||||
|
mkdir -p $srcdir/build
|
||||||
msg "Copying system libtool files...."
|
cd $srcdir/build
|
||||||
cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
|
|
||||||
cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
|
#export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
|
||||||
|
|
||||||
msg "Running make -f admin/Makefile.common ...."
|
msg "Starting cmake..."
|
||||||
make -f admin/Makefile.common
|
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
|
||||||
|
-DCMAKE_VERBOSE_MAKEFILE=ON \
|
||||||
## configure
|
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
|
||||||
msg "Configuring - ${pkgname#*-}..."
|
-DBUILD_ALL=ON
|
||||||
CFLAGS="${CFLAGS} -fpermissive" \
|
|
||||||
CXXFLAGS="${CXXFLAGS} -fpermissive" \
|
msg "Building - ${pkgname#*-}..."
|
||||||
./configure \
|
make $NUMJOBS
|
||||||
--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
|
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
msg "Packaging - $pkgname-$pkgver"
|
msg "Packaging - $pkgname-$pkgver"
|
||||||
cd ${srcdir}/applications/${pkgname#*-} # use for libtool
|
cd ${srcdir}/build
|
||||||
|
make -j1 DESTDIR="${pkgdir}" install
|
||||||
make -j1 DESTDIR="${pkgdir}" install
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,31 @@
|
|||||||
|
From 1136b8150f58e909eaa094d991dcefa81b8f6a60 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
|
||||||
|
Date: Tue, 11 May 2021 19:45:01 +0200
|
||||||
|
Subject: Fix ftbfs on Fedora 34
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
error: ordered comparison of pointer with integer zero ('char*' and 'int')
|
||||||
|
|
||||||
|
Signed-off-by: François Andriot <francois.andriot@free.fr>
|
||||||
|
---
|
||||||
|
tdesudo/tdesudo.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tdesudo/tdesudo.cpp b/tdesudo/tdesudo.cpp
|
||||||
|
index c255d0f..83158ab 100644
|
||||||
|
--- a/tdesudo/tdesudo.cpp
|
||||||
|
+++ b/tdesudo/tdesudo.cpp
|
||||||
|
@@ -205,7 +205,7 @@ TdeSudo::TdeSudo(TQWidget *parent, const char *name,const TQString& icon, const
|
||||||
|
chmod(m_tmpname.ascii(),0644);
|
||||||
|
|
||||||
|
QCStringList output;
|
||||||
|
- while (fgets(buf, 1024, f) > 0)
|
||||||
|
+ while (fgets(buf, 1024, f) != NULL)
|
||||||
|
output += buf;
|
||||||
|
if (pclose(f) < 0) {
|
||||||
|
kdError() << k_lineinfo << "Could not run xauth.\n";
|
||||||
|
--
|
||||||
|
cgit v1.2.1
|
||||||
|
|
||||||
@ -1,56 +1,42 @@
|
|||||||
# Contributor: e1z0 <justinas at eofnet dot lt>
|
# Contributor: e1z0 <justinas at eofnet dot lt>
|
||||||
|
|
||||||
pkgname=tde-tdmtheme
|
pkgname=tde-tdmtheme
|
||||||
pkgver=14.0.5
|
pkgver=14.0.10
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="TDM Theme"
|
pkgdesc="TDM Theme"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url='http://scm.trinitydesktop.org/scm/git/applications/tdmtheme'
|
url='https://scm.trinitydesktop.org/scm/git/applications/tdmtheme'
|
||||||
license=('GPL')
|
license=('GPL')
|
||||||
groups=('tde-extra')
|
groups=('tde-extra')
|
||||||
depends=('tde-tdebase')
|
depends=('tde-tdebase')
|
||||||
makedepends=('pkgconfig' 'automake')
|
makedepends=('pkgconfig' 'cmake')
|
||||||
#provides=('tdmtheme')
|
#provides=('tdmtheme')
|
||||||
#conflicts=('tdmtheme')
|
#conflicts=('tdmtheme')
|
||||||
#replaces=('tdmtheme')
|
#replaces=('tdmtheme')
|
||||||
options=('staticlibs' 'libtool' '!strip')
|
options=('staticlibs' 'libtool' '!strip')
|
||||||
source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/tdmtheme-R${pkgver}.tar.bz2")
|
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdmtheme-trinity-${pkgver}.tar.xz")
|
||||||
md5sums=('dc202459e80fde7b469ef1cfb684803c')
|
md5sums=('b085fa2792024415fb2174633875adbe')
|
||||||
# install=''
|
# install=''
|
||||||
|
|
||||||
build() {
|
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
|
||||||
# old ruby1.8 path
|
|
||||||
export PATH=/opt/ruby1.8/bin:$PATH
|
|
||||||
## Generate config files and update with autoreconf
|
|
||||||
cd ${srcdir}/applications/${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
|
build() {
|
||||||
msg "Configuring - ${pkgname#*-}..."
|
msg "Creating out-of-source build directory: ${srcdir}/build"
|
||||||
CFLAGS="${CFLAGS} -fpermissive" \
|
mkdir -p $srcdir/build
|
||||||
CXXFLAGS="${CXXFLAGS} -fpermissive" \
|
cd $srcdir/build
|
||||||
./configure \
|
|
||||||
--prefix=${TDEDIR} \
|
msg "Starting cmake..."
|
||||||
--with-qt-dir=${QTDIR} \
|
cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
|
||||||
--with-qt-includes=${QTDIR}/include \
|
-DCMAKE_VERBOSE_MAKEFILE=ON \
|
||||||
--with-qt-libraries=${QTDIR}/lib \
|
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
|
||||||
--sysconfdir=${TDEDIR}/etc \
|
-DBUILD_ALL=ON
|
||||||
--localstatedir=/var \
|
|
||||||
--enable-closure
|
msg "Building - ${pkgname#*-}..."
|
||||||
|
make $NUMJOBS
|
||||||
msg "Building - ${pkgname#*-}..."
|
|
||||||
make $NUMJOBS
|
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
msg "Packaging - $pkgname-$pkgver"
|
msg "Packaging - $pkgname-$pkgver"
|
||||||
cd ${srcdir}/applications/${pkgname#*-} # use for libtool
|
cd ${srcdir}/build
|
||||||
|
make -j1 DESTDIR="${pkgdir}" install
|
||||||
make -j1 DESTDIR="${pkgdir}" install
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in new issue