Added cmake ninja build option

Added new dialog screen for install, no_warn, ninja, verbose options
tdelibs.SlackBuild - added patch to change hard coded install path
tdemultimedia.SlackBuild - removed autotools build
pull/25/head
Ray-V 3 years ago
parent 2dcbecf878
commit 1f1b5cec59

@ -42,13 +42,14 @@ chown_fn
cd_builddir_fn
cmake \
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 \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS="ON" \
-Wno-dev \
@ -58,6 +59,8 @@ make_fn
installdocs_fn
[[ $TDEVERSION != 14.0.10 ]] && mangzip_fn
strip_fn
mkdir_install_fn

@ -88,7 +88,7 @@ cd_builddir_fn
## Build aKode-engine?
[[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && AKODE="ON"
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \
@ -126,6 +126,8 @@ make_fn
installdocs_fn
mangzip_fn
strip_fn
mkdir_install_fn

@ -42,7 +42,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -54,7 +54,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -48,7 +48,7 @@ chown_fn
cd_builddir_fn
## BONOBO will be included in the build if installed
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -75,7 +75,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -63,7 +63,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_COMPILER=$COMPILER \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \

@ -49,7 +49,7 @@ cd_builddir_fn
# Check for musicbrainz:
[[ -s /usr/include/musicbrainz/mb_c.h ]] && MUSICBRAINZ="ON"
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -42,7 +42,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -49,7 +49,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -42,7 +42,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -63,7 +63,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -39,7 +39,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -47,7 +47,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -50,7 +50,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -42,7 +42,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -47,7 +47,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -42,7 +42,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -42,7 +42,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -42,7 +42,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -43,7 +43,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -101,11 +101,11 @@ To display and select the shift characters:
<sbr/>
3rd &amp; 4th level characters which are printed using &AltGr; &amp; &AltGr;+&Shift; as modifier keys, can be displayed and printed in a similar way.
<sbr/><sbr/>
There are therefore six sets of characters which can be displayed -
There are therefore four sets of characters which can be displayed -
<sbr/>
<keycap>Lower</keycap>&ensp; &Shift;&ensp; &Caps;&ensp; &Caps;+&Shift;&ensp; &AltGr;&ensp; &AltGr;+&Shift;
<keycap>Lower</keycap>&ensp; &Shift;&ensp; &AltGr;&ensp; &AltGr;+&Shift;
<sbr/><sbr/>
&Caps; can be used with &AltGr; &amp; &AltGr;+&Shift; and mostly gives the correct display, but may not depending on how the unicode character has been defined.
For each of these, &Caps; will toggle the case of alpha characters where a lower/upper pair is defined in UnicodeData.txt &amp;&amp; &TQt; &amp;&amp; libX11.
</sect1>

@ -269,7 +269,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -54,7 +54,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -45,7 +45,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -70,7 +70,7 @@ cd_builddir_fn
# Check for DSSI aka "Dizzy"
[[ $(grep -E "dssi.h" /var/log/packages/*) ]] && DSSI="ON"
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -42,7 +42,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -47,7 +47,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -46,7 +46,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -67,7 +67,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -42,7 +42,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -42,7 +42,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -42,7 +42,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -1,11 +1,11 @@
#!/bin/sh
## suppress error messages
[[ $VERBOSE != 1 ]] && exec 2>/dev/null
export TMPVARS=/tmp/build/vars
[[ ! -d $TMPVARS ]] && mkdir -p $TMPVARS
## suppress standard error output unless verbose output has been set on a previous run
[[ $(cat $TMPVARS/BuildOptions) == *verbose* ]] || exec 2>/dev/null
## remove marker for git admin/cmake to update or clone only once per run of this script
rm -f $TMPVARS/admin-cmake-done
## remove any PRE_DOWNLOAD record to allow BUILD-TDE.sh to be run in Re-use mode after a pre-download
@ -78,7 +78,6 @@ build_core()
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# These need to be set here:
export INST=${INST:-1}
TMP=${TMP:-/tmp}
export LIBPNG_TMP=$TMP
export BUILD_TDE_ROOT=$(pwd)
@ -599,7 +598,7 @@ dialog --cr-wrap --nocancel --no-shadow --extra-button --extra-label "README" --
See the README for further details ..
[1] Use Win keys either as modifier keys,
or for characters set with xmodmap.
                     or to print characters set with xmodmap.
[2] Alternative text on the num pad keys.
@ -676,8 +675,8 @@ Create and/or update the git repositories local copies.
#rm -f $TMPVARS/PRE_DOWNLOAD ## this is done at the head of this script
[[ $(cat $TMPVARS/TDEVERSION) == 14.0.10 ]] && PRE_DOWNLOAD_MESSAGE="Only the source archives not already in 'src' will be downloaded."
[[ $(cat $TMPVARS/TDEVERSION) == 14.1.0 || $(cat $TMPVARS/TDEVERSION) == 14.0.x ]] && PRE_DOWNLOAD_MESSAGE="All cgit sources for the build list packages will be cloned/updated.\nMisc archives will only be downloaded if not already in 'src'." && LINES=18
## testing for cgit!=no will allow =yes or null, which is the 14.0.10 build case
[[ $(cat $TMPVARS/TDEVERSION) == 14.1.0 || $(cat $TMPVARS/TDEVERSION) == 14.0.x ]] && PRE_DOWNLOAD_MESSAGE="All cgit sources for the build list packages will be cloned/updated.\nMisc archives will only be downloaded if not already in 'src'."
## testing for cgit!=no will allow =yes, or null, which is the 14.0.10 build case
[[ $(cat $TMPVARS/DL_CGIT) != no ]] && {
dialog --cr-wrap --no-shadow --colors --defaultno --title " Only download sources " --yesno \
"
@ -694,7 +693,7 @@ This would be useful for running the build off-line.
$PRE_DOWNLOAD_MESSAGE
" \
${LINES:-17} 75
18 75
[[ $? == 0 ]] && echo yes > $TMPVARS/PRE_DOWNLOAD
[[ $? == 1 ]] && echo no > $TMPVARS/PRE_DOWNLOAD
}
@ -705,6 +704,7 @@ ${LINES:-17} 75
# 'uname -m' won't identify a 32 bit system with a 64 bit kernel
[[ $(getconf LONG_BIT) == 64 ]] && LIBDIRSUFFIX="64" || LIBDIRSUFFIX=""
## if there are no packages to be built, run the set up ..
[[ ! -e $TMPVARS/TDEbuilds ]] && run_dialog
# option to change to stop the build when it fails
@ -724,6 +724,38 @@ fi
fi
## 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
[[ $(cat $TMPVARS/BuildOptions) == *no_warn* ]] && OPT_2=on
[[ $(cat $TMPVARS/BuildOptions) == *ninja* ]] && OPT_3=on
[[ $(cat $TMPVARS/BuildOptions) == *verbose* ]] && OPT_4=on
}
dialog --cr-wrap --nocancel --no-shadow --colors --title " Build options " --checklist \
"
Confirm or change these build options ..
[1] \Z3\Zbinstall\Zn - install packages as they are built - needed for \Zb\Zr\Z4R\Znequired packages and some interdependencies
[2] \Z3\Zbno_warn\Zn - don't display any compiler warning messages
[3] \Z3\Zbninja\Zn - use ninja for cmake builds
[4] \Z3\Zbverbose\Zn - show command lines during cmake builds, 'make' debugging information, and standard error output. Using this is only recommended if fault finding.
" \
25 75 4 \
" install" "install built packages" ${OPT_1:-on} \
" no_warn" "suppress compiler warnings" ${OPT_2:-off} \
" ninja" "use ninja for cmake builds" ${OPT_3:-off} \
" verbose" "show command lines" ${OPT_4:-off} \
2> $TMPVARS/BuildOptions
[[ $(cat $TMPVARS/BuildOptions) == *install* ]] && export INST=1 || export INST=0
[[ $(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

@ -82,7 +82,7 @@ chown_fn
mkdir -p $PRGNAM-$lang/build
cd $PRGNAM-$lang/build
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -42,7 +42,7 @@ cd_builddir_fn
AKODE=OFF && [[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && AKODE=ON
FREEVERB=OFF && [[ -s $INSTALL_TDE/include/arts/artsmodules.h ]] && FREEVERB=ON
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -60,7 +60,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -39,7 +39,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -39,7 +39,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -65,10 +65,7 @@ echo $'
- <pos x="435" y="323" anchor="s" />
+ <normal color="#ff0000" font="Sans 11" />
+ <pos x="435" y="260" anchor="s" />
' | while read line
do
patch -N -p0
done || true
' | patch -N -p0 || true
## enable konqueror filemanagement ViewMode to be set - TDE bug 1963
echo $'
@ -96,10 +93,7 @@ echo $'
+++ konqueror/listview/konq_treeview.desktop
@@ -87,0 +88 @@
+X-TDE-BrowserView-Built-Into=konqueror
' | while read line
do
patch -N -p0
done || true
' | patch -N -p0 || true
## allow for configuration files directory == /etc/tde
## and plugins in $INSTALL_TDE/lib$LIBDIRSUFFIX/tde
@ -134,7 +128,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -108,7 +108,7 @@ cd_builddir_fn
## kig python scripting support
[[ $(ls -1 /usr/lib$LIBDIRSUFFIX/libboost_python*.so) ]] && KIG_PS="ON"
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -39,7 +39,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -56,7 +56,7 @@ cd_builddir_fn
# If imlib is installed, include Kuickshow:
[[ -s /usr/include/Imlib.h ]] && KUICKSHOW=ON
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -46,10 +46,7 @@ echo $'--- tdecmshell/main.cpp
@@ -101 +107 @@
- kdWarning(780) << "Could not find module \'" << module << "\'." << endl;
+ kdError(780) << "Could not find \'" << path << "\'." << endl;
' | while read line
do
patch -N -p0
done || true
' | patch -N -p0 || true
## allow for configuration files directory == /etc/tde
## and plugins in $INSTALL_TDE/lib$LIBDIRSUFFIX/tde
@ -63,7 +60,6 @@ tdelfeditor/tdelfeditor.cpp \
tdeio/tests/kurifiltertest.cpp \
tdeio/tests/kmimetypetest.sh.cmake \
tdeio/tests/jobtest.cpp \
tdeio/kssl/kopenssl.cc \
tdeio/kssl/kopenssl.cpp \
tdeinit/tdestartupconfig.cpp \
tdecore/tdeconfig_compiler/tests/test9main.cpp
@ -72,6 +68,10 @@ sed -i "s|trinity|$PLUGIN_INSTALL_DIR|g" $file || true
done
sed -i "s|\"trinity\"|\"$PLUGIN_INSTALL_DIR\"|" tdecore/tdeapplication.cpp || true
## change hard-coded path
sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" tdecore/tests/kurltest.cpp || true
sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" cmake/modules/TDESetupPaths.cmake || true
## Patching for preferred formatting of help files
patch -N -p0 << EOF || true
--- doc/common/tde-docs.css
@ -135,7 +135,7 @@ sed -i 's|TQT_INCLUDE_DIRS}|&\n ${AVAHI_TQT_INCLUDE_DIRS}|' ../dnssd/CMakeLists
## just show message without failing if no spell checker is installed
sed -i 's|tde_message_fatal( "Spell checker|message( "Spell checker|' ../CMakeLists.txt
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -1,20 +0,0 @@
There are issues building with cmake, so until they are resolved, the preference is an autotools build.
If you DO want to build with cmake, run 'USE_CMAKE_MM=yes ./BUILD-TDE.sh'
Juk won't build at all with cmake - the autotools build is more accommodating:
Re: configure output:
"""
* You do not seem to have libmusicbrainz and libtunepimp.
* JuK will be compiled without MusicBrainz support and automatic song recognition will not be supported.
* Please download libmusicbrainz 2.x and libtunepimp 0.3.x from:
* http://www.musicbrainz.org/products/client/download.html
* http://www.musicbrainz.org/products/tunepimp/download.html
"""
----------------------------
And if akode isn't installed:
"""
aKode was not found. Without it the aKode aRts-plugin will not be
installed, and aRts will be unable to play many music formats.
"""

@ -35,44 +35,14 @@ untar_fn
listdocs_fn
## There are issues building with cmake - see README
USE_CMAKE_MM=${USE_CMAKE_MM:-no}
[[ $USE_CMAKE_MM == no ]] && {
## /usr/bin/ld: cannot find -ltqt-mt/-ltqt - for gentable build
[[ $TDEVERSION == 14.1.0 ]] && \
sed -i 's|(QT_LDFLAGS|(TQT_LDFLAGS|' noatun/library/Makefile.am
ltoolupdate_fn
chown_fn
cd_builddir_fn
CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \
CXX=$COMPILER_CXX \
../configure \
--prefix=$INSTALL_TDE \
--disable-rpath \
--enable-closure
true # don't go to cmake if ./configure fails
} || {
chown_fn
cd_builddir_fn
## akode is required for ARTS_AKODE
AKODE=OFF && [[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && AKODE=ON
## JUK requires musicbrainz and akode - ** to be completed for musicbrainz test **
JUK=OFF && [[ $AKODE == ON ]] && :
## akode is required for ARTS_AKODE plugin & JUK
[[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && aRts_AKODE=ON && JUK=ON
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \
@ -82,7 +52,7 @@ cmake \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
-DWITH_ALSA="ON" \
-DWITH_ARTS_AKODE="$AKODE" \
-DWITH_ARTS_AKODE="${aRts_AKODE:-OFF}" \
-DWITH_ARTS_AUDIOFILE="ON" \
-DWITH_ARTS_MPEGLIB="ON" \
-DWITH_ARTS_XINE="ON" \
@ -97,7 +67,7 @@ cmake \
-DWITH_VORBIS="ON" \
-DBUILD_ARTS="ON" \
-DBUILD_DOC="ON" \
-DBUILD_JUK="$JUK" \
-DBUILD_JUK="${JUK:-OFF}" \
-DBUILD_KABOODLE="ON" \
-DBUILD_KAPPFINDER_DATA="ON" \
-DBUILD_KAUDIOCREATOR="ON" \
@ -113,8 +83,6 @@ cmake \
-Wno-dev \
..
}
make_fn
installdocs_fn

@ -44,7 +44,7 @@ cd_builddir_fn
# If speex is installed, include it in the build for jingle
[[ -s /usr/include/speex/speex.h ]] && SPX="ON"
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -45,7 +45,7 @@ cd_builddir_fn
# If libcarddav is installed, include it in the build for korganizer
[[ -s $INSTALL_TDE/include/libcarddav/carddav.h ]] 2>/dev/null && LCARDDAV="ON"
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -39,7 +39,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -39,7 +39,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -44,7 +44,7 @@ cd_builddir_fn
## TDEFileReplace has been moved from tdewebdev for R14.1.0
[[ $TDEVERSION == 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON"
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -43,7 +43,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -52,7 +52,7 @@ sed -i "s|/opt/trinity|$INSTALL_TDE|" ../doc/man/*/*.1
## which defaults to $INSTALL_TDE/lib
## TDEFileReplace has been moved to tdeutils for R14.1.0
[[ $TDEVERSION != 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON"
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -46,7 +46,7 @@ chown_fn
cd_builddir_fn
## see README for cmake options
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -39,7 +39,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -39,7 +39,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -39,7 +39,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -39,7 +39,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -39,7 +39,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -39,7 +39,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -39,7 +39,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -39,7 +39,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \
@ -51,8 +51,7 @@ cmake \
-Wno-dev \
..
make ${NUMJOBS:-} || exit 1
make DESTDIR=$PKG install || exit 1
make_fn
installdocs_fn

@ -40,7 +40,7 @@ chown_fn
cd_builddir_fn
[[ $TDEVERSION == 14.1.0 ]] && QTINC_PFX=T
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -40,7 +40,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -47,7 +47,7 @@ chown_fn
cd_builddir_fn
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -87,8 +87,7 @@ CXX=$COMPILER_CXX \
--mandir=/usr/man \
--enable-ocaml=no
make $NUMJOBS || exit 1
make install-strip DESTDIR=$PKG || exit 1
make_fn
## The primary purpose of this build is for 'dot' for kscope, tdeedu, ...
## To include the pdf and html documentation, comment out this line:

@ -35,6 +35,7 @@ BUILD=${BUILD:-1}
ARCHIVE_TYPE="tar.bz2" && [[ $VERSION == 1.0.2 ]] && ARCHIVE_TYPE="tar.xz"
SRCURL="https://media.inkscape.org/dl/resources/file/$PRGNAM-$VERSION.$ARCHIVE_TYPE"
source ../../get-source.sh
## inkscape v1.0.2 for Slackware current needs gdl and double-conversion
# ### gdl and double-conversion - start
@ -62,9 +63,11 @@ for locale in $I18N
[[ $LOCALES == *$locale* ]] && echo $locale >> po/LINGUAS
done
./configure --libdir=/usr/local/lib$LIBDIRSUFFIX
make $NUMJOBS
DESTDIR=$TMP_BUILD/package-gdl make install
[[ $(cat $TMPVARS/BuildOptions) == *no_warn* ]] && C_Flags='CFLAGS=-w'
./configure --libdir=/usr/local/lib$LIBDIRSUFFIX ${C_Flags:-}
PKG=$TMP_BUILD/package-gdl
make_fn
cd $TMP_BUILD/package-gdl
makepkg -l y -c n $OUTPUT/gdl-3.34.0-$ARCH-$BUILD.txz
@ -80,9 +83,10 @@ cd double-conversion-3.1.5/
cd cmake/
# LIBDIRSUFFIX not required - builds to lib$LIBDIRSUFFIX ..
cmake ../ -DBUILD_SHARED_LIBS=ON
make $NUMJOBS
DESTDIR=$TMP_BUILD/package-double-conversion make install
cmake ${G_NINJA:-} ../ -DBUILD_SHARED_LIBS=ON
PKG=$TMP_BUILD/package-double-conversion
make_fn
cd $TMP_BUILD/package-double-conversion
makepkg -l y -c n $OUTPUT/double-conversion-3.1.5-$ARCH-$BUILD.txz
@ -99,7 +103,6 @@ echo -e "\n ############ \n\n\033[39;1m gdl and/or double-conversion are not ins
}
# ### gdl and double-conversion - end
source ../../get-source.sh
getsource_fn
untar_fn
@ -187,7 +190,7 @@ cd_builddir_fn
## INKSCAPE_INSTALL_LIBDIR is an addition for v1.0.2 and is relative to CMAKE_INSTALL_PREFIX/
## LIB_SUFFIX is used for v0.92.4
# ### TODO docs and man to /usr/local ..
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \

@ -57,7 +57,7 @@ chown_fn
cd build
cmake \
cmake ${G_NINJA:-} \
-DCMAKE_C_COMPILER=$COMPILER \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \

@ -37,23 +37,17 @@ getsource_fn
untar_fn
## patch for clang
echo $'
--- Makefile
+++ Makefile
@@ -21 +21 @@
-CC=cc
+CC=$(COMPILER)
' | while read line
do
patch -p0
done
sed -i 's|CC=cc|CC=$(COMPILER)|' Makefile
## suppress compiler warnings
[[ $(cat $TMPVARS/BuildOptions) == *no_warn* ]] && sed -i 's|Wall|& -w|' Makefile
listdocs_fn
chown_fn
make || exit 1
make DESTDIR=$PKG install || exit 1
DESTDIR=$PKG make install || exit 1
installdocs_fn

@ -11,10 +11,9 @@ For a native build, run **./BUILD-TDE.sh** - a dialog based script with a series
[<img src="https://ray-v.github.io/TDE-version.png">](https://ray-v.github.io/TDE-version.png)
The default is to install the packages as they are built, which is necessary initially for the required packages and for some interdependencies [for example, tdesdk requires tdepim].
The Required packages will need to be installed as they are built, because they provide dependencies for other TDE packages.
Run **INST=0 ./BUILD-TDE.sh** to build only.
This is a global option so can't be used where the build list includes packages which will need to be installed as dependencies for other packages in the build list.
Only building the packages is a global option. It therefore can't be used where the build list includes packages which will need to be installed as dependencies for other packages in the build list [for example tdesdk needs tdepim to be installed].
Any package, or set of packages, can be selected in the 'TDE Packages Selection' screen.
Information about dependencies for some packages has been added at the bottom of the dialog screen.
@ -29,15 +28,13 @@ If you're curious about what this might involve, [take a look at a sample build
***Other command line options*** that can be used to set some build parameters:
* TDE_MIRROR= - override the trinitydesktop.org geoIP redirector to use https - example, *https://trinitydesktop.mirrorservice.org/trinity*. URLs @ https://www.trinitydesktop.org/mirrorstatus.php
* BUILD= - sets the package build identifier, overriding the SlackBuild default of 1
* USE_CMAKE_MM=yes - to build tdemultimedia with cmake - see Core/tdemultimedia/README.
* VERBOSE=1 - show command lines during cmake builds; and error messages
---
***The directory structure*** for the SlackBuild scripts is in line with the Trinity release source repositories:
```
Deps [dependencies/]
Core []
Core [core/]
Libs [libraries/]
Apps [applications/]
```

@ -216,7 +216,7 @@ done
## - double quote $SLK[R]CFLAGS with cmake in the SBs for it to recognize the whole string
INST_RPATH="$TQTDIR/lib$LIBDIRSUFFIX"
[[ $TQTDIR != $INSTALL_TDE ]] && INST_RPATH="$INST_RPATH:$INSTALL_TDE/lib$LIBDIRSUFFIX"
SLKCFLAGS="-O2 ${SET_march:-}" # for Misc and libart-lgpl
SLKCFLAGS="-O2 ${NO_WARN:-} ${SET_march:-}" # for Misc and libart-lgpl
SLKRCFLAGS="$SLKCFLAGS -Wl,-rpath,'$INST_RPATH'" # for TQt/TDE
[[ $ARCH == x86_64 ]] && \
SLKCFLAGS="$SLKCFLAGS -fPIC" && \
@ -350,8 +350,12 @@ cd build-$PRGNAM
make_fn ()
{
make ${NUMJOBS:-} || exit 1
make DESTDIR=$PKG install || exit 1
[[ -s build.ninja ]] && {
MAKE_PRG=ninja && [[ ${VERBOSE:-} == 1 ]] && MAKE_PRG='ninja -v'
} || {
[[ ${VERBOSE:-} == 1 ]] && MAKE_PRG='make --debug=b'
}
DESTDIR=$PKG ${MAKE_PRG:-make} ${NUMJOBS:-} install || exit 1
}
installdocs_fn ()

Loading…
Cancel
Save