From 6ae1e640c3789b42dc2f7b4a3efac7fd5421847d Mon Sep 17 00:00:00 2001 From: Ray-V Date: Wed, 16 Oct 2019 14:18:16 +0100 Subject: [PATCH] Updates for development version build kbookreader - added cmake and locale selection tdek3b - removed R14.0.4 patch tdmtheme - added cmake yakuake - added cmake and locale selection tdenetwork - added TQT_INCLUDE_PATH to CMAKE_CXX_FLAGS to fix ntqglobal.h not found error tdelibkipi - added cmake and locale selection --- Apps/kbookreader/kbookreader.SlackBuild | 74 ++++++++++++++++++------- Apps/tdek3b/tdek3b.SlackBuild | 64 --------------------- Apps/tdmtheme/tdmtheme.SlackBuild | 36 ++++++++---- Apps/yakuake/yakuake.SlackBuild | 51 +++++++++++++---- Core/tdenetwork/tdenetwork.SlackBuild | 5 +- Libs/tdelibkipi/tdelibkipi.SlackBuild | 43 ++++++++++---- 6 files changed, 153 insertions(+), 120 deletions(-) diff --git a/Apps/kbookreader/kbookreader.SlackBuild b/Apps/kbookreader/kbookreader.SlackBuild index bb9de16..80de33f 100755 --- a/Apps/kbookreader/kbookreader.SlackBuild +++ b/Apps/kbookreader/kbookreader.SlackBuild @@ -35,21 +35,52 @@ untar_fn listdocs_fn +# set support for additional language(s) as per I18N variable +# but only for languages available with this package +[[ $TDEVERSION == cgit ]] && { +langs="";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang.po";done +## output list of available locales ... +(cd po +ls -1 *.po | while read line +do +## ... and compare to selected locales & remove those not required +[[ $langs != *$line* ]] && rm -rf $line +: +done) +[[ $langs != "" ]] && TRANS=ON && langs=$(echo $langs|sed "s|.po||g") +} + chown_fn -ltoolupdate_fn +[[ $TDEVERSION == *14.0.6 ]] && ltoolupdate_fn cd_builddir_fn -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +[[ $TDEVERSION == *14.0.6 ]] && { + +LDFLAGS=$SLKLDFLAGS \ +CXXFLAGS=$SLKCFLAGS \ +CFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ - --libdir=${INSTALL_TDE}/lib${LIBDIRSUFFIX} \ - --build=$ARCH-slackware-linux + --prefix=$INSTALL_TDE \ + --libdir=$INSTALL_TDE/lib$LIBDIRSUFFIX + +} || { + + cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + .. + +} make_fn @@ -67,18 +98,19 @@ echo " # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| -kbookreader: kbookreader (book reader) -kbookreader: -kbookreader: kbookreader -kbookreader: -kbookreader: -kbookreader: -kbookreader: -kbookreader: -kbookreader: -kbookreader: -kbookreader: Home: https://www.trinitydesktop.org/ + |-----handy-ruler------------------------------------------------------| +$PRGNAM: $PRGNAM (book reader) +$PRGNAM: +$PRGNAM: $PRGNAM +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: +$PRGNAM: en ${langs:-} +$PRGNAM: +$PRGNAM: +$PRGNAM: Home: https://www.trinitydesktop.org/ " > $PKG/install/slack-desc diff --git a/Apps/tdek3b/tdek3b.SlackBuild b/Apps/tdek3b/tdek3b.SlackBuild index aa61f46..6fa52fc 100755 --- a/Apps/tdek3b/tdek3b.SlackBuild +++ b/Apps/tdek3b/tdek3b.SlackBuild @@ -34,70 +34,6 @@ getsource_fn untar_fn -[[ $TDEVERSION == R14.0.4 ]] && { -## patch for clang -echo $' ---- libk3b/projects/k3babstractwriter.h -+++ libk3b/projects/k3babstractwriter.h -@@ -25 +25 @@ --class K3bDevice::Device; -+namespace K3bDevice { class Device; } ---- libk3b/projects/datacd/k3bisoimager.h -+++ libk3b/projects/datacd/k3bisoimager.h -@@ -32 +32 @@ --class K3bDevice::Device; -+namespace K3bDevice { class Device; } ---- libk3b/projects/k3bcdrecordwriter.h -+++ libk3b/projects/k3bcdrecordwriter.h -@@ -28 +28 @@ --class K3bDevice::Device; -+namespace K3bDevice { class Device; } ---- libk3b/projects/k3bcdrdaowriter.h -+++ libk3b/projects/k3bcdrdaowriter.h -@@ -27 +27 @@ --class K3bDevice::Device; -+namespace K3bDevice { class Device; } ---- libk3b/projects/audiocd/k3baudiojob.h -+++ libk3b/projects/audiocd/k3baudiojob.h -@@ -32 +32 @@ --class K3bDevice::Device; -+namespace K3bDevice { class Device; } ---- libk3b/projects/mixedcd/k3bmixedjob.h -+++ libk3b/projects/mixedcd/k3bmixedjob.h -@@ -35 +35 @@ --class K3bDevice::Device; -+namespace K3bDevice { class Device; } ---- libk3b/projects/videocd/k3bvcdjob.h -+++ libk3b/projects/videocd/k3bvcdjob.h -@@ -28 +28 @@ --class K3bDevice::Device; -+namespace K3bDevice { class Device; } ---- libk3b/jobs/k3bblankingjob.h -+++ libk3b/jobs/k3bblankingjob.h -@@ -23 +23 @@ --class K3bDevice::Device; -+namespace K3bDevice { class Device; } ---- libk3b/projects/movixcd/k3bmovixjob.h -+++ libk3b/projects/movixcd/k3bmovixjob.h -@@ -23 +23 @@ --class K3bDevice::Device; -+namespace K3bDevice { class Device; } ---- libk3b/projects/movixdvd/k3bmovixdvdjob.h -+++ libk3b/projects/movixdvd/k3bmovixdvdjob.h -@@ -23 +23 @@ --class K3bDevice::Device; -+namespace K3bDevice { class Device; } ---- libk3b/projects/k3bdvdrecordwriter.h -+++ libk3b/projects/k3bdvdrecordwriter.h -@@ -22 +22 @@ --class K3bDevice::Device; -+namespace K3bDevice { class Device; } -' | while read line -do -patch -p0 -done -} - listdocs_fn chown_fn diff --git a/Apps/tdmtheme/tdmtheme.SlackBuild b/Apps/tdmtheme/tdmtheme.SlackBuild index fa40d44..b66ec71 100755 --- a/Apps/tdmtheme/tdmtheme.SlackBuild +++ b/Apps/tdmtheme/tdmtheme.SlackBuild @@ -35,24 +35,40 @@ untar_fn listdocs_fn -ltoolupdate_fn +[[ $TDEVERSION == *14.0.6 ]] && ltoolupdate_fn chown_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +[[ $TDEVERSION == *14.0.6 ]] && { + +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ - --enable-closure \ - --build=$ARCH-slackware-linux + --enable-closure + +} || { +## all locales and html docs built by default + cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DCMAKE_SKIP_RPATH=ON \ + .. + +} make_fn diff --git a/Apps/yakuake/yakuake.SlackBuild b/Apps/yakuake/yakuake.SlackBuild index 6c7625f..50cd22f 100755 --- a/Apps/yakuake/yakuake.SlackBuild +++ b/Apps/yakuake/yakuake.SlackBuild @@ -35,24 +35,51 @@ untar_fn listdocs_fn -ltoolupdate_fn +[[ $TDEVERSION == *14.0.6 ]] && ltoolupdate_fn chown_fn +# set support for additional language(s) as per I18N variable +# but only for languages available with this package +[[ $TDEVERSION == cgit ]] && LANG_SUFF=/$PRGNAM.po +langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang${LANG_SUFF:-}";done +[[ $TDEVERSION == cgit ]] && \ +sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt && \ +langs=$(echo $langs|sed "s|$LANG_SUFF||g") || \ +sed -i "s|SUBDIRS =.*$|SUBDIRS =$langs|" po/Makefile.am +[[ $langs != "" ]] && TRANS=ON + cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +[[ $TDEVERSION == *14.0.6 ]] && { + +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ - --enable-closure \ - --build=$ARCH-slackware-linux + --enable-closure + +} || { + + cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DCMAKE_SKIP_RPATH=ON \ + .. + +} make_fn @@ -77,9 +104,9 @@ $PRGNAM: Konsole technology. $PRGNAM: $PRGNAM: $PRGNAM: +$PRGNAM: With language support for: $PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: en $langs $PRGNAM: $PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild index e3e8dff..661fab3 100755 --- a/Core/tdenetwork/tdenetwork.SlackBuild +++ b/Core/tdenetwork/tdenetwork.SlackBuild @@ -47,7 +47,7 @@ cd_builddir_fn ## GADU & MEANWHILE require libgadu and meanwhile installed. cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ @@ -80,7 +80,6 @@ cd_builddir_fn -DBUILD_KOPETE="ON" \ -DBUILD_KOPETE_PROTOCOL_TESTBED="ON" \ -DBUILD_KOPETE_PROTOCOL_GROUPWISE="ON" \ - -DBUILD_KOPETE_PROTOCOL_MSN="ON" \ -DBUILD_KOPETE_PROTOCOL_IRC="ON" \ -DBUILD_KOPETE_PROTOCOL_OSCAR="ON" \ -DBUILD_KOPETE_PROTOCOL_YAHOO="ON" \ @@ -115,7 +114,7 @@ cd_builddir_fn ## rfbScreenInfoPtr d; ## ^~~~~~~~~~~~~~~~ ## It doesn't have any use here, so unset it -## TODO: What in $TQTDIR/include is causing this error +## and add $TQT_INCLUDE_PATH to CMAKE_CXX_FLAGS for subsequent ntqglobal.h not found error export CPLUS_INCLUDE_PATH="" make_fn diff --git a/Libs/tdelibkipi/tdelibkipi.SlackBuild b/Libs/tdelibkipi/tdelibkipi.SlackBuild index 3680055..047be47 100755 --- a/Libs/tdelibkipi/tdelibkipi.SlackBuild +++ b/Libs/tdelibkipi/tdelibkipi.SlackBuild @@ -36,29 +36,52 @@ untar_fn listdocs_fn -ltoolupdate_fn +[[ $TDEVERSION == *14.0.6 ]] && ltoolupdate_fn chown_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package -langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang";done +[[ $TDEVERSION == cgit ]] && LANG_SUFF=/$PRGNAM.po +langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang${LANG_SUFF:-}";done +[[ $TDEVERSION == cgit ]] && \ +sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt && \ +langs=$(echo $langs|sed "s|$LANG_SUFF||g") || \ sed -i "s|SUBDIRS =.*$|SUBDIRS =$langs|" po/Makefile.am +[[ $langs != "" ]] && TRANS=ON cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +[[ $TDEVERSION == *14.0.6 ]] && { + +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure +} || { + + cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DCMAKE_SKIP_RPATH=ON \ + .. + +} + make_fn installdocs_fn @@ -86,7 +109,7 @@ $PRGNAM: implementation and is maintained by the digiKam team. $PRGNAM: $PRGNAM: With language support for: $PRGNAM: -$PRGNAM: en $(echo $langs) +$PRGNAM: en $langs $PRGNAM: $PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc