Updates from olevenets2 patches 2-23 for clang builds and tdm

Updated sources for libpng14 and graphviz
Re-arranged BUILD-TDE.sh packages list
Removed some READMEs and added comments in SBs
Moved patch files into SBs
Added runlevel option and README for tdebase build
pull/25/head
Ray-V 7 years ago
parent e43650b8e1
commit 5491a8bd04

@ -78,8 +78,6 @@ endif(NOT GETTEXT_MSGFMT_EXECUTABLE)
# set support for additional language(s) as per I18N variable
# but only for languages available with this package
langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
echo $langs
#
## output list of available locales ...
ls -1 po | while read line
do

@ -1 +0,0 @@
bonoboui is optional dep.

@ -43,6 +43,7 @@ langs="";for Lang in $I18N;do [[ -e po/$Lang/gtkqtengine.po ]] && langs="$langs
chown_fn
## BONOBO will be included in the build if installed
cd_builddir_fn
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \

@ -1,5 +0,0 @@
Needs k3b.
This SB is configured with
--enable-k3bdevices do not activate hal/dbus support (use k3bdevice instead)

@ -58,7 +58,7 @@ CXX="g++" \
--mandir=${INSTALL_TDE}/man \
--disable-rpath \
--enable-closure \
--enable-k3bdevices
--enable-k3bdevices # do not activate hal/dbus support (use k3bdevice instead)
make_fn

