From 08dc2d3a905752c1f405392c4f2e33ba577a9b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 22 Sep 2021 17:25:57 +0200 Subject: ArchLinux: Update remaining application in tde-extra to R14.0.10. Switch amarok, kmplayer, ksplash-engine-moodin, tde-systemsettings, tdesudo and tdmtheme to CMake. Backport patches to tdesudo to resolve FTBFS. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- arch/tde-extra/tde-kmplayer/PKGBUILD | 66 +++++++++------------- .../tde-extra/tde-kmplayer/callback-stub-fix.patch | 35 ------------ 2 files changed, 27 insertions(+), 74 deletions(-) delete mode 100644 arch/tde-extra/tde-kmplayer/callback-stub-fix.patch (limited to 'arch/tde-extra/tde-kmplayer') diff --git a/arch/tde-extra/tde-kmplayer/PKGBUILD b/arch/tde-extra/tde-kmplayer/PKGBUILD index a5b3bdcc5..b36d9203f 100644 --- a/arch/tde-extra/tde-kmplayer/PKGBUILD +++ b/arch/tde-extra/tde-kmplayer/PKGBUILD @@ -2,59 +2,47 @@ # Contributor: David C. Rankin pkgname=tde-kmplayer -pkgver=14.0.5 +pkgver=14.0.10 pkgrel=1 pkgdesc="TDE KMPlayer" arch=('i686' 'x86_64') -url='http://scm.trinitydesktop.org/scm/git/applications/kmplayer' +url='https://scm.trinitydesktop.org/scm/git/applications/kmplayer' license=('GPL') groups=('tde-extra') depends=('tde-tdebase' 'dbus-glib') -makedepends=('pkgconfig' 'cmake' 'mplayer') +makedepends=('pkgconfig' 'cmake' 'mplayer' 'xine-lib') #provides=('kmplayer') #conflicts=('kmplayer') #replaces=('kmplayer') options=('staticlibs' 'libtool' '!strip') -source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/applications/kmplayer-R${pkgver}.tar.bz2" - "callback-stub-fix.patch") -md5sums=('968e2116b333ea646ce00fd2ab2038a8' - '31ed0b0814a3855c65541c058ac91a68') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/kmplayer-trinity-${pkgver}.tar.xz") +md5sums=('e817acc32c3f87cc475be8d8c7a1b4a7') # install='' -build() { - ## Generate config files and update with autoreconf - cd ${srcdir}/applications/${pkgname#*-} - - msg "Patching for callback stub header..." - patch -p1 -i ${srcdir}/callback-stub-fix.patch - - 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 +[ -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} \ + -DBUILD_ALL=ON \ + -DBUILD_KOFFICE_PLUGIN=OFF \ + -DBUILD_KGSTPLAYER=OFF + + msg "Building - ${pkgname#*-}..." + make $NUMJOBS } package() { -msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/applications/${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-kmplayer/callback-stub-fix.patch b/arch/tde-extra/tde-kmplayer/callback-stub-fix.patch deleted file mode 100644 index a2069defc..000000000 --- a/arch/tde-extra/tde-kmplayer/callback-stub-fix.patch +++ /dev/null @@ -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: -- cgit v1.2.1