Revised koffice build -
to avoid installing libpng-1.4
added dialog screen to choose which applications to build
Added reverting chalk to krita to koffice-i18n build
Updated GraphicsMagick version
Updated graphviz version and source URL - issue 26
US English is the default language and support for additional languages can be included in the packages.
US English is the default language and support for additional languages can be included in the packages.
The final screen gives a summary of the build setup, with an option to cancel."\
The final screen gives a summary of the build setup, with an option to cancel."\
2075
1975
}
}
@ -629,32 +629,97 @@ done
rm -f $TMPVARS/Krita_OPTS
rm -f $TMPVARS/Krita_OPTS
dialog --cr-wrap --nocancel --no-shadow --colors --title " Building chalk in koffice " --item-help --checklist \
dialog --cr-wrap --nocancel --no-shadow --colors --title " Building chalk in koffice " --item-help --checklist \
"
"
There are three options that can be set up for building the imaging app in koffice.
There are three options that can be set up for building the imaging app.
[1] It is called \Zb\Z3chalk\Zn in TDE but is known as \Zb\Z3krita\Zn most other places.
[1] It is called \Zb\Z3chalk\Zn in TDE but was originally \Zb\Z3krita\Zn.
[2] .pngs loaded into chalk/krita will crash if it is built with libpng-1.6, but will load if libpng-1.4 is used for the build.
[2] .pngs saved from and loaded into chalk/krita will crash if it is built with libpng-1.6, but will load if libpng-1.4 is used.
If libpng is chosen here, it will be added to the build list and the package placed in $TMP - not installed. It will then be installed by koffice.SB if the libpng unversioned headers and libs are not linked to libpng14.
Choosing \Zb\Z3libpng14\Zn here will unpack the libpng-1.4 archive for the headers to be used. The library is installed with Slackware's aaa_libraries.
The koffice.SB will restore those links to libpng16 when the build has finished or failed.
Relevant files will be symlinked to the system libpng unversioned headers and libs if they are not linked to libpng14. Those symlinks will be reverted to libpng16 when the build has finished or failed.
This option will set libpng14 as the needed libpng for all koffice binaries in this build.
[3] GraphicsMagick will enable an extended range of image formats to be loaded and saved. ImageMagick should be an alternative, but building fails with that, so without GM, the range of supported image formats will be limited.
[3] GraphicsMagick will enable an extended range of image formats to be loaded and saved. ImageMagick should be an alternative, but building fails with that, so without GM, the range of supported image formats will be limited.
If GM is chosen here, it will be added to the build list if not already selected or installed."\
Choosing \Zb\Z3useGM\Zn here will add it to the build list if not already selected or installed.
30753\
"\
34753\
" krita""Set the app name to krita" on "\Zb\Z6 otherwise will be \Zb\Z3chalk\Zn"\
" krita""Set the app name to krita" on "\Zb\Z6 otherwise will be \Zb\Z3chalk\Zn"\
" libpng14""Build with libpng-1.4" on "\Zb\Z6 otherwise will be \Zb\Z3libpng-1.6\Zn"\
" libpng14""Build with libpng-1.4" on "\Zb\Z6 otherwise will be \Zb\Z3libpng-1.6\Zn"\
" useGM""Use GraphicsMagick" on "\Zb\Z6 \Zn"\
" useGM""Use GraphicsMagick" on "\Zb\Z6 \Zn"\
2> $TMPVARS/Krita_OPTS
2> $TMPVARS/Krita_OPTS
## If GM has been selected and isn't in the build list or installed, add it to the build list before koffice
## If GM has been selected and isn't in the build list or installed, add it to the build list before koffice
sed -ri "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"$TMP/$TDE_PFX$package-$(evalecho$version)-${LOG:-"${ARCH_i18n:-$ARCH}-$build-build"}-log ||${EXIT_FAIL:-"true"}
sed -ri "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"$TMP/$TDE_PFX$package-$(evalecho$version)-${LOG:-"${ARCH_i18n:-$ARCH}-$build-build"}-log ||${EXIT_FAIL:-"true"}
## skip build/packaging check and installation if only downloading sources
## skip build/packaging check and installation if only downloading sources
[[$PRE_DOWNLOAD== yes ]]||{
[[$PRE_DOWNLOAD== yes ]]||{
## tde-i18n package installation is handled in tde-i18n.SlackBuild because if more than one i18n package is being built, only the last one will be installed by upgradepkg here - test for last language in the I18N list to ensure they've all been built
## tde-i18n package installation is handled in tde-i18n.SlackBuild because if more than one i18n package is being built, only the last one will be installed by upgradepkg here - test for last language in the I18N list to ensure they've all been built
## install packages - any 'Cannot install /tmp/....txz: file not found' error message caused by build failure deliberately not suppressed.
## install packages - any 'Cannot install /tmp/....txz: file not found' error message caused by build failure deliberately not suppressed.
## create libpng-1.4 package only - it will be installed by the koffice.SB because it overrides libpng headers which for Sl14.2/current point to libpng16.
## libpng-1.4 package is a dummy. The libpng SB has been retained in case any future Slackware version no longer provides the libpng14 library.