From 75a4ed744df3e1be20a07befbcd3a447883de781 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Tue, 10 Aug 2021 00:05:29 +0100 Subject: [PATCH] Development build updates - Added tqca replacement for tqca-tls [upstream removed qca from tdenetwork] Added gcc visibility option for tdelibs Updated some builds to cmake common rules for translations Added cmake build to twin-style-crystal.SlackBuild kvkbd now builds to current HEAD Updated tde-i18n.SlackBuild for template and translations modules Replaced cloning from cgit with gitea - tde-i18n remains from cgit Added es_AR to localization options --- Apps/abakus/abakus.SlackBuild | 11 +-- Apps/amarok/amarok.SlackBuild | 23 +++-- Apps/dolphin/dolphin.SlackBuild | 2 +- Apps/filelight/filelight.SlackBuild | 14 +-- Apps/k3b/k3b.SlackBuild | 20 +++++ Apps/kaffeine/kaffeine.SlackBuild | 8 +- Apps/kbookreader/kbookreader.SlackBuild | 2 +- Apps/kdbg/kdbg.SlackBuild | 17 +++- .../kdbusnotification.SlackBuild | 9 +- Apps/kkbswitch/kkbswitch.SlackBuild | 2 +- Apps/knemo/knemo.SlackBuild | 3 +- Apps/knetstats/knetstats.SlackBuild | 2 +- Apps/knights/knights.SlackBuild | 4 +- Apps/knmap/knmap.SlackBuild | 2 +- Apps/kscope/kscope.SlackBuild | 2 +- Apps/ksensors/ksensors.SlackBuild | 2 +- Apps/kshutdown/kshutdown.SlackBuild | 2 +- Apps/kvkbd/kvkbd.SlackBuild | 29 ++----- Apps/kvpnc/kvpnc.SlackBuild | 3 + Apps/potracegui/potracegui.SlackBuild | 4 +- .../tde-style-lipstik.SlackBuild | 2 +- Apps/tdesudo/tdesudo.SlackBuild | 2 +- Apps/tdmtheme/tdmtheme.SlackBuild | 2 +- .../twin-style-crystal.SlackBuild | 29 ++++++- Apps/yakuake/yakuake.SlackBuild | 2 +- BUILD-TDE.sh | 57 +++++++++++-- Core/tde-i18n/tde-i18n.SlackBuild | 13 ++- .../tdeaccessibility.SlackBuild | 2 +- Core/tdeadmin/tdeadmin.SlackBuild | 2 +- Core/tdeartwork/tdeartwork.SlackBuild | 2 + Core/tdebase/tdebase.SlackBuild | 2 +- Core/tdeedu/tdeedu.SlackBuild | 2 +- Core/tdegames/tdegames.SlackBuild | 2 +- Core/tdelibs/tdelibs.SlackBuild | 2 +- Core/tdenetwork/tdenetwork.SlackBuild | 1 + Core/tdewebdev/tdewebdev.SlackBuild | 2 +- Deps/akode/akode.SlackBuild | 2 +- Deps/arts/arts.SlackBuild | 2 +- Deps/avahi-tqt/avahi-tqt.SlackBuild | 2 +- Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild | 2 +- Deps/libart-lgpl/libart-lgpl.SlackBuild | 2 +- Deps/libcaldav/libcaldav.SlackBuild | 3 +- Deps/libcarddav/libcarddav.SlackBuild | 2 +- Deps/tqca-tls/tqca-tls.SlackBuild | 2 +- Deps/tqca/tqca.SlackBuild | 85 +++++++++++++++++++ Libs/libkexiv2/libkexiv2.SlackBuild | 2 +- Libs/libkipi/libkipi.SlackBuild | 2 +- get-source.sh | 36 ++++---- 48 files changed, 304 insertions(+), 123 deletions(-) create mode 100644 Deps/tqca/tqca.SlackBuild diff --git a/Apps/abakus/abakus.SlackBuild b/Apps/abakus/abakus.SlackBuild index 5b302ba..23ead3c 100755 --- a/Apps/abakus/abakus.SlackBuild +++ b/Apps/abakus/abakus.SlackBuild @@ -49,7 +49,6 @@ cmake ${G_NINJA:-} \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ @@ -59,8 +58,6 @@ make_fn installdocs_fn -[[ $TDEVERSION != 14.0.10 ]] && mangzip_fn - strip_fn mkdir_install_fn @@ -79,13 +76,13 @@ $PRGNAM: abakus is an improvement in the limited simulation of a calculator. $PRGNAM: Can be built and used with mpfr. $PRGNAM: Customizable precision up to 75 digits. $PRGNAM: -$PRGNAM: Copy/paste or type in and evaluate complex expressions. Exponentiation -$PRGNAM: is right-associative, for example: (2^3)^2*e^4/pi 2^3^2*e^4/pi -$PRGNAM: [The answers given by abakus: 1112.26437907 8898.11503252] +$PRGNAM: Copy/paste or type in and evaluate complex expressions. +$PRGNAM: Exponentiation is right-associative, +$PRGNAM: for example: (2^3)^2 == 8^2, 2^3^2 == 2^9 +$PRGNAM: So, (2^3)^2*e^4/pi=1112.26437907; 2^3^2*e^4/pi=8898.11503252 $PRGNAM: $PRGNAM: With language support for: $PRGNAM: $langs -$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Apps/amarok/amarok.SlackBuild b/Apps/amarok/amarok.SlackBuild index 6c624a6..f7f5bc4 100755 --- a/Apps/amarok/amarok.SlackBuild +++ b/Apps/amarok/amarok.SlackBuild @@ -44,14 +44,15 @@ sed 's|tagaac|tagspeex|g;s|aacfile.*$|taglib_speexfiletyperesolver.cpp speexfile sed -i -e 's|wav )|wav )\nadd_subdirectory( speex )|' \ -e 's|tagaac-static|tagaac-static tagspeex-static|' amarok/src/metadata/CMakeLists.txt +[[ $TDEVERSION == 14.0.10 ]] && { ## remove help documentation build instruction from all [non-en] locales ... sed -i '/tde_create_handbook/,+3d' doc/??{,_??}/CMakeLists.txt || true # # set support for additional language(s) as per I18N variable # but only for languages available with this package lpos="" # the *.po files list -langs="" # the languages -ldocs="" # the help docs +langs="en" # the languages +ldocs="en" # the help docs for Lang in $I18N do [[ -d po/$Lang ]] && { @@ -66,8 +67,14 @@ ldocs="$ldocs $Lang" } done # -sed -i "s|\${po_files}|$lpos|" po/CMakeLists.txt -[[ $langs != "" ]] && TRANS=ON +sed -i "s|\${po_files}|$lpos|" po/CMakeLists.txt || true +} || { +## for slack-desc +langs="en" +for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done +ldocs="en" +for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done +} listdocs_fn @@ -102,7 +109,7 @@ cmake ${G_NINJA:-} \ -DWITH_AMAZON="ON" \ -DWITH_DAAP="OFF" \ -DWITH_EMBEDDED_SQLITE="OFF" \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_IFP="OFF" \ -DWITH_INOTIFY="OFF" \ -DWITH_IPOD="OFF" \ @@ -118,7 +125,7 @@ cmake ${G_NINJA:-} \ -DWITH_XINE=${XINE:-"OFF"} \ -DWITH_YAUAP=${YAUAP:-"OFF"} \ -DBUILD_DOC="ON" \ - -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ .. @@ -146,10 +153,10 @@ echo " $PRGNAM: Amarok music player for TDE $PRGNAM: $PRGNAM: With language support for: -$PRGNAM: en$langs +$PRGNAM: $langs $PRGNAM: $PRGNAM: With help documentation for: -$PRGNAM: en$ldocs +$PRGNAM: $ldocs $PRGNAM: $PRGNAM: $PRGNAM: diff --git a/Apps/dolphin/dolphin.SlackBuild b/Apps/dolphin/dolphin.SlackBuild index 50a3328..eace192 100755 --- a/Apps/dolphin/dolphin.SlackBuild +++ b/Apps/dolphin/dolphin.SlackBuild @@ -51,7 +51,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ diff --git a/Apps/filelight/filelight.SlackBuild b/Apps/filelight/filelight.SlackBuild index b513ff6..b1d11c5 100755 --- a/Apps/filelight/filelight.SlackBuild +++ b/Apps/filelight/filelight.SlackBuild @@ -35,18 +35,8 @@ getsource_fn untar_fn ## for slack-desc -langs="en" -ldocs="en" -for Lang in $I18N -do -[[ -s translations/messages/$Lang.po ]] && { -langs="$langs $Lang" -## ... and within that loop as doc locale only exists where translation exists -[[ -d doc/$Lang ]] && { -ldocs="$ldocs $Lang" -} -} -done +langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done +ldocs="en";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done listdocs_fn diff --git a/Apps/k3b/k3b.SlackBuild b/Apps/k3b/k3b.SlackBuild index fd9a78c..1ec50dc 100755 --- a/Apps/k3b/k3b.SlackBuild +++ b/Apps/k3b/k3b.SlackBuild @@ -34,6 +34,26 @@ getsource_fn untar_fn +[[ $TDEVERSION != 14.0.10 ]] && { +## using cmake common rules +find doc -name CMakeLists.txt | xargs rm + +sed -i '/tde_conditional_add_subdirectory( BUILD_DOC doc )/d' CMakeLists.txt +sed -i 's|k3bsetup )|&\ +\ +\ +##### other data\ +\ +tde_conditional_add_project_docs( BUILD_DOC )|' CMakeLists.txt + +mv doc/tdeioslave doc/en +mv doc/* doc/en || true +mv doc/en/en doc/en/tdeioslave + +mkdir doc/misc +mv FAQ doc/misc/ +} + listdocs_fn chown_fn diff --git a/Apps/kaffeine/kaffeine.SlackBuild b/Apps/kaffeine/kaffeine.SlackBuild index cc05d54..d7edcfe 100755 --- a/Apps/kaffeine/kaffeine.SlackBuild +++ b/Apps/kaffeine/kaffeine.SlackBuild @@ -33,6 +33,12 @@ getsource_fn untar_fn +[[ $TDEVERSION != 14.0.10 ]] && { +## using cmake common rules +mkdir doc/misc +mv README* FAQ doc/misc/ +} + ## for slack-desc langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done @@ -54,7 +60,7 @@ cmake ${G_NINJA:-} \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_DPMS="ON" \ -DWITH_XTEST="ON" \ -DWITH_XINERAMA="ON" \ diff --git a/Apps/kbookreader/kbookreader.SlackBuild b/Apps/kbookreader/kbookreader.SlackBuild index e6036ee..e6c7d60 100755 --- a/Apps/kbookreader/kbookreader.SlackBuild +++ b/Apps/kbookreader/kbookreader.SlackBuild @@ -52,7 +52,7 @@ cmake ${G_NINJA:-} \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -Wno-dev \ .. diff --git a/Apps/kdbg/kdbg.SlackBuild b/Apps/kdbg/kdbg.SlackBuild index 11cc00c..95c5c44 100755 --- a/Apps/kdbg/kdbg.SlackBuild +++ b/Apps/kdbg/kdbg.SlackBuild @@ -33,6 +33,7 @@ getsource_fn untar_fn +[[ $TDEVERSION == 14.0.10 ]] && { ## edit man page sed -i "s|/opt/trinity/share/doc/|$INSTALL_TDE/share/doc/|" kdbg/doc/man/kdbg.1 @@ -52,17 +53,27 @@ foreach( _dir ${_dirs} ) endif() endforeach() ' > kdbg/doc/CMakeLists.txt +} || { +## edit man page +sed -i "s|/opt/trinity/share/doc/|$INSTALL_TDE/share/doc/|" doc/man/kdbg.1 +} ## for slack-desc +[[ $TDEVERSION == 14.0.10 ]] && { langs="en";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang";done ldocs="en";for Lang in $I18N;do [[ -d kdbg/doc/$Lang ]] && ldocs="$ldocs $Lang";done +} || { +langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done +ldocs="en";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done +} listdocs_fn chown_fn -cd_builddir_fn +cd_builddir_fn +[[ $TDEVERSION != 14.0.10 ]] && TRACE=ON cmake ${G_NINJA:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ @@ -71,8 +82,8 @@ cmake ${G_NINJA:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DWITH_GCC_VISIBILITY="OFF" \ - -DWITH_TRACE_OUTPUT="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ + -DWITH_TRACE_OUTPUT="${TRACE:-OFF}" \ -DWITH_GDB_TRANSCRIPT="ON" \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ diff --git a/Apps/kdbusnotification/kdbusnotification.SlackBuild b/Apps/kdbusnotification/kdbusnotification.SlackBuild index d809db7..8107fad 100755 --- a/Apps/kdbusnotification/kdbusnotification.SlackBuild +++ b/Apps/kdbusnotification/kdbusnotification.SlackBuild @@ -33,6 +33,9 @@ getsource_fn untar_fn +## for slack-desc +langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done + listdocs_fn chown_fn @@ -46,7 +49,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -Wno-dev \ .. @@ -76,8 +79,8 @@ echo " $PRGNAM: A DBUS notification to TDE interface $PRGNAM: $PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: $langs $PRGNAM: $PRGNAM: $PRGNAM: diff --git a/Apps/kkbswitch/kkbswitch.SlackBuild b/Apps/kkbswitch/kkbswitch.SlackBuild index 4369206..4170959 100755 --- a/Apps/kkbswitch/kkbswitch.SlackBuild +++ b/Apps/kkbswitch/kkbswitch.SlackBuild @@ -56,7 +56,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -DWITH_RU_UA_LAYOUT=${RU_UA:-"OFF"} \ diff --git a/Apps/knemo/knemo.SlackBuild b/Apps/knemo/knemo.SlackBuild index 03dc370..b867f02 100755 --- a/Apps/knemo/knemo.SlackBuild +++ b/Apps/knemo/knemo.SlackBuild @@ -44,6 +44,7 @@ sed -i 's|Default Gateway" ), LINK_QUALITY|Default Gateway" ), GATEWAY|' src/kne ## for slack-desc langs="en";for Lang in $I18N;do [[ -s translations/messages/knemod/$Lang.po ]] && langs="$langs $Lang";done +## add misc docs listdocs_fn chown_fn @@ -59,7 +60,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_LIBIW="OFF" \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ diff --git a/Apps/knetstats/knetstats.SlackBuild b/Apps/knetstats/knetstats.SlackBuild index 6b3ad1d..1e9278d 100755 --- a/Apps/knetstats/knetstats.SlackBuild +++ b/Apps/knetstats/knetstats.SlackBuild @@ -51,7 +51,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ diff --git a/Apps/knights/knights.SlackBuild b/Apps/knights/knights.SlackBuild index 05c59e2..7f34721 100755 --- a/Apps/knights/knights.SlackBuild +++ b/Apps/knights/knights.SlackBuild @@ -47,6 +47,7 @@ chown_fn cd_builddir_fn +[[ $TDEVERSION != 14.0.10 ]] && B_E_T='-DBUILD_EXTRA_THEME="ON"' cmake ${G_NINJA:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ @@ -55,9 +56,10 @@ cmake ${G_NINJA:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ + ${B_E_T:-} \ -Wno-dev \ .. diff --git a/Apps/knmap/knmap.SlackBuild b/Apps/knmap/knmap.SlackBuild index d7a9f9d..e95b117 100755 --- a/Apps/knmap/knmap.SlackBuild +++ b/Apps/knmap/knmap.SlackBuild @@ -51,7 +51,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ diff --git a/Apps/kscope/kscope.SlackBuild b/Apps/kscope/kscope.SlackBuild index 9c35104..1061bcc 100755 --- a/Apps/kscope/kscope.SlackBuild +++ b/Apps/kscope/kscope.SlackBuild @@ -50,7 +50,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ diff --git a/Apps/ksensors/ksensors.SlackBuild b/Apps/ksensors/ksensors.SlackBuild index 73de9f4..77b64cf 100755 --- a/Apps/ksensors/ksensors.SlackBuild +++ b/Apps/ksensors/ksensors.SlackBuild @@ -50,7 +50,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ diff --git a/Apps/kshutdown/kshutdown.SlackBuild b/Apps/kshutdown/kshutdown.SlackBuild index af08851..81a66cc 100755 --- a/Apps/kshutdown/kshutdown.SlackBuild +++ b/Apps/kshutdown/kshutdown.SlackBuild @@ -53,7 +53,7 @@ cmake ${G_NINJA:-} \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -DBUILD_EXTRAS="ON" \ diff --git a/Apps/kvkbd/kvkbd.SlackBuild b/Apps/kvkbd/kvkbd.SlackBuild index d0e86c3..cecd450 100755 --- a/Apps/kvkbd/kvkbd.SlackBuild +++ b/Apps/kvkbd/kvkbd.SlackBuild @@ -33,29 +33,6 @@ getsource_fn untar_fn -## These patches could be broken by ongoing development. -## To build kvkbd with these patches, revert the repo to revisions known to work -[[ $TDEVERSION != 14.0.10 ]] && { -(cd $BUILD_TDE_ROOT/src/cgit/$PRGNAM/ -git reset HEAD * -rm -rf .git/worktrees/* -## don't need info about 'detached HEAD' state - only using the repo as a build source -git config advice.detachedHead false -[[ $TDEVERSION == 14.1.0 ]] && git checkout -f 4c4e0c2 || git checkout -f df2b743 -## overwrite the files in the build area set up by untar_fn with the source now in 'detached HEAD' state .. -echo -e "\n copying $PRGNAM 'detached HEAD' state sources to build area ... \n" -(cd $BUILD_TDE_ROOT/src/cgit -cp -a --parents $PRGNAM/* $TMP_BUILD/tmp-$PRGNAM/ -cp -a --parents cmake/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/) - -## and then switch back to master branch ready for the next pull .. -echo -e "\n ### Switching cgit source back to master branch ### \n" -git checkout master -echo -) -} -# ### - ## copy the helpfile docs to the build tree cp -a $SRCDIR/doc . cp $SRCDIR/dock.png src/ @@ -160,6 +137,7 @@ patch -N -p0 << EOF || true + resize ( 64,31 ); EOF +[[ $TDEVERSION == 14.0.10 ]] && { ## Caps+AltGr[+Shift] displayed characters should be toggled from the non-Caps state patch -N -p0 << EOF || true --- src/VButton.cpp @@ -181,6 +159,7 @@ patch -N -p0 << EOF || true + } + else if (shift) EOF +} ## blank character display where AltGr does not provide extra characters [[ $(cat $TMPVARS/Kvkbd_OPTS) == *blank* ]] && { @@ -252,6 +231,7 @@ patch -N -p0 << EOF || true EOF } +[[ $TDEVERSION == 14.0.10 ]] && { ## another combining character to display patch -N -p0 << EOF || true --- src/Xutils.cpp @@ -259,6 +239,7 @@ patch -N -p0 << EOF || true @@ -871,0 +872 @@ + { 0x01000358L, 0x02d9 }, /* combining dot above right ˙ dot above */ EOF +} ## for slack-desc langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done @@ -276,7 +257,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ diff --git a/Apps/kvpnc/kvpnc.SlackBuild b/Apps/kvpnc/kvpnc.SlackBuild index 79b9073..a01463c 100755 --- a/Apps/kvpnc/kvpnc.SlackBuild +++ b/Apps/kvpnc/kvpnc.SlackBuild @@ -39,6 +39,7 @@ for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $L ldocs="en tdeioslave" for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done +[[ $TDEVERSION == 14.0.10 ]] && { ## add misc docs MISC_FILES=$(cd doc/misc/;ls README* pptp.txt) cat << EOF > doc/misc/CMakeLists.txt @@ -49,6 +50,7 @@ INSTALL( ) EOF sed -i 's|add_subdirectory( tdeioslave )|&\nadd_subdirectory( misc )|' doc/CMakeLists.txt +} chown_fn @@ -62,6 +64,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ diff --git a/Apps/potracegui/potracegui.SlackBuild b/Apps/potracegui/potracegui.SlackBuild index 8b0fc22..f5a2f7f 100755 --- a/Apps/potracegui/potracegui.SlackBuild +++ b/Apps/potracegui/potracegui.SlackBuild @@ -33,7 +33,7 @@ getsource_fn untar_fn -sed "s|po/|${PO_PATH:-po/}|" $SRCDIR/reformat-message.patch | patch -p0 +patch -p0 < $SRCDIR/reformat-message.patch ## for slack-desc langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done @@ -53,7 +53,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ diff --git a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild index 371293d..d871667 100755 --- a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild +++ b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild @@ -51,7 +51,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ .. diff --git a/Apps/tdesudo/tdesudo.SlackBuild b/Apps/tdesudo/tdesudo.SlackBuild index f02cbc3..f70bbbc 100755 --- a/Apps/tdesudo/tdesudo.SlackBuild +++ b/Apps/tdesudo/tdesudo.SlackBuild @@ -50,7 +50,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ diff --git a/Apps/tdmtheme/tdmtheme.SlackBuild b/Apps/tdmtheme/tdmtheme.SlackBuild index c0ed8ae..849e8fb 100755 --- a/Apps/tdmtheme/tdmtheme.SlackBuild +++ b/Apps/tdmtheme/tdmtheme.SlackBuild @@ -51,7 +51,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ diff --git a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild index bf241a2..8f4e6f3 100755 --- a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild +++ b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild @@ -33,14 +33,19 @@ getsource_fn untar_fn +## for slack-desc +langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$Lang $langs";done + listdocs_fn chown_fn -ltoolupdate_fn +[[ $TDEVERSION == 14.0.10 ]] && ltoolupdate_fn cd_builddir_fn +[[ $TDEVERSION == 14.0.10 ]] && { + CFLAGS="$SLKRCFLAGS" \ CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ @@ -50,6 +55,24 @@ CXX=$COMPILER_CXX \ --disable-rpath \ --enable-closure +} || { + +cmake ${G_NINJA:-} \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ + -DBUILD_TRANSLATIONS="ON" \ + -Wno-dev \ + .. + +} + make_fn installdocs_fn @@ -71,8 +94,8 @@ $PRGNAM: $PRGNAM: Crystal Style for Twin $PRGNAM: $PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: $langs $PRGNAM: $PRGNAM: $PRGNAM: diff --git a/Apps/yakuake/yakuake.SlackBuild b/Apps/yakuake/yakuake.SlackBuild index f84fd45..1432421 100755 --- a/Apps/yakuake/yakuake.SlackBuild +++ b/Apps/yakuake/yakuake.SlackBuild @@ -51,7 +51,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index 46f542e..697842f 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -44,7 +44,7 @@ dialog --cr-wrap --yes-label "Re-use" --no-label "New" --defaultno --no-shadow - * after only downloading the sources" \ 13 75 [[ $? == 0 ]] && echo no > $TMPVARS/build-new -[[ $? == 1 ]] && rm -f $TMPVARS/TDEbuilds +[[ $? == 1 ]] && rm -f $TMPVARS/* build_core() @@ -253,7 +253,7 @@ dialog --cr-wrap --nocancel --no-shadow --colors --help-button --help-label "REA Multiple selections may be made - space separated. Build language packages/support for any of: -\Zb\Z6af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW\Zn +\Zb\Z6af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es es_AR et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW\Zn " \ 25 75 \ @@ -329,6 +329,7 @@ If following the build method on the previous screen, the answer here should pro [[ $? == 1 ]] && echo no > $TMPVARS/KEEP_BUILD +[[ $(cat $TMPVARS/TDEVERSION) != 14.0.10 ]] && TQCA=tqca && TQCA_MSG="The TQt Cryptographic Architecture" rm -f $TMPVARS/TDEbuilds dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Packages Selection " --item-help --checklist \ " @@ -346,9 +347,9 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Deps/dbus-tqt" "\Zb\Zr\Z4R\Zn A simple IPC library" off "\Zb\Z6 \Zn" \ "Deps/dbus-1-tqt" "\Zb\Zr\Z4R\Zn D-Bus bindings" off "\Zb\Z6 \Zn" \ "Deps/libart-lgpl" "\Zb\Zr\Z4R\Zn The LGPL'd component of libart" off "\Zb\Z6 \Zn" \ -"Deps/tqca-tls" "\Zb\Zr\Z4R\Zn Plugin to provide SSL/TLS capability" off "\Zb\Z6 \Zn" \ -"Deps/avahi-tqt" "Avahi support" off "\Zb\Z6 Optional for tdelibs and used if installed. Requires Avahi. \Zn" \ -"Core/tdelibs" "\Zb\Zr\Z4R\Zn TDE libraries" off "\Zb\Z6 Will build with Avahi support if avahi/avahi-tqt are installed. \Zn" \ +"Deps/${TQCA:-tqca-tls}" "\Zb\Zr\Z4R\Zn ${TQCA_MSG:-Plugin to provide SSL/TLS capability}" off "" \ +"Deps/avahi-tqt" "Avahi support" off "\Zb\Z6 Optional for tdelibs and used if installed. Requires avahi. \Zn" \ +"Core/tdelibs" "\Zb\Zr\Z4R\Zn TDE libraries" off "\Zb\Z6 Will build with avahi support if avahi & avahi-tqt are installed. \Zn" \ "Core/tdebase" "\Zb\Zr\Z4R\Zn TDE base" off "\Zb\Z6 \Zn" \ "Core/tde-i18n" "Additional language support for TDE" off "\Zb\Z6 Required when any \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ "Deps/akode" "A player and plugins for aRts music formats" off "\Zb\Z6 For tdemultimedia - aRts-plugin and Juk, and amarok engine \Zn" \ @@ -518,6 +519,27 @@ ${DLG_BOX:-0 0} } +## set up for development builds - 14.0.x [aka 14.0.11] & 14.1.0 +[[ $(cat $TMPVARS/TDEVERSION) != 14.0.10 ]] && { +## only run this if tdelibs has been selected +rm -f $TMPVARS/GCC_VIS +[[ $(grep -o tdelibs $TMPVARS/TDEbuilds) ]] && { +dialog --cr-wrap --nocancel --no-shadow --colors --title " Gcc visibility " --menu \ +" +If gcc visibility support [-fvisibility=hidden -fvisibility-inlines-hidden] is required, it has to be built in to tdelibs for the package builds that call the 'tde_setup_gcc_visibility()' macro. + +It will default for those packages to whatever is set here, but if enabled, can be set OFF with the command line option GCC_VIS=0. + +Set gcc visibility support in tdelibs .. + +" \ +21 60 2 \ +"ON" "" \ +"OFF" "" \ +2> $TMPVARS/GCC_VIS +} +} + ## only run this if tdebase has been selected rm -f $TMPVARS/RUNLEVEL [[ $(grep -o tdebase $TMPVARS/TDEbuilds) ]] && { @@ -723,7 +745,7 @@ Do you still want it to do that or change to <\Z1S\Zb\Z0top\Zn> ? fi fi - +[[ $(cat $TMPVARS/PRE_DOWNLOAD) != yes ]] && { ## for a first run, 'install' is set 'on' - subsequently, options are as previously set .. [[ -e $TMPVARS/BuildOptions ]] && { [[ $(cat $TMPVARS/BuildOptions) == *install* ]] && OPT_1=on || OPT_1=off @@ -754,7 +776,7 @@ Confirm or change these build options .. [[ $(cat $TMPVARS/BuildOptions) == *no_warn* ]] && export NO_WARN="-w" [[ $(cat $TMPVARS/BuildOptions) == *ninja* ]] && export G_NINJA="-G Ninja" [[ $(cat $TMPVARS/BuildOptions) == *verbose* ]] && export VERBOSE=1 || exec 2>/dev/null - +} ###################### # there should be no need to make any changes below @@ -769,7 +791,7 @@ export ARCH=$(cat $TMPVARS/ARCH) # set again for the 'continue' option export TDE_MIRROR=${TDE_MIRROR:-https://mirror.ppa.trinitydesktop.org/trinity} export NUMJOBS=$(cat $TMPVARS/NUMJOBS) export I18N=$(cat $TMPVARS/I18N) -export LINGUAS="$I18N 1" ## dummy locale as LINGUAS="" builds all translations +export LINGUAS="$I18N 1" ## 1 == dummy locale as LINGUAS="" builds all translations export TQT_OPTS=$(cat $TMPVARS/TQT_OPTS) export EXIT_FAIL=$(cat $TMPVARS/EXIT_FAIL) export KEEP_BUILD=$(cat $TMPVARS/KEEP_BUILD) @@ -837,6 +859,25 @@ INST_PACKAGE=yes && [[ $INST == 0 ]] && INST_PACKAGE=no ## whether using tde prefix [[ -e $TMPVARS/TDEPFX ]] && tde_prefix=\\Zn\\Zb\\Z2tde\\Zn && [[ ! -s $TMPVARS/TDEPFX ]] && tde_prefix=no # + +## Set up gcc visibilty .. ## +## If GCC_VIS has been set on the command line, export it +[[ $GCC_VIS ]] && export GCC_VIS || { +## set up for development builds - 14.0.x [aka 14.0.11] & 14.1.0 +[[ $TDEVERSION != 14.0.10 ]] && { +## If tdelibs has been built before, the header will exist, so test that: +[[ $(grep "KDE_HAVE_GCC_VISIBILITY 1" $INSTALL_TDE/include/kdemacros.h) ]] && \ +GCC_VIS=ON || GCC_VIS=OFF +## if tdelibs is being built, override any header setting with the dialog output: +[[ -s $TMPVARS/GCC_VIS ]] && GCC_VIS=$(cat $TMPVARS/GCC_VIS) +export GCC_VIS +} || { +## otherwise for 14.0.10 builds, continue to set it off +export GCC_VIS=OFF +} +} +# + ## start dialog EXITVAL=2 until [[ $EXITVAL -lt 2 ]] ; do diff --git a/Core/tde-i18n/tde-i18n.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild index df9ace0..2a61374 100755 --- a/Core/tde-i18n/tde-i18n.SlackBuild +++ b/Core/tde-i18n/tde-i18n.SlackBuild @@ -51,6 +51,11 @@ echo -e "\033[39;1m" echo "Extracting the translations source from $(basename $SOURCE) ..." echo -e "\033[0m" tar xf $SOURCE $PRGNAM-trinity-$TDEVERSION/translations +} || { +mkdir -p $PRGNAM # need -p for git builds if more than one lang +(cd $BUILD_TDE_ROOT/src/cgit +cp -a tdei18n/cgit/tde-i18n/plain/{template,translations} $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ +cp -a --parents cmake/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/) } for lang in $I18N @@ -64,14 +69,14 @@ tar -xf $SOURCE $PRGNAM-trinity-$TDEVERSION/$PRGNAM-$lang cd $PRGNAM* true # don't go to cgit if extracting fails - } || { -mkdir -p $PRGNAM # need -p for git builds if more than one lang cd $PRGNAM echo -e "\n copying $PRGNAM-$lang source files to build area ... \n" (cd $BUILD_TDE_ROOT/src/cgit -cp -a tdei18n/cgit/tde-i18n/plain/tde-i18n-$lang $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ -cp -a --parents {admin,cmake}/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/tde-i18n-$lang/) +cp -a tdei18n/cgit/tde-i18n/plain/tde-i18n-$lang $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/) +(cd $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/$PRGNAM-$lang/ +ln -sf ../template/commonCMakeLists.txt CMakeLists.txt +ln -s ../cmake cmake) } ## language specific patches diff --git a/Core/tdeaccessibility/tdeaccessibility.SlackBuild b/Core/tdeaccessibility/tdeaccessibility.SlackBuild index 5e63257..5d55892 100755 --- a/Core/tdeaccessibility/tdeaccessibility.SlackBuild +++ b/Core/tdeaccessibility/tdeaccessibility.SlackBuild @@ -53,7 +53,7 @@ cmake ${G_NINJA:-} \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_ARTS="ON" \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_AKODE="$AKODE" \ -DWITH_ALSA="ON" \ -DWITH_GSTREAMER="OFF" \ diff --git a/Core/tdeadmin/tdeadmin.SlackBuild b/Core/tdeadmin/tdeadmin.SlackBuild index dbddf40..156fc88 100755 --- a/Core/tdeadmin/tdeadmin.SlackBuild +++ b/Core/tdeadmin/tdeadmin.SlackBuild @@ -48,7 +48,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_KCRON="ON" \ -DBUILD_KDAT="ON" \ diff --git a/Core/tdeartwork/tdeartwork.SlackBuild b/Core/tdeartwork/tdeartwork.SlackBuild index c36e5ce..194a635 100755 --- a/Core/tdeartwork/tdeartwork.SlackBuild +++ b/Core/tdeartwork/tdeartwork.SlackBuild @@ -48,6 +48,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_ALL_INCLUDED_XSCREENSAVERS="OFF" \ -DWITH_ARTS="ON" \ -DWITH_XSCREENSAVER="OFF" \ @@ -61,6 +62,7 @@ cmake ${G_NINJA:-} \ -DBUILD_KWORLDCLOCK="ON" \ -DBUILD_SOUNDS="ON" \ -DBUILD_STYLES="ON" \ + -DBUILD_TDEASCIIQUARIUM="ON" \ -DBUILD_WALLPAPERS="ON" \ -Wno-dev \ .. diff --git a/Core/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild index 0aab96d..a1174f5 100755 --- a/Core/tdebase/tdebase.SlackBuild +++ b/Core/tdebase/tdebase.SlackBuild @@ -140,7 +140,7 @@ cmake ${G_NINJA:-} \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_ARTS="ON" \ -DWITH_ELFICON="OFF" \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_HAL="OFF" \ -DWITH_I8K="OFF" \ -DWITH_LDAP="OFF" \ diff --git a/Core/tdeedu/tdeedu.SlackBuild b/Core/tdeedu/tdeedu.SlackBuild index 59637ee..38a8294 100755 --- a/Core/tdeedu/tdeedu.SlackBuild +++ b/Core/tdeedu/tdeedu.SlackBuild @@ -119,7 +119,7 @@ cmake ${G_NINJA:-} \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_ARTS="ON" \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_KIG_PYTHON_SCRIPTING=${KIG_PS:-"OFF"} \ -DWITH_LIBUSB="ON" \ -DWITH_OCAML_SOLVER=${OCAML:-"OFF"} \ diff --git a/Core/tdegames/tdegames.SlackBuild b/Core/tdegames/tdegames.SlackBuild index 5f14457..593586d 100755 --- a/Core/tdegames/tdegames.SlackBuild +++ b/Core/tdegames/tdegames.SlackBuild @@ -50,7 +50,7 @@ cmake ${G_NINJA:-} \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_ARTS="ON" \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_LIBTDEGAMES="ON" \ -DBUILD_ATLANTIK="ON" \ diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild index 22ee916..9a688fb 100755 --- a/Core/tdelibs/tdelibs.SlackBuild +++ b/Core/tdelibs/tdelibs.SlackBuild @@ -159,7 +159,7 @@ cmake ${G_NINJA:-} \ -DWITH_DEVKITPOWER="ON" \ -DWITH_ELFICON="OFF" \ -DWITH_GAMIN="OFF" \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_HAL="OFF" \ -DWITH_HSPELL="OFF" \ -DWITH_IMAGETOPS_BINARY="OFF" \ diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild index d7cea70..e57516a 100755 --- a/Core/tdenetwork/tdenetwork.SlackBuild +++ b/Core/tdenetwork/tdenetwork.SlackBuild @@ -53,6 +53,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_ARTS="ON" \ -DWITH_JINGLE="ON" \ -DWITH_SPEEX=${SPX:-"OFF"} \ diff --git a/Core/tdewebdev/tdewebdev.SlackBuild b/Core/tdewebdev/tdewebdev.SlackBuild index fd3d91e..0907300 100755 --- a/Core/tdewebdev/tdewebdev.SlackBuild +++ b/Core/tdewebdev/tdewebdev.SlackBuild @@ -62,7 +62,7 @@ cmake ${G_NINJA:-} \ -DLIB_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_OTHER_EDITORS="ON" \ -DWITH_QUANTA_CVSSERVICE="ON" \ -DBUILD_DOC="ON" \ diff --git a/Deps/akode/akode.SlackBuild b/Deps/akode/akode.SlackBuild index f7e3ea1..e46dfd3 100755 --- a/Deps/akode/akode.SlackBuild +++ b/Deps/akode/akode.SlackBuild @@ -54,7 +54,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_LIBLTDL="ON" \ -DWITH_ALSA_SINK="ON" \ -DWITH_JACK_SINK="OFF" \ diff --git a/Deps/arts/arts.SlackBuild b/Deps/arts/arts.SlackBuild index 3678a96..4008195 100755 --- a/Deps/arts/arts.SlackBuild +++ b/Deps/arts/arts.SlackBuild @@ -50,7 +50,7 @@ cmake ${G_NINJA:-} \ -DWITH_ALSA="ON" \ -DWITH_AUDIOFILE="ON" \ -DWITH_ESOUND="OFF" \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_JACK="OFF" \ -DWITH_MAD="ON" \ -DWITH_SNDIO="OFF" \ diff --git a/Deps/avahi-tqt/avahi-tqt.SlackBuild b/Deps/avahi-tqt/avahi-tqt.SlackBuild index bd44fa3..2019695 100755 --- a/Deps/avahi-tqt/avahi-tqt.SlackBuild +++ b/Deps/avahi-tqt/avahi-tqt.SlackBuild @@ -47,7 +47,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -Wno-dev \ .. diff --git a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild index ec655d8..0fc163c 100755 --- a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild +++ b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild @@ -47,7 +47,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -Wno-dev \ .. diff --git a/Deps/libart-lgpl/libart-lgpl.SlackBuild b/Deps/libart-lgpl/libart-lgpl.SlackBuild index 94b7417..29749cb 100755 --- a/Deps/libart-lgpl/libart-lgpl.SlackBuild +++ b/Deps/libart-lgpl/libart-lgpl.SlackBuild @@ -48,7 +48,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=/usr/man \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -Wno-dev \ .. diff --git a/Deps/libcaldav/libcaldav.SlackBuild b/Deps/libcaldav/libcaldav.SlackBuild index 227b1a9..19a8602 100755 --- a/Deps/libcaldav/libcaldav.SlackBuild +++ b/Deps/libcaldav/libcaldav.SlackBuild @@ -33,6 +33,7 @@ getsource_fn untar_fn +## add misc docs listdocs_fn chown_fn @@ -50,7 +51,7 @@ cmake ${G_NINJA:-} \ -DBUILD_DOC="ON" \ -DBUILD_CALDAV_TEST="OFF" \ -DBUILD_UNITTEST="OFF" \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -Wno-dev \ .. diff --git a/Deps/libcarddav/libcarddav.SlackBuild b/Deps/libcarddav/libcarddav.SlackBuild index fb1ebe6..c890777 100755 --- a/Deps/libcarddav/libcarddav.SlackBuild +++ b/Deps/libcarddav/libcarddav.SlackBuild @@ -48,7 +48,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DBUILD_DOC="OFF" \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -Wno-dev \ .. diff --git a/Deps/tqca-tls/tqca-tls.SlackBuild b/Deps/tqca-tls/tqca-tls.SlackBuild index f58fb5a..2fa7dd9 100755 --- a/Deps/tqca-tls/tqca-tls.SlackBuild +++ b/Deps/tqca-tls/tqca-tls.SlackBuild @@ -47,7 +47,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -Wno-dev \ .. diff --git a/Deps/tqca/tqca.SlackBuild b/Deps/tqca/tqca.SlackBuild new file mode 100644 index 0000000..ee596be --- /dev/null +++ b/Deps/tqca/tqca.SlackBuild @@ -0,0 +1,85 @@ +#!/bin/sh +# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST +# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015 Eric Hameleers, Eindhoven, Netherlands +# Copyright 2015-2017 Thorn Inurcide +# Copyright 2015-2017 tde-slackbuilds project on GitHub +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +PRGNAM=tqca +VERSION=$TDEVERSION +BUILD=${BUILD:-1} +TAG=${TAG:-_tde} + +source ../../get-source.sh +getsource_fn + +untar_fn + +listdocs_fn + +chown_fn + +cd_builddir_fn + +cmake ${G_NINJA:-} \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DBUILD_TQCA="ON" \ + -DBUILD_TQCA_TLS="ON" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ + -Wno-dev \ + .. + +make_fn + +installdocs_fn + +strip_fn + +mkdir_install_fn + +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + |-----handy-ruler------------------------------------------------------| +$PRGNAM: tqca (The TQt Cryptographic Architecture) +$PRGNAM: +$PRGNAM: This library provides an easy API for the following features: +$PRGNAM: SSL/TLS +$PRGNAM: X509 +$PRGNAM: SASL +$PRGNAM: RSA +$PRGNAM: Hashing (SHA1, MD5) +$PRGNAM: Ciphers (BlowFish, 3DES, AES) +$PRGNAM: +$PRGNAM: +" > $PKG/install/slack-desc + +makepkg_fn diff --git a/Libs/libkexiv2/libkexiv2.SlackBuild b/Libs/libkexiv2/libkexiv2.SlackBuild index 3a9f741..af40532 100755 --- a/Libs/libkexiv2/libkexiv2.SlackBuild +++ b/Libs/libkexiv2/libkexiv2.SlackBuild @@ -48,7 +48,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -Wno-dev \ .. diff --git a/Libs/libkipi/libkipi.SlackBuild b/Libs/libkipi/libkipi.SlackBuild index f7dba5b..023f4b3 100755 --- a/Libs/libkipi/libkipi.SlackBuild +++ b/Libs/libkipi/libkipi.SlackBuild @@ -55,7 +55,7 @@ cmake ${G_NINJA:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -Wno-dev \ .. diff --git a/get-source.sh b/get-source.sh index b028e36..3d31c6d 100755 --- a/get-source.sh +++ b/get-source.sh @@ -111,8 +111,7 @@ if [ "$P1" == "--download" ]; then echo "Download complete." exit 0 fi -} || \ -{ +} || { ## otherwise, not R14.0.10 or misc, and we are creating/updating git, ## so [1] start with admin/cmake: [[ $(cat $TMPVARS/DL_CGIT) == yes ]] && { @@ -135,8 +134,8 @@ git pull git fetch origin r14.0.x:r14.0.x) ## if admin and cmake don't exist, clone them -[[ ! -d admin ]] && git clone https://mirror.git.trinitydesktop.org/cgit/admin admin -[[ ! -d cmake ]] && git clone https://mirror.git.trinitydesktop.org/cgit/cmake cmake +[[ ! -d admin ]] && git clone https://mirror.git.trinitydesktop.org/gitea/TDE/admin admin +[[ ! -d cmake ]] && git clone https://mirror.git.trinitydesktop.org/gitea/TDE/tde-common-cmake cmake ## place a marker so that admin/cmake update or clone only once per run of BUILD-TDE.sh touch $TMPVARS/admin-cmake-done @@ -155,7 +154,7 @@ git pull git fetch origin r14.0.x:r14.0.x) ## if the local repository for PRGNAM doesn't exist, clone it .. [[ ! -d $PRGNAM ]] && \ -git clone https://mirror.git.trinitydesktop.org/cgit/$PRGNAM +git clone https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM ## if arts/tdelibs, need libltdl [[ " arts tdelibs " == *$PRGNAM* ]] && { @@ -167,7 +166,7 @@ git pull git fetch origin r14.0.x:r14.0.x) [[ ! -d libltdl ]] && \ -git clone https://mirror.git.trinitydesktop.org/cgit/libltdl +git clone https://mirror.git.trinitydesktop.org/gitea/TDE/libltdl } ## if tdenetwork, need libtdevnc, but not yet for 14.0.x==14.0.11[?] which uses krfb/libvncserver @@ -181,29 +180,32 @@ git pull ) [[ ! -d libtdevnc ]] && \ -git clone https://mirror.git.trinitydesktop.org/cgit/libtdevnc +git clone https://mirror.git.trinitydesktop.org/gitea/TDE/libtdevnc } true # prevent the following i18n download (attempts) if this routine fails -} || \ -{ +} || { ## still creating/updating git ## so [3] for tde-i18n-$lang: ## Use wget to download the required i18n repos to avoid the ~1x10^6 byte download for the full tde-i18n ## - same for both creating and updating + +cd tdei18n +# ### will download the template, translations, and tde-i18n-$lang modules to: +# ### $BUILD_TDE_ROOT/src/cgit/tdei18n/cgit/tde-i18n/plain/... +wget -m --no-parent --no-host-directories https://mirror.git.trinitydesktop.org/cgit/tde-i18n/plain/translations/desktop_files/entry.desktop/entry.desktop.pot +rm -rf cgit/tde-i18n/plain/template +wget -m --no-parent --no-host-directories https://mirror.git.trinitydesktop.org/cgit/tde-i18n/plain/template/ + for lang in $I18N do -cd tdei18n ## remove the previous repo to avoid build failures caused by any unused old files rm -rf cgit/tde-i18n/plain/tde-i18n-$lang wget -m --no-parent --no-host-directories https://mirror.git.trinitydesktop.org/cgit/tde-i18n/plain/tde-i18n-$lang/ -##will download the tde-i18n-$lang files to: -##$BUILD_TDE_ROOT/src/cgit/tdei18n/cgit/tde-i18n/plain/tde-i18n-$lang/* -## remove admin and cmake links which are downloaded as files -rm cgit/tde-i18n/plain/tde-i18n-$lang/{admin,cmake} -cd .. +wget -m --no-parent --no-host-directories https://mirror.git.trinitydesktop.org/cgit/tde-i18n/plain/translations/desktop_files/entry.desktop/$lang.po || true # in case it doesn't exist done +cd .. } } } @@ -371,10 +373,10 @@ find $PKG$INSTALL_TDE/doc -type f -exec chmod 644 {} \; mangzip_fn () { -[[ -d $PKG$INSTALL_TDE/man ]] && { +[[ ! -d $PKG$INSTALL_TDE/man ]] && true || { # true == don't let the SB fail if there are no man pages .. find $PKG$INSTALL_TDE/man -type f -name "*.?" -exec gzip -9f {} \; for i in $(find $PKG$INSTALL_TDE/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -} +} # .. but let the SB fail if there is a problem with the gzipping } strip_fn ()