@ -30,9 +30,10 @@ TAG=${TAG:-_tde}
## build with libpng-1.4 - set in BUILD-TDE.sh - loading pngs in chalk/krita crashes with libpng16
LIBPNG_VERSION=$(grep VERSION:- ../../Misc/libpng/libpng.SlackBuild | grep -o [.0-9]*)
[[ ${USE_PNG14:-} == yes ]] && \
[[ $(ls -l /usr/include/png.h) != *libpng14* ]] && \
{ installpkg $LIBPNG_TMP/libpng-1.4.20-$ARCH-1.txz || \
{ installpkg $LIBPNG_TMP/libpng-$LIBPNG_VERSION-$ARCH-1.txz || \
{ echo -e "\033[39;1m\n (re)install libpng-1.4 \n\033[0m" && \
exit
}

@ -33,6 +33,38 @@ getsource_fn
untar_fn
## patches for building with clang
echo $'
--- krusader/Konfigurator/kgstartup.cpp
+++ krusader/Konfigurator/kgstartup.cpp
@@ -58,3 +58,4 @@
- KONFIGURATOR_NAME_VALUE_PAIR comboItems[ profileList.count() ];
- for(unsigned int i=0; i != profileList.count(); i++ )
- comboItems[ i ].text = comboItems[ i ].value = profileList [ i ];
+ const int profileListCount = profileList.count();
+ KONFIGURATOR_NAME_VALUE_PAIR *comboItems = new KONFIGURATOR_NAME_VALUE_PAIR[ profileListCount ];
+ for( unsigned int i=0; i != profileListCount; i++ )
+ comboItems[ i ].text = comboItems[ i ].value = profileList[ i ];
@@ -63,2 +64,2 @@
- profileCombo = createComboBox( "Startup", "Starter Profile Name", comboItems[ 0 ].value, comboItems, profileList.count(), panelsGrp, false, false );
- profileCombo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+ profileCombo = createComboBox( "Startup", "Starter Profile Name", comboItems[ 0 ].value, comboItems, profileListCount, panelsGrp, false, false );
+ profileCombo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
@@ -65,0 +67,2 @@
+
+ delete [] comboItems;
--- krusader/Panel/krview.h
+++ krusader/Panel/krview.h
@@ -209 +209 @@
-
+ static TQPixmap getIcon(vfile *vf);
@@ -227 +226,0 @@
- static TQPixmap getIcon(vfile *vf);
' | while read line
do
patch -p0
done
listdocs_fn
ltoolupdate_fn

@ -1,3 +0,0 @@
If ksquirrel is to be built with exif and Kipi Plugins support, build and install kipi-plugins first.
Needs libksquirrel.

@ -1 +0,0 @@
Potracegui is a graphical frontend for potrace, which is in turn a bitmap tracing program.

@ -1,3 +0,0 @@
If Gwenview is to be built with Kipi Plugins support,
build and install kipi-plugins first.

@ -99,23 +99,13 @@ Set the directory that TDE is to be installed in.
rm -f $TMPVARS/COMPILER
dialog --cr-wrap --nocancel --no-shadow --colors --title " Select The Compiler You Wish To Use " --menu \
dialog --cr-wrap --no-shadow --colors --yes-label "clang" --no-label "gcc" --defaultno --title " Compiler " --yesno \
"
Here you can select the compiler you wish to use to compile TDE.
Your choices are \Zb\Z3GCC\Zn and \Zb\Z3Clang\Zn
This is a matter of personal preference and not a necessity, but the option exist.
If you're not sure which to select, you should probably just use \Zb\Z3GCC\Zn.
Please note: the corresponding \Zb\Z3C++\Zn compiler will be chosen for you based on your \Zb\Z3C\Zn compiler selection.
So if you choose \Zb\Z3GCC\Zn, the \Zb\Z3g++\Zn compiler will be used. And if you choose \Zb\Z3Clang\Zn then \Zb\Z3clang++\Zn will be used.
Choose which compiler to use - \Zb\Z6gcc/g++\Zn or \Zb\Z6clang/clang++\Zn
" \
23 77 2 \
"gcc" "GCC" \
"clang" "Clang" \
2> $TMPVARS/COMPILER
8 75
[[ $? == 0 ]] && echo clang > $TMPVARS/COMPILER
[[ $? == 1 ]] && echo gcc > $TMPVARS/COMPILER
rm -f $TMPVARS/SET_MARCH
@ -162,7 +152,7 @@ dialog --cr-wrap --defaultno --no-shadow --colors --ok-label " 2 / 3 " --cancel-
\Zb\Z0 [[ use any arrow key x2 to activate the input box for editing ]]\Zn
" \
21 75 "$(echo $NATIVE_MARCH)" \
18 75 "$(echo $NATIVE_MARCH)" \
2> $TMPVARS/SET_MARCH && break
EXITVAL=$?
[[ $EXITVAL == 1 ]] && echo $DEFAULT_MARCH > $TMPVARS/SET_MARCH && break
@ -200,7 +190,7 @@ Set the number of simultaneous jobs for make to whatever your system will suppor
" \
11 75 ${NUMJOBS:-"-j6"} \
2> $TMPVARS/NUMJOBS
##
rm -f $TMPVARS/I18N
EXITVAL=2
@ -341,7 +331,7 @@ dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Packages Selectio
"
Required builds for a basic working TDE are marked \Zb\Zr\Z4R\Zn.
The packages selected form the build list and so dependencies are listed before the packages that need them.
The packages selected form the build list and so dependencies are listed before the packages that need them. After the \Zb\Zr\Z4R\Znequired packages, the listing is grouped Core/Libs/Apps and then alphabetically, excluding tde prefixes added to package names, and the dependencies.
Look out for messages in the bottom line of the screen, especially relating to dependencies.
@ -354,29 +344,29 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD
"Deps/dbus-1-tqt" "\Zb\Zr\Z4R\Zn D-Bus bindings" ${SELECT:-off} "\Zb\Z6 \Zn" \
"Deps/libart_lgpl" "\Zb\Zr\Z4R\Zn The LGPL'd component of libart" ${SELECT:-off} "\Zb\Z6 \Zn" \
"Deps/tqca-tls" "\Zb\Zr\Z4R\Zn Plugin to provide SSL/TLS capability" ${SELECT:-off} "\Zb\Z6 \Zn" \
"Deps/avahi-tqt" "Avahi support" off "\Zb\Z6 Requires Avahi \Zn" \
"Deps/avahi-tqt" "Avahi support" off "\Zb\Z6 Requires Avahi. Optional for tdelibs and used by default if installed. \Zn" \
"Core/tdelibs" "\Zb\Zr\Z4R\Zn TDE libraries" ${SELECT:-off} "\Zb\Z6 \Zn" \
"Core/tdebase" "\Zb\Zr\Z4R\Zn TDE base" ${SELECT:-off} "\Zb\Z6 \Zn" \
"Core/tdeutils" "Collection of utilities including ark" off "\Zb\Z6 \Zn" \
"Core/tdemultimedia" "Multimedia packages for TDE" off "\Zb\Z6 \Zn" \
"Core/tde-i18n" "Additional language support for TDE" off "\Zb\Z6 Required when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \
"Core/tdeaccessibility" "Accessibility programs" off "\Zb\Z6 \Zn" \
"Core/tdeadmin" "System admin packages" off "\Zb\Z6 \Zn" \
"Core/tdeartwork" "Extra artwork/themes/wallpapers for TDE" off "\Zb\Z6 \Zn" \
"Core/tdegraphics" "Misc graphics apps" off "\Zb\Z6 \Zn" \
"Core/tdeedu" "Educational software" off "\Zb\Z6 \Zn" \
"Core/tdegames" "Games for TDE - atlantik, kasteroids, katomic, etc." off "\Zb\Z6 \Zn" \
"Core/tdegraphics" "Misc graphics apps" off "\Zb\Z6 \Zn" \
"Core/tdemultimedia" "Multimedia packages for TDE" off "\Zb\Z6 \Zn" \
" Misc/speex" "Audio compression format designed for speech" off "\Zb\Z6 Buildtime option for tdenetwork and amarok. Requires l/speexdsp \Zn" \
"Core/tdenetwork" "Networking applications for TDE" off "\Zb\Z6 Optional build-time dependency - speex \Zn" \
"Deps/libcaldav" "Calendaring Extensions to WebDAV" off "\Zb\Z6 Optional dependency for korganizer [tdepim] \Zn" \
"Deps/libcarddav" "Online address support" off "\Zb\Z6 Optional dependency for korganizer [tdepim] \Zn" \
"Core/tdepim" "Personal Information Management" off "\Zb\Z6 \Zn" \
"Core/tdeaddons" "Additional plugins and scripts" off "\Zb\Z6 \Zn" \
"Core/tdeaddons" "Additional plugins and scripts" off "\Zb\Z6 Optional plugins from tdegames, tdemultimedia, tdepim \Zn" \
"Core/tdesdk" "Tools used by TDE developers" off "\Zb\Z6 Requires tdepim \Zn" \
"Core/tdevelop" "TDE development programs" off "\Zb\Z6 Requires tdesdk \Zn" \
"Core/tdetoys" "TDE Amusements" off "\Zb\Z6 \Zn" \
"Core/tdeedu" "Educational software" off "\Zb\Z6 \Zn" \
"Core/tdewebdev" "Quanta Plus and other applications" off "\Zb\Z6 \Zn" \
"Core/tdeutils" "Collection of utilities including ark" off "\Zb\Z6 \Zn" \
"Core/tdevelop" "TDE development programs" off "\Zb\Z6 Requires tdesdk \Zn" \
" Misc/tidy-html5" "Corrects and cleans up HTML and XML documents" off "\Zb\Z6 Runtime option for Quanta+ [tdewebdev] \Zn" \
" Misc/speex" "Audio compression format designed for speech" off "\Zb\Z6 Buildtime option for tdenetwork and amarok. Requires l/speexdsp \Zn" \
"Core/tdenetwork" "Networking applications for TDE" off "\Zb\Z6 Optional build-time dependency - speex \Zn" \
"Core/tdeadmin" "System admin packages" off "\Zb\Z6 \Zn" \
"Core/tdeaccessibility" "Accessibility programs" off "\Zb\Z6 \Zn" \
"Core/tde-i18n" "Additional language support for TDE" off "\Zb\Z6 Required when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \
"Core/tdewebdev" "Quanta Plus and other applications" off "\Zb\Z6 \Zn" \
"Libs/tdelibkdcraw" "Decode RAW picture files" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel \Zn" \
"Libs/tdelibkexiv2" "Library to manipulate picture metadata" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel. Needs l/exiv2... \Zn" \
"Libs/tdelibkipi" "A common plugin structure" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel \Zn" \
@ -385,9 +375,9 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD
"Libs/libksquirrel" "A set of image codecs for KSquirrel" off "\Zb\Z6 Required for ksquirrel. Buildtime options include l/netpbm, t/transfig [fig2dev], Misc/xmedcon \Zn" \
"Apps/abakus" "PC calculator" off "\Zb\Z6 optional dependency l/mpfr which requires l/gmp \Zn" \
" Misc/libmp4v2" "Create and modify mp4 files" off "\Zb\Z6 Buildtime option for Amarok \Zn" \
" Misc/moodbar" "GStreamer plugin for Amarok for moodbar feature" off "\Zb\Z6 Runtime option for Amarok \Zn" \
" Misc/yauap" "simple commandline audio player" off "\Zb\Z6 Provides an optional engine for Amarok \Zn" \
"Apps/tdeamarok" "A Music Player" off "\Zb\Z6 Optional dependencies - xine-lib, libmp4v2, speex, moodbar \Zn" \
" Misc/moodbar" "GStreamer plugin for Amarok for moodbar feature" off "\Zb\Z6 Runtime option for Amarok \Zn" \
"Apps/digikam" "A digital photo management application + Showfoto viewer" off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi. \Zn" \
"Apps/dolphin" "Dolphin file manager for TDE" off "\Zb\Z6 A d3lphin.desktop file is included - see dolphin.SlackBuild. \Zn" \
"Apps/tdefilelight" "Graphical diskspace display" off "\Zb\Z6 Runtime requirement x/xdpyinfo \Zn" \
@ -397,48 +387,76 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD
"Apps/tdegwenview-i18n" "Internationalization files for gwenview." off "\Zb\Z6 Required for tdegwenview when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \
"Apps/tdek3b" "The CD Creator" off "\Zb\Z6 \Zn" \
"Apps/tdek3b-i18n" "Internationalization files for tdek3b." off "\Zb\Z6 Required for tdek3b when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \
"Apps/k9copy" "A DVD backup utility" off "\Zb\Z6 Requires tdek3b and ffmpeg \Zn" \
"Apps/k9copy" "A DVD backup utility" off "\Zb\Z6 Requires [tde]k3b and ffmpeg \Zn" \
"Apps/kaffeine" "Media player for TDE" off "\Zb\Z6 \Zn" \
"Apps/kbfx" "Alternate menu for TDE" off "\Zb\Z6 \Zn" \
"Apps/kbookreader" "Twin-panel text files viewer esp. for reading e-books." off "\Zb\Z6 \Zn" \
"Apps/kdbg" "GUI for gdb using TDE" off "\Zb\Z6 \Zn" \
"Apps/kdbusnotification" "A DBUS notification to TDE interface" off "\Zb\Z6 \Zn" \
"Apps/kile" "A TEX and LATEX source editor and shell" off "\Zb\Z6 \Zn" \
"Apps/knemo" "The TDE Network Monitor" off "\Zb\Z6 \Zn" \
"Apps/knights" "A graphical chess interface" off "\Zb\Z6 \Zn" \
"Apps/knmap" "A graphical nmap interface" off "\Zb\Z6 Might need tdesudo \Zn" \
" Misc/GraphicsMagick" "Swiss army knife of image processing" off "\Zb\Z6 Buildtime option for chalk[krita] \Zn" \
" Misc/GraphicsMagick" "Swiss army knife of image processing" off "\Zb\Z6 Buildtime option for chalk[krita] in koffice \Zn" \
"Apps/koffice" "Office Suite" off "\Zb\Z6 Optional build-time dependencies - GraphicsMagick/libpng14 [for chalk/krita] \Zn" \
"Apps/koffice-i18n" "Internationalization files for koffice" off "\Zb\Z6 Required for koffice when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \
"Apps/krusader" "File manager for TDE" off "\Zb\Z6 \Zn" \
"Apps/ksensors" "A graphical interface for sensors" off "\Zb\Z6 Runtime requirement ap/lm_sensors \Zn" \
"Apps/kscope" "A source-editing environment for C and C-style languages." off "\Zb\Z6 Runtime options cscope [d/cscope], ctags [ap/vim], dot [graphviz] \Zn" \
" Misc/graphviz" "Graph Visualization" off "\Zb\Z6 Runtime option for kscope. pdf/html docs not built by default \Zn" \
"Apps/kscope" "A source-editing environment for C and C-style languages." off "\Zb\Z6 Runtime options cscope [d/cscope], ctags [ap/vim], dot [graphviz] \Zn" \
"Apps/kshutdown" "Shutdown utility for TDE" off "\Zb\Z6 \Zn" \
"Apps/ksquirrel" "An image viewer with OpenGL and KIPI support." off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi libksquirrel. \Zn" \
"Apps/kvpnc" "TDE frontend for various vpn clients" off "\Zb\Z6 Miscellaneous documentation will be in $(cat $TMPVARS/INSTALL_TDE)/doc/kvpnc-$(cat $TMPVARS/TDEVERSION) \Zn" \
"Apps/tdektorrent" "A BitTorrent client for TDE" off "\Zb\Z6 \Zn" \
"Apps/kaffeine" "Media player for TDE" off "\Zb\Z6 \Zn" \
"Apps/rosegarden" "Audio sequencer and musical notation editor" off "\Zb\Z6 Requires jack-audio-connection-kit liblo and dssi for proper funtionality \Zn" \
"Apps/kbfx" "Alternate menu for TDE" off "\Zb\Z6 \Zn" \
"Apps/kvkbd" "A virtual keyboard for TDE" off "\Zb\Z6 \Zn" \
"Apps/kvpnc" "TDE frontend for various vpn clients" off "\Zb\Z6 Miscellaneous documentation will be in $(cat $TMPVARS/INSTALL_TDE)/doc/kvpnc-$(cat $TMPVARS/TDEVERSION) \Zn" \
"Apps/piklab" "IDE for PIC microcontrollers" off "\Zb\Z6 \Zn" \
" Misc/potrace" "For tracing bitmaps to a vector graphics format" off "\Zb\Z6 Required for potracegui \Zn" \
"Apps/potracegui" "A GUI for potrace" off "\Zb\Z6 Requires potrace \Zn" \
"Apps/rosegarden" "Audio sequencer and musical notation editor" off "\Zb\Z6 Requires jack-audio-connection-kit liblo and dssi for proper funtionality \Zn" \
"Apps/soundkonverter" "frontend to various audio converters" off "\Zb\Z6 \Zn" \
"Apps/tde-style-lipstik" "lipstik theme" off "\Zb\Z6 \Zn" \
"Apps/tde-style-qtcurve" "QtCurve theme" off "\Zb\Z6 \Zn" \
"Apps/tdeio-locate" "TDE frontend for the locate command" off "\Zb\Z6 \Zn" \
"Apps/tdesudo" "Graphical frontend for the sudo command" off "\Zb\Z6 \Zn" \
"Apps/twin-style-crystal" "twin theme" off "\Zb\Z6 \Zn" \
"Apps/tdmtheme" "tdm theme editor module" off "\Zb\Z6 \Zn" \
"Apps/kdbg" "GUI for gdb using TDE" off "\Zb\Z6 \Zn" \
"Apps/twin-style-crystal" "twin theme" off "\Zb\Z6 \Zn" \
"Apps/yakuake" "Quake-style terminal emulator" off "\Zb\Z6 \Zn" \
"Apps/soundkonverter" "frontend to various audio converters" off "\Zb\Z6 \Zn" \
"Apps/krusader" "File manager for TDE" off "\Zb\Z6 \Zn" \
"Apps/piklab" "IDE fot PIC microcontrollers" off "\Zb\Z6 \Zn" \
"Apps/kdbusnotification" "A DBUS notification to TDE interface" off "\Zb\Z6 \Zn" \
"Apps/kvkbd" "A virtual keyboard for TDE" off "\Zb\Z6 \Zn" \
" Misc/inkscape" "SVG editor" off "\Zb\Z6 Requires lxml if online help facility is required. \Zn" \
" Misc/lxml" "Python bindings for libxml2 and libxslt" off "\Zb\Z6 Required to use Inkscape online help \Zn" \
" Misc/inkscape" "SVG editor - an alternative to potrace, potracegui [and GraphicsMagick]." off "\Zb\Z6 Requires lxml if online help facility is required. \Zn" \
2> $TMPVARS/TDEbuilds
# successful builds are removed from the TDEbuilds list by '$dir ' so add a space to the last entry
# and the " needs to be removed because the Misc entries are double-quoted
sed -i -e 's|$| |' -e 's|"||g' $TMPVARS/TDEbuilds
## only run this if tdebase has been selected
[[ $(grep -o tdebase $TMPVARS/TDEbuilds) ]] && {
rm $TMPVARS/RUNLEVEL
EXITVAL=2
until [[ $EXITVAL -lt 2 ]] ; do
dialog --cr-wrap --no-shadow --yes-label "4" --no-label "3" --help-button --help-label "README" --colors --defaultno --title " TDM " --yesno \
"
TDM is included in the tdebase build.
Choose whether to boot into the GUI and login with TDM - runlevel \Zb\Z64\Zn
or
boot into a terminal - runlevel \Zb\Z63\Zn - the Slackware default.
This option can be overridden later by editing /etc/inittab.
" \
13 75
EXITVAL=$?
[[ $EXITVAL == 0 ]] && echo 4 > $TMPVARS/RUNLEVEL
[[ $EXITVAL == 1 ]] && echo 3 > $TMPVARS/RUNLEVEL
[[ $EXITVAL == 2 ]] && dialog --cr-wrap --no-shadow --colors --ok-label "Return" --msgbox \
"
$(cat Core/tdebase/README)
" \
30 75
done
}
## only run this if building koffice has been selected
[[ $(sed 's|koffice-||' $TMPVARS/TDEbuilds | grep -o Apps/koffice) ]] && \
{
@ -502,6 +520,7 @@ fi;fi;fi
export TDEVERSION=$(cat $TMPVARS/TDEVERSION)
export INSTALL_TDE=$(cat $TMPVARS/INSTALL_TDE)
export COMPILER=$(cat $TMPVARS/COMPILER)
[[ $COMPILER == gcc ]] && export COMPILER_CXX="g++" || export COMPILER_CXX="clang++"
export SET_march=$(cat $TMPVARS/SET_MARCH)
export ARCH=$(cat $TMPVARS/ARCH) # set again for the 'continue' option
export TDE_MIRROR=mirror.ppa.trinitydesktop.org/trinity
@ -511,14 +530,11 @@ export TQT_DOCS=$(cat $TMPVARS/TQT_DOCS)
export EXIT_FAIL=$(cat $TMPVARS/EXIT_FAIL)
export KEEP_BUILD=$(cat $TMPVARS/KEEP_BUILD)
export PREPEND=$(cat $TMPVARS/PREPEND)
export RUNLEVEL=$(cat $TMPVARS/RUNLEVEL)
# these exports are for koffice.SB
[[ $(cat $TMPVARS/Krita_OPTS) == *krita* ]] && export REVERT=yes
[[ $(cat $TMPVARS/Krita_OPTS) == *libpng14* ]] && export USE_PNG14=yes
# See which compiler was selected and use the appropriate C++ compiler
[[ $(cat $TMPVARS/COMPILER) == gcc ]] && export COMPILER_CXX="g++" || export COMPILER_CXX="clang++"
# Is this a 64 bit system?
# 'uname -m' won't identify a 32 bit system with a 64 bit kernel
[[ ! -d /lib64 ]] && LIBDIRSUFFIX="" || LIBDIRSUFFIX="64"
@ -549,15 +565,18 @@ export ARM_FABI=$(readelf -Ah $(which bash)|grep -oE "soft|hard")
[[ $(cat $TMPVARS/build-new) != no ]] && NEW_BUILD=yes || NEW_BUILD='no - re-use existing'
## Action on failure
AOF=$(echo $EXIT_FAIL|cut -d" " -f1)
## if tdebase selected, runlevel selected
[[ $(grep -o tdebase $TMPVARS/TDEbuilds) ]] && [[ $RUNLEVEL ]] && {
TDMRL=\\Zb\\Z6$RUNLEVEL\\Zn
} && SHADERL=" "
## koffice - only if it is being built
[[ $(sed 's|koffice-||' $TMPVARS/TDEbuilds | grep -o Apps/koffice) ]] && \
{
[[ $(sed 's|koffice-||' $TMPVARS/TDEbuilds | grep -o Apps/koffice) ]] && {
[[ $REVERT == yes ]] && RVT=\\Zb\\Z6yes\\Zn || RVT=\\Zb\\Z6no\\Zn
} && {
[[ $(cat $TMPVARS/Krita_OPTS) == *useGM* ]] && USE_GM=\\Zb\\Z6yes\\Zn || USE_GM\\Zb\\Z6=no\\Zn
} && {
[[ $USE_PNG14 == yes ]] && USE_PNG=\\Zb\\Z6yes\\Zn || USE_PNG=\\Zb\\Z6no\\Zn
} && SHADE=" "
} && SHADEKO=" "
## start dialog
EXITVAL=2
until [[ $EXITVAL -lt 2 ]] ; do
@ -576,7 +595,8 @@ Include tqt html docs \Zb\Z6$TQT_DOCS\Zn
Action on failure \Zb\Z6${AOF:-continue}\Zn
Keep the temporary build files \Zb\Z6$KEEP_BUILD\Zn
Pre-select required [\Zb\Zr\Z4R\Zn] builds \Zb\Z6$(cat $TMPVARS/SELECT|sed 's|off|no|;s|on|yes|')\Zn
Prepend TDE libs paths \Zb\Z6${PREPEND:-no}\Zn${SHADE:-\Z0\Zb}
Prepend TDE libs paths \Zb\Z6${PREPEND:-no}\Zn${SHADERL:-\Z0\Zb}
Runlevel for TDM ${TDMRL:-n/a}\Zn${SHADEKO:-\Z0\Zb}
koffice:
revert chalk to krita ${RVT:-n/a}
build with libpng14 ${USE_PNG:-n/a}

@ -1,19 +1,34 @@
Add this to /etc/rc.d/rc.4 to start tdm
TDM
# Start TDM:
if [ -x /usr/bin/tdm ]; then
exec /usr/bin/tdm -nodaemon
fi
\ZuInstalling tdebase\ZU
In line with normal practice, tdmrc will not be overwritten and tdmrc.new will be installed for admin decision on whether to use it as tdmrc. Where tdmrc doesn't exist, it will be created by doinst.sh from tdmrc.new.
If you installed with a different prefix than /usr then you need to
adjust the path to the tdm binary.
\Zuroot logins\ZU
AllowRootLogin is set to true in tdmrc.new, and will therefore be the default for new installations.
--------------------
\Zurc.4.local\ZU
This has been included on the assumption that the standard entry in rc.4[.new] from the package sysvinit-scripts exists:
Konqueror file manager as-built defaults to 'Icon View' when starting.
Setting 'Tree View' and saving that view profile should then default
to 'Tree View' when starting kfm or opening it in a new tab - the former
works but not the latter.
# If you'd like to start something different or in a
# different order than the options below, create your
# own startup script /etc/rc.d/rc.4.local and make it
# executable and it will be used instead:
if [ -x /etc/rc.d/rc.4.local ]; then
exec /bin/bash /etc/rc.d/rc.4.local
fi
To enable tdm if this isn't the case, either
[1] add this test to rc.4 above other session manager options
or
[2] copy the contents of rc.4.local to rc.4 above other session manager options
\ZuRunlevel\ZU
Set this to 4 and tdm should work out-of-the-box, especially for new installations.
------------------
\ZuKonqueror file manager\ZU as-built defaults to 'Icon View' when starting.
Setting 'Tree View' and saving that view profile should then default to 'Tree View' when starting kfm or opening it in a new tab - the former works but not the latter.
The problem seems to be that TDE lacks the entry in konquerorrc that exists in KDE3:
[MainView Settings]
@ -28,4 +43,3 @@ Until this is sorted out in the source code, this hack works:
3] echo -e "\n\n[MainView Settings]\nViewMode=konq_treeview" >> ~/.trinity/share/config/konquerorrc
That's it.

@ -1,14 +1,14 @@
# Save old config files:
if [ ! -L etc/X11/tdm ]; then
if [ -d etc/X11/tdm ]; then
mkdir -p etc/tde/tdm
cp -a etc/X11/tdm/* etc/tde/tdm
mkdir -p etc/trinity/tdm
cp -a etc/X11/tdm/* etc/trinity/tdm
rm -rf etc/X11/tdm
( cd etc/X11 ; ln -sf /etc/tde/tdm tdm )
( cd etc/X11 ; ln -sf /etc/trinity/tdm tdm )
fi
elif [ ! -e etc/X11/tdm ]; then
mkdir -p etc/X11
( cd etc/X11 ; ln -sf /etc/tde/tdm tdm )
( cd etc/X11 ; ln -sf /etc/trinity/tdm tdm )
fi
@ -23,8 +23,8 @@ config() {
fi
# Otherwise, we leave the .new copy for the admin to consider...
}
config etc/tde/tdm/tdmrc.new
config etc/tde/tdm/backgroundrc.new
config etc/trinity/tdm/tdmrc.new
config etc/trinity/tdm/backgroundrc.new
# Update the desktop database:
if [ -x usr/bin/update-desktop-database ]; then

@ -4,7 +4,7 @@ if ( ! $?TDEDIR ) then
setenv TDEDIR ${INSTALL_TDE}
endif
if ( $?XDG_CONFIG_DIRS ) then
setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/tde/xdg
setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/trinity/xdg
else
setenv XDG_CONFIG_DIRS /etc/xdg:/etc/tde/xdg
setenv XDG_CONFIG_DIRS /etc/xdg:/etc/trinity/xdg
endif

@ -3,8 +3,8 @@
TDEDIR=${INSTALL_TDE}
export TDEDIR
if [ ! "$XDG_CONFIG_DIRS" = "" ]; then
XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/tde/xdg
XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/trinity/xdg
else
XDG_CONFIG_DIRS=/etc/xdg:/etc/tde/xdg
XDG_CONFIG_DIRS=/etc/xdg:/etc/trinity/xdg
fi
export XDG_CONFIG_DIRS

@ -0,0 +1,9 @@
#! /bin/sh
# Start TDM:
if [ -x ${INSTALL_TDE}/bin/tdm ]; then
echo "Using TDM (Trinity Login Manager)."
echo
# log_cleanup "/var/log/tdm.log"
exec ${INSTALL_TDE}/bin/tdm -nodaemon -error /var/log/tdm.log
fi

@ -52,7 +52,7 @@ cd_builddir_fn
-DCMAKE_CXX_COMPILER=${COMPILER_CXX} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \
-DSYSCONF_INSTALL_DIR="/etc/tde" \
-DSYSCONF_INSTALL_DIR="/etc/trinity" \
-DMAN_INSTALL_DIR=${INSTALL_TDE}/man \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DWITH_OPENEXR="ON" \
@ -98,9 +98,15 @@ sed "s|\${INSTALL_TDE}|${INSTALL_TDE}|g" < $SRCDIR/profile.d/tde.csh > $PKG/etc/
chmod 755 $PKG/etc/profile.d/tde.{,c}sh
# Add some configuration files / scripts needed by TDE.
mkdir -p ${PKG}/etc/tde
mv ${PKG}/${INSTALL_TDE}/share/config/tdm ${PKG}/etc/tde/tdm
( cd ${PKG}/${INSTALL_TDE}/share/config ; ln -sf /etc/tde/tdm tdm )
mkdir -p ${PKG}/etc/trinity
mv ${PKG}/${INSTALL_TDE}/share/config/tdm ${PKG}/etc/trinity/tdm
( cd ${PKG}/${INSTALL_TDE}/share/config ; ln -sf /etc/trinity/tdm tdm )
# Add rc.4.local to give TDM priority over rc.4 X11 session manager options
# Assumes that rc.4.new from sysvinit-scripts still has the rc.4.local option
mkdir ${PKG}/etc/rc.d
sed "s|\${INSTALL_TDE}|${INSTALL_TDE}|" < $SRCDIR/rc.4.local > $PKG/etc/rc.d/rc.4.local
chmod 755 $PKG/etc/rc.d/rc.4.local
# Set sane permissions for the include files.
if [ -d ${PKG}/${INSTALL_TDE}/include ]; then
@ -112,14 +118,19 @@ mkdir -p ${PKG}/usr/share/apps/tdm/sessions
cp ${PKG}/${INSTALL_TDE}/share/apps/tdm/sessions/tde.desktop ${PKG}/usr/share/apps/tdm/sessions/
# Setup config files for TDM:
${PKG}/${INSTALL_TDE}/bin/gentdmconf --no-old --no-old-scripts --no-backup --in ${PKG}/etc/tde/tdm
${PKG}/${INSTALL_TDE}/bin/gentdmconf --no-old --no-old-scripts --no-backup --in ${PKG}/etc/trinity/tdm
## set correct paths for config files
sed -i 's|/opt/trinity/share/config/tdm/|/etc/trinity/tdm/|' ${PKG}/etc/trinity/tdm/tdmrc
# Allow root to login
cat ${PKG}/etc/tde/tdm/tdmrc | perl -pi -e 's|AllowRootLogin=false|AllowRootLogin=true|' > ${PKG}/etc/tde/tdm/tdmrc.new
mv ${PKG}/etc/tde/tdm/Xsession ${PKG}/etc/tde/tdm/Xsession.orig
cat ${SRCDIR}/config/Xsession | sed "s|PREFIX|${INSTALL_TDE}|g" > ${PKG}/etc/tde/tdm/Xsession
mv ${PKG}/etc/tde/tdm/backgroundrc ${PKG}/etc/tde/tdm/backgroundrc.new
if [[ -r ${PKG}/${INSTALL_TDE}/etc/tde/tdm/README ]]; then
sed -i "s|${TMP}/package-tdebase/etc/tde/tdm|/etc/tde/tdm|" ${PKG}/${INSTALL_TDE}/etc/tde/tdm/README
sed 's|AllowRootLogin=false|AllowRootLogin=true|' ${PKG}/etc/trinity/tdm/tdmrc > ${PKG}/etc/trinity/tdm/tdmrc.new
## Remove tdmrc which has AllowRootLogin=false set and would be used for a new installation
## The installed tdmrc will be created by doinst.sh from tdmrc.new if it doesn't exist
rm ${PKG}/etc/trinity/tdm/tdmrc
mv ${PKG}/etc/trinity/tdm/Xsession ${PKG}/etc/trinity/tdm/Xsession.orig
cat ${SRCDIR}/config/Xsession | sed "s|\${INSTALL_TDE}|${INSTALL_TDE}|" > ${PKG}/etc/trinity/tdm/Xsession
mv ${PKG}/etc/trinity/tdm/backgroundrc ${PKG}/etc/trinity/tdm/backgroundrc.new
if [[ -r ${PKG}/${INSTALL_TDE}/etc/trinity/tdm/README ]]; then
sed -i "s|${TMP}/package-tdebase/etc/trinity/tdm|/etc/trinity/tdm|" ${PKG}/${INSTALL_TDE}/etc/trinity/tdm/README
fi
mkdir_install_fn
@ -147,5 +158,11 @@ $PRGNAM: Home: https://www.trinitydesktop.org/index.php
" > $PKG/install/slack-desc
sed -e "s|\${INSTALL_TDE}|${INSTALL_TDE}|g" -e "s|\$TQTDIR|$TQTDIR|g" < $SRCDIR/doinst.sh > $PKG/install/doinst.sh
[[ $RUNLEVEL == 4 ]] && {
echo "
## set default runlevel to 4 for tdm
sed -i 's|id:[1-5]|id:4|' etc/inittab
" >> $PKG/install/doinst.sh
}
makepkg_fn

@ -1,13 +0,0 @@
diff --git a/tdeabc/tests/testaddresseelist.cpp b/tdeabc/tests/testaddresseelist.cpp
index 12964a6..20617ba 100644
--- a/tdeabc/tests/testaddresseelist.cpp
+++ b/tdeabc/tests/testaddresseelist.cpp
@@ -17,7 +17,7 @@ static const TDECmdLineOptions options[] =
TDECmdLineLastOption
};
-int main(int /*argc*/,char /* **argv*/)
+int main(int /*argc*/, char** /*argv*/)
{
/* TDEAboutData aboutData("testaddresseelist","TestAddresseeList","0.1");
TDECmdLineArgs::init(argc, argv, &aboutData);

@ -32,12 +32,23 @@ source ../../get-source.sh
getsource_fn
untar_fn
## patch for building with clang
echo $'
--- tdeabc/tests/testaddresseelist.cpp
+++ tdeabc/tests/testaddresseelist.cpp
@@ -20,1 +20,1 @@
-int main(int /*argc*/,char /* **argv*/)
+int main(int /*argc*/, char** /*argv*/)
' | while read line
do
patch -p0
done
listdocs_fn
chown_fn
patch -p1 < $SRCDIR/patches/build-with-clang.patch
# Check for avahi-tqt
[[ $(ls /var/log/packages/avahi-tqt-*) ]] && AVAHI="ON"

@ -39,6 +39,19 @@ source ../../get-source.sh
getsource_fn
untar_fn
## patch for building with clang
echo $'
--- noatun/library/noatunarts/StereoVolumeControl_impl.cpp
+++ noatun/library/noatunarts/StereoVolumeControl_impl.cpp
@@ -74,1 +74,1 @@
- void calculateBlock(unsigned long samples)
+ void calculateBlock(unsigned long samples) __attribute__((noinline))
' | while read line
do
patch -p0
done
listdocs_fn
chown_fn

@ -1,3 +0,0 @@
If you have libgadu and meanwhile, you can turn the two
protocol switches that are set to "OFF" to "ON"
in the SlackBuild

@ -44,6 +44,7 @@ chown_fn
cd_builddir_fn
## If changing any of these options, READ CMakeLists.txt for info on interdependencies ..
## GADU & MEANWHILE require libgadu and meanwhile installed.
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \

@ -1,2 +0,0 @@
check the cmakelist in the source code to see if support for your laptop
can be enabled =D

@ -36,6 +36,7 @@ listdocs_fn
chown_fn
## See CMakeLists.txt for specific laptop support
cd_builddir_fn
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \

@ -1,10 +1,6 @@
Not all mimetypes are detected. Files without extensions and things like slack-desc
have no default assosiations.
Not all mimetypes are detected. Files without extensions and things like slack-desc have no default associations.
Anyone know a fix? Besides just manually doing this in the settings after installing.
TDM isn't working right at the moment. At least installed outside of /usr. It appears
that it's launching the xterm failsafe by default no matter what session is picked.
Several things from the Apps dir aren't compiling with Clang. So even if you select to build
with Clang, GCC is used. I will keep checking on these in future release and updates to Clang in Slackware

@ -11,4 +11,4 @@ gts is an optional dependency.
------------------------------
pdf and html documentation is not built by default in the SB.
To build it, comment out 'source $SRCDIR/patches && rmdoc' in the script [c. line 97].
To build it, comment out 'rmdoc' in the script [c. line 70].

@ -26,16 +26,17 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=graphviz
VERSION=${VERSION:-2.38.0}
VERSION=${VERSION:-2.40.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_tde}
SRCURL="http://graphviz.org/pub/graphviz/stable/SOURCES/$PRGNAM-$VERSION.tar.gz"
SRCURL="https://ftp.osuosl.org/pub/blfs/conglomeration/graphviz/graphviz-$VERSION.tar.gz"
ARCHIVE_TYPE="tar.gz"
source ../../get-source.sh
getsource_fn
untar_fn
listdocs_fn
chown_fn

@ -13,14 +13,15 @@ sed -i 's|/php/modules|/php/extensions|' configure
patches() {
echo $'--- lib/cgraph/scan.l
+++ lib/cgraph/scan.l
@@ -152,1 +152,1 @@
- agerr(AGWARN,agxbuse(&xb));
+ agerr(AGWARN, "%s", agxbuse(&xb));
@@ -228,1 +228,1 @@
- agerr(AGERR,agxbuse(&xb));
+ agerr(AGERR, "%s", agxbuse(&xb));
echo $'#scan.l patch not required for 2.40.1
#--- lib/cgraph/scan.l
#+++ lib/cgraph/scan.l
#@@ -152,1 +152,1 @@
#- agerr(AGWARN,agxbuse(&xb));
#+ agerr(AGWARN, "%s", agxbuse(&xb));
#@@ -228,1 +228,1 @@
#- agerr(AGERR,agxbuse(&xb));
#+ agerr(AGERR, "%s", agxbuse(&xb));
--- plugin/gs/gvloadimage_gs.c
+++ plugin/gs/gvloadimage_gs.c
@@ -72,11 +72,11 @@

@ -1 +0,0 @@
All-in-one package to create and edit SVGs from bitmaps - an alternative to potrace, potracegui [and GraphicsMagick].

@ -21,7 +21,7 @@
# SUCH DAMAGE.
PRGNAM=libpng
VERSION=${VERSION:-1.4.20}
VERSION=${VERSION:-1.4.22}
BUILD=${BUILD:-1}
TAG=${TAG:-}

@ -32,7 +32,7 @@ VERSION=${VERSION:-3.5.0}
BUILD=${BUILD:-1}
TAG=${TAG:-}
SRCURL="http://pypi.python.org/packages/source/l/$PRGNAM/$PRGNAM-$VERSION.tar.gz"
SRCURL="https://files.pythonhosted.org/packages/source/l/lxml/lxml-$VERSION.tar.gz"
ARCHIVE_TYPE="tar.gz"
source ../../get-source.sh
getsource_fn

@ -1 +0,0 @@
If tidy is installed, it can be used as an option in Quanta plus [tdewebdev].

@ -66,7 +66,6 @@ cmake ../.. \
-DTIDY_CONSOLE_SHARED="ON" \
-DBUILD_TAB2SPACE="ON" \
-DBUILD_SAMPLE_CODE="OFF" \
-DTIDY_COMPAT_HEADERS="OFF" \
-DSUPPORT_LOCALIZATIONS=${LOCALize:-"OFF"}
chown_fn

@ -1,4 +1,4 @@
Build TDE [Trinity Desktop Environment] for Slackware 14.2 and current on i586, x86_64, or Raspberry Pi3 [see README-Raspberry-Pi3.md].
Build TDE [Trinity Desktop Environment] for Slackware 14.2 and current on i586+, x86_64, or Raspberry Pi3 [see README-Raspberry-Pi3.md].
Run ./BUILD-TDE.sh - a dialog based script with a series of screens for user input.
@ -36,13 +36,13 @@ Required packages for a basic working TDE are:
i18n support [locale and html/help docs] in the packages is restricted to whatever is selected in BUILD-TDE.sh and, of that, to whatever is available in the package source.
TDM may need some manual setting up - see Core/tdebase/README
See https://wiki.trinitydesktop.org/How_to_Build_TDE_Core_Modules for more information
=========================================================
NOTE: The Misc directory contains SlackBuilds for software you might already have from slackbuilds.org or elsewhere.
Please check to see if you have them or not already if you can't remember for sure. If you already have them
there is no need to select them to be compiled and built. Though you can do this anyways if you want to replace the
ones you have, but there is no need for this.
NOTE: The Misc directory contains SlackBuilds for software that might already be installed from slackbuilds.org or elsewhere.
Please check because any misc builds selected here could overwrite them.
***Please be sure to read the KNOWN-ISSUES file prior to building.***

@ -1,3 +0,0 @@
Huge thanks to Ray-V for doing basically all of this.
Thanks to everyone else who had input and helped in any way as well.
There's no way I could have done this myself.
Loading…
Cancel
Save