Various updates 2022-04-03 ..

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
master
Ray-V 3 years ago
parent 79c7137d9d
commit d6d0cad778

@ -42,6 +42,20 @@ for dir in $langdir
do
cd $dir
## revert name 'chalk' to 'krita' if that has been done for koffice
[[ $(ls $INSTALL_TDE/lib64/*.so) == *krita* ]] && {
echo -e "\n Reverting chalk to krita for $dir .. \n"
## Rename files and contents:
mv ../template/messages/koffice/chalk.pot ../template/messages/koffice/krita.pot || true
mv messages/koffice/chalk.po messages/koffice/krita.po
mv docs/koffice/chalk docs/koffice/krita || true
mv docs/koffice/krita/toolbar-chalk.png docs/koffice/krita/toolbar-krita.png || true
sed -i -e 's/chalk/krita/g;s/Chalk/Krita/g' ../template/messages/koffice/{kofficefilters,krita}.pot
sed -i -e 's/chalk/krita/g;s/Chalk/Krita/g' messages/koffice/{kofficefilters,krita,desktop_koffice}.po
sed -i -e 's/chalk/krita/g;s/Chalk/Krita/g' configure.in
find docs/koffice -type f -exec sed -i -e 's/chalk/krita/g;s/Chalk/Krita/g' {} \; || true
}
ltoolupdate_fn
chown_fn

@ -30,14 +30,23 @@ TAG=${TAG:-_tde}
## ignore this if pre-downloading sources
[[ $PRE_DOWNLOAD != yes ]] && {
## build with libpng-1.4 - set in BUILD-TDE.sh - loading pngs in chalk/krita crashes with libpng16
## loading pngs saved/exported in chalk/krita crashes with libpng-1.6, so build with libpng-1.4
[[ $(cat $TMPVARS/Krita_OPTS) == *libpng14* ]] && \
[[ $(ls -l /usr/include/png.h) != *libpng14* ]] && \
{ installpkg $LIBPNG_TMP/libpng-1.4.22-$ARCH-*.txz || \
{ echo -e "\033[39;1m\n (re)install libpng-1.4 \n\033[0m" && \
exit
[[ $(ls -l /usr/include/png.h) != *libpng14* ]] && {
## if libpng is linked to libpng16, set a marker to restore it after the build
[[ $(ls -l /usr/lib64/libpng.so) == *libpng16* ]] && touch $TMPVARS/Restore-libpng16
## use the libpng14 library which is installed with the aaa_libraries package
ln -sf /usr/lib$LIBDIRSUFFIX/libpng14.so.14.22.0 /usr/lib$LIBDIRSUFFIX/libpng.so
## use the headers from the libpng-1.4 archive
ln -sf $TMP_BUILD/tmp-libpng/libpng-1.4.22/png.h /usr/include/png.h
ln -sf $TMP_BUILD/tmp-libpng/libpng-1.4.22/pngconf.h /usr/include/pngconf.h
## create libpng14.so if it doesn't exist
[[ ! -e /usr/lib$LIBDIRSUFFIX/libpng14.so ]] && {
ln -s /usr/lib$LIBDIRSUFFIX/libpng14.so.14.22.0 /usr/lib$LIBDIRSUFFIX/libpng14.so
## and set a marker to test after the build whether libpng14.so was created here
touch $TMPVARS/LPNG14so
}
} || true
} || true # exit 0 if libpng 1.4 is already installed as the system libpng
}
source ../../get-source.sh
@ -60,29 +69,25 @@ sed -i "s|Exec=.*$|Exec=$INSTALL_TDE/bin/chalk %U|" chalk/chalk.desktop
sed -i 's|(Magick-config|(Wand-config|' configure.in.in
## revert name 'chalk' to 'krita' - option set in BUILD-TDE.sh
[[ $(cat $TMPVARS/Krita_OPTS) == *krita* ]] && APP=krita && \
(echo -e "\n Reverting chalk to krita .. \n"
## but only if selected to be built at this time
[[ $(cat $TMPVARS/Krita_OPTS) == *krita* && $(cat $TMPVARS/DO_NOT_COMPILE) != *krita* ]] && {
echo -e "\n Reverting chalk to krita .. \n"
## Rename directories and files:
mv chalk krita
for file in $(find . -name "*chalk*")
do
rename chalk krita $file 2>/dev/null || true # errors will be corrected next loop
done
## repeat for instances of 'chalk' appearing twice:
for file in $(find . -name "*chalk*")
do
rename chalk krita $file
done
find . -name "*chalk*" |sort -r|xargs rename chalk krita
mv "krita/doc/Developing Chalk Plugins.odt" "krita/doc/Developing Krita Plugins.odt"
## Rename contents:
find . -type f -exec sed -i -e 's/chalk/krita/g' {} \;
find . -type f -exec sed -i -e 's/CHALK/KRITA/g' {} \;
find . -type f -exec sed -i -e 's/Chalk/Krita/g' {} \;
sed -i 's|Swedish for krita|Swedish for chalk|' krita/README)
find . -type f -exec sed -i -e 's/chalk/krita/g;s/CHALK/KRITA/g;s/Chalk/Krita/g' {} \;
sed -i 's|Swedish for krita|Swedish for chalk|' krita/README
} || sed -i 's|krita|chalk|' $TMPVARS/DO_NOT_COMPILE # otherwise chalk won't be in the DO_NOT_COMPILE list and chalk libraries will be built
## Don't need translation files unless additional language == Polish
[[ I18N != *pl* ]] && sed -i '/pl/d' kexi/tools/{add,delete}_column/Makefile.am
## This isn't actually needed, but it's reassuring to see from the configure output that the filter is being built ..
sed -i 's|KFORMULA$COMPILE_FILTER_KUGAR|&$COMPILE_FILTER_KRITA$COMPILE_FILTER_KIVIO$COMPILE_FILTER_KEXI|' filters/configure.in.mid
[[ $(cat $TMPVARS/DO_NOT_COMPILE) == *kross* ]] && SCRIPTING=--disable-scripting
listdocs_fn
ltoolupdate_fn
@ -91,6 +96,7 @@ chown_fn
cd_builddir_fn
DO_NOT_COMPILE=$(cat $TMPVARS/DO_NOT_COMPILE) \
CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \
@ -98,6 +104,7 @@ CXX=$COMPILER_CXX \
../configure \
--prefix=$INSTALL_TDE \
--disable-rpath \
${SCRIPTING:-} \
--enable-closure
make_fn
@ -123,7 +130,7 @@ $PRGNAM: common basis, which assures that all office applications can work
$PRGNAM: together.
$PRGNAM:
$PRGNAM: You can, for instance, insert a spreadsheet in a thesis without
$PRGNAM: leaving the document. Editing the [spreadsheet] happens _inside_
$PRGNAM: leaving the document. Editing [the spreadsheet] happens _inside_
$PRGNAM: the thesis.
$PRGNAM:
$PRGNAM:
@ -134,7 +141,7 @@ $PRGNAM:
makepkg_fn
## restore libpng16 links
[[ $(cat $TMPVARS/Krita_OPTS) == *libpng14* ]] && libpng16_fn || true
[[ -e $TMPVARS/Restore-libpng16 ]] && libpng16_fn && rm $TMPVARS/Restore-libpng16 || true
## restore libtqt-mt.la
[[ $INSTALL_TDE == /usr ]] && \

@ -19,7 +19,7 @@ rm -f $TMPVARS/PRE_DOWNLOAD
[[ -e $TMPVARS/TDEbuilds ]] || {
dialog --cr-wrap --no-shadow --colors --title " Introduction " --msgbox \
"
Build selected TDE packages and non-TDE dependencies for Slackware 14.2/current.
Build selected TDE packages and non-TDE dependencies for Slackware.
Source archives will be downloaded from a geoIP located mirror site and saved to the 'src' directory.
@ -28,7 +28,7 @@ dialog --cr-wrap --no-shadow --colors --title " Introduction " --msgbox \
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." \
20 75
19 75
}
@ -629,32 +629,97 @@ done
rm -f $TMPVARS/Krita_OPTS
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.
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.
The koffice.SB will restore those links to libpng16 when the build has finished or failed.
[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.
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.
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.
If GM is chosen here, it will be added to the build list if not already selected or installed." \
30 75 3 \
Choosing \Zb\Z3useGM\Zn here will add it to the build list if not already selected or installed.
" \
34 75 3 \
" 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" \
" useGM" "Use GraphicsMagick" on "\Zb\Z6 \Zn" \
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
GM_VERSION=$(grep VERSION:- $BUILD_TDE_ROOT/Misc/GraphicsMagick/GraphicsMagick.SlackBuild|cut -d- -f2|cut -d} -f1)
GM_VERSION=$(grep VERSION= $BUILD_TDE_ROOT/Misc/GraphicsMagick/GraphicsMagick.SlackBuild|cut -d= -f2)
[[ $(cat $TMPVARS/Krita_OPTS) == *useGM* ]] && \
[[ $(cat $TMPVARS/TDEbuilds) != *GraphicsMagick* ]] && \
[[ ! $(ls /var/log/packages/GraphicsMagick-$GM_VERSION*) ]] && \
sed -i 's|Apps/koffice|Misc/GraphicsMagick &|' $TMPVARS/TDEbuilds
## If libpng-1.4 has been selected and hasn't already been built, add it to the build list before koffice
PNG_VERSION=$(grep VERSION:- $BUILD_TDE_ROOT/Misc/libpng/libpng.SlackBuild|cut -d- -f2|cut -d} -f1)
## If libpng-1.4 has been selected, add it to the build list before koffice
[[ $(cat $TMPVARS/Krita_OPTS) == *libpng14* ]] && \
[[ ! $(ls $LIBPNG_TMP/libpng-$PNG_VERSION-*-1.txz) ]] && \
sed -i 's|Apps/koffice|Misc/libpng &|' $TMPVARS/TDEbuilds
rm -f $TMPVARS/Koffice_OPTS
[[ $(cat $TMPVARS/Krita_OPTS) == *krita* ]] && CHALK=krita
## fully populate the DO_NOT_COMPILE list and remove applications selected to be built
echo "autocorrect ${CHALK:-chalk} doc example filters karbon kchart kdgantt kexi kformula kivio koshell kounavail kplato kpresenter kross kspread kugar kword mimetypes pics plugins servicetypes templates tools" > $TMPVARS/DO_NOT_COMPILE
#
[[ $CHALK != krita ]] && {
# Using non-breaking space - U00a0 - in strings
app_c=" chalk"
about_c="Image creation and editing"
status_c=off
comment_c="\Zb\Z6 Needs filters and servicetypes \Zn"
} || {
app_k=" krita"
about_k="Image creation and editing"
status_k=off
comment_k="\Zb\Z6 Needs filters and servicetypes \Zn"
}
#
### for the record, --separate-output generates output without quotes
dialog --cr-wrap --nocancel --separate-output --no-shadow --colors --title " KOffice applications " --item-help --checklist \
"
Choose the applications to be built into koffice.
Filters and servicetypes are required for most apps.
" \
36 78 25 \
" ALL" "Build all applications" off "\Zb\Z6 Overrides any off/on selections below \Zn" \
" autocorrect" "Autocorrection for US English" off "\Zb\Z6 \Zn" \
${app_c:-} ${about_c:-} ${status_c:-} ${comment_c:-} \
" doc" "Application handbooks" off "\Zb\Z6 \Zn" \
" example" "KOffice Example Application" off "\Zb\Z6 \Zn" \
" filters" "Import/export filters" on "\Zb\Z6 \Zn" \
" karbon" "A scalable graphics editor" off "\Zb\Z6 Needs filters and servicetypes \Zn" \
" kchart" "Charts for visualizing numerical data" off "\Zb\Z6 \Zn" \
" kexi" "Integrated data management" off "\Zb\Z6 \Zn" \
" kformula" "A mathematical formula editor" off "\Zb\Z6 For use within other koffice applications \Zn" \
" kivio" "Flowcharting" off "\Zb\Z6 \Zn" \
" koshell" "KOffice Workspace" off "\Zb\Z6 \Zn" \
" kounavail" "A placeholder for an empty part" off "\Zb\Z6 \Zn" \
" kplato" "Project planning and management" off "\Zb\Z6 Required kdgantt will be included \Zn" \
" kpresenter" "Presentation" off "\Zb\Z6 \Zn" \
${app_k:-} ${about_k:-} ${status_k:-} ${comment_k:-} \
" kross" "Scripting engine for ${CHALK:-chalk}, kexi, kspread" off "\Zb\Z6 Write scripts in Ruby or Python \Zn" \
" kspread" "Spreadsheet" off "\Zb\Z6 \Zn" \
" kugar" "Database report creation" off "\Zb\Z6 \Zn" \
" kword" "Text editing, OASIS OpenDocument support" off "\Zb\Z6 \Zn" \
" mimetypes" "OASIS OpenDocument .desktop files" off "\Zb\Z6 \Zn" \
" pics" "Crystalsvg icons" off "\Zb\Z6 \Zn" \
" plugins" "Scan for ${CHALK:-chalk}, kpresenter, and kword" off "\Zb\Z6 \Zn" \
" servicetypes" "ServiceType .desktop files" on "\Zb\Z6 \Zn" \
" templates" "Templates for the New menu in Konqueror" off "\Zb\Z6 \Zn" \
" tools" "CLI document converter, tdeio_thumbnail module, etc" off "\Zb\Z6 \Zn" \
2> $TMPVARS/Koffice_OPTS
[[ $(grep -o ALL $TMPVARS/Koffice_OPTS) ]] && echo "" > $TMPVARS/DO_NOT_COMPILE || {
## change nbsp to space if chalk/krita in build list
sed -i "s| | |" $TMPVARS/Koffice_OPTS
for app in $(cat $TMPVARS/Koffice_OPTS)
do
sed -i "s|$app||" $TMPVARS/DO_NOT_COMPILE
done
## kdgantt is a required build-time dependency for kplato
[[ $(cat $TMPVARS/DO_NOT_COMPILE) != *kplato* ]] && sed -i 's|kdgantt||' $TMPVARS/DO_NOT_COMPILE
}
}
## only run this if kvkbd has been selected
@ -733,12 +798,13 @@ Create and/or update the git repositories local copies.
initially as selective updating is not supported
* Local repositories will be created/updated as each package is built
OR can be downloaded before the build -> see next screen
* For Misc archive downloads
\Zr\Z4\ZbNo\Zn
* The build will use sources already downloaded
" \
19 75
20 75
[[ $? == 0 ]] && echo yes > $TMPVARS/DL_CGIT
[[ $? == 1 ]] && echo no > $TMPVARS/DL_CGIT
}
@ -1010,16 +1076,18 @@ do
LOG="" && [[ $PRE_DOWNLOAD == yes ]] && LOG="source_download"
script -c "sh $package.SlackBuild" $TMP/$TDE_PFX$package-$(eval echo $version)-${LOG:-"${ARCH_i18n:-$ARCH}-$build-build"}-log || ${EXIT_FAIL:-"true"}
## if koffice was building with libpng14, and libpng was previously set to libpng16, restore the libpng16 installation
[[ -e $TMPVARS/Restore-libpng16 ]] && source $BUILD_TDE_ROOT/get-source.sh && libpng16_fn && rm $TMPVARS/Restore-libpng16 || true
# remove colorizing escape sequences from build-log
# Re: http://serverfault.com/questions/71285/in-centos-4-4-how-can-i-strip-escape-sequences-from-a-text-file
sed -ri "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $TMP/$TDE_PFX$package-$(eval echo $version)-${LOG:-"${ARCH_i18n:-$ARCH}-$build-build"}-log || ${EXIT_FAIL:-"true"}
## skip build/packaging check and installation if only downloading sources
[[ $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
[[ $package == tde-i18n ]] && package=$package-$(cat $TMPVARS/LASTLANG)
#
## Check that the package has been created,
## and if so, remove package name from TDEbuilds list
[[ $(ls $TMP/$TDE_PFX$package-$(eval echo $version)-*-$build*.txz) ]] && \
@ -1029,13 +1097,11 @@ echo "
Error: $TDE_PFX$package package ${LOG:-build} failed
Check the ${LOG:-build} log $TMP/$TDE_PFX$package-$(eval echo $version)-${LOG:-"${ARCH_i18n:-$ARCH}-$build-build"}-log
"
## if koffice was building with libpng14, restore the libpng16 headers for any following builds
[[ $(cat $TMPVARS/Krita_OPTS) == *libpng14* ]] && source $BUILD_TDE_ROOT/get-source.sh && libpng16_fn || true
## implement 'Action on failure'
${EXIT_FAIL:-":"}
}
## 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.
[[ $INST == 1 ]] && [[ $package != tde-i18n* ]] && [[ $package != libpng ]] && upgradepkg --install-new --reinstall $TMP/$TDE_PFX$package-$(eval echo $version)-*-$build*.txz
}

@ -24,7 +24,7 @@
# SUCH DAMAGE.
PRGNAM=GraphicsMagick
VERSION=1.3.34
VERSION=1.3.36
BUILD=${BUILD:-1}
TAG=${TAG:-}

@ -11,6 +11,6 @@ gts is an optional dependency.
------------------------------
pdf and html documentation is not built by default in the SlackBuild.
To build it, comment out 'rm -rf $PKG/usr/share/$PRGNAM/doc' in the script [c. line 95].
pdf and html documentation is not built by default.
To build it, use the GVZ_DOCS=1 command line option as detailed in the SlackBuild.

@ -26,23 +26,23 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=graphviz
VERSION=2.46.1
VERSION=2.50.0
BUILD=${BUILD:-1}
TAG=${TAG:-}
ARCHIVE_TYPE="tar.xz"
SRCURL="https://ftp.osuosl.org/pub/blfs/conglomeration/graphviz/graphviz-$VERSION.$ARCHIVE_TYPE"
SRCURL="https://gitlab.com/api/v4/projects/4207231/packages/generic/$PRGNAM-releases/$VERSION/$PRGNAM-$VERSION.$ARCHIVE_TYPE"
source ../../get-source.sh
getsource_fn
untar_fn
# Fix for php-5.4 and patches from Arch (thanks!)
patch -N -p0 << EOF || true
# ghostscript918.patch from Arch (thanks!)
patch -p0 << EOF
--- plugin/gs/gvloadimage_gs.c
+++ plugin/gs/gvloadimage_gs.c
@@ -76,11 +76,11 @@
@@ -74,11 +74,11 @@
assert (err < 0);
@ -57,18 +57,34 @@ patch -N -p0 << EOF || true
errsrc = "DPS error";
else
errsrc = "Ghostscript internal error";
EOF
# Fix for php-5.4
patch -p0 << EOF
--- tclpkg/gv/gv_php_init.c
+++ tclpkg/gv/gv_php_init.c
@@ -26,2 +26,3 @@
{
@@ -27,2 +27,3 @@
+ TSRMLS_FETCH();
return PHPWRITE(s, len);
@@ -31,2 +32,3 @@
{
}
@@ -33,2 +34,3 @@
+ TSRMLS_FETCH();
return PHPWRITE(s, len);
}
EOF
## The primary purpose of this build is for 'dot' for kscope, tdeedu, ...
## To include the pdf and html documentation, build with 'GVZ_DOCS=1 ./BUILD-TDE.sh'
[[ ! ${GVZ_DOCS:-} ]] && {
patch -p0 << EOF
--- Makefile.in
+++ Makefile.in
@@ -623 +623 @@
-SUBDIRS = \$(subdirs) lib plugin cmd tclpkg doc contrib share graphs rtest tests
+SUBDIRS = \$(subdirs) lib plugin cmd tclpkg contrib share graphs rtest tests
EOF
sed -i '/tcldot.html/d' tclpkg/tcldot/Makefile.in
}
listdocs_fn
chown_fn
@ -87,10 +103,6 @@ CXX=$COMPILER_CXX \
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:
rm -rf $PKG/usr/share/$PRGNAM/doc
# Install config file for PHP.
mkdir -p $PKG/etc/php.d
cat << EOF > $PKG/etc/php.d/graphviz.ini.new
@ -157,7 +169,7 @@ $PRGNAM: It has several main graph layout programs. It also has
$PRGNAM: web and interactive graphical interfaces, and auxiliary
$PRGNAM: tools, libraries, and language bindings.
$PRGNAM:
$PRGNAM: Homepage: http://graphviz.org/
$PRGNAM: Homepage: graphviz.org
$PRGNAM:
$PRGNAM:
$PRGNAM:

@ -33,6 +33,13 @@ getsource_fn
untar_fn
## exit the build here as only the headers are required for the koffice [chalk/krita] build
## but retain this script in case libpng14 is dropped from aaa_libraries in future
## and libpng14.so.14.22.0 needs to be built.
## Set a dummy package to remain compatible with the build system
touch $LIBPNG_TMP/libpng-1.4.22-x86_64-${BUILD:-1}.txz
exit
listdocs_fn
chown_fn

@ -3,8 +3,8 @@
---
***Build TDE [Trinity Desktop Environment]***
.. for Slackware 14.2 or current on i586+ and x86_64.
.. see 'Cross compiling for RPi3' for building for armv7/aarch64.
.. for Slackware [x86_64/i586+/arm], and [Slarm64](http://slarm64.org/download.html) [aarch64].
See 'Cross compiling for RPi3' for building for arm_hf and aarch64.
For a native build, run **./BUILD-TDE.sh** - a dialog based script with a series of screens for user input,
which will build the release version 14.0.11, or the development versions 14.0.x, 14.1.0.
@ -30,6 +30,8 @@ If you're curious about what this might involve, [take a look at a sample build
URLs for this and other locations are @ https://www.trinitydesktop.org/mirrorstatus.php
* BUILD= - sets the package build identifier, overriding the SlackBuild default of 1
* GCC_VIS=0 - override setting gcc visibility if it has been set ON in tdelibs
* FEAT= - for development builds - see get-source.sh
* GVZ_DOCS=1 - see graphviz.SlackBuild
---
@ -48,7 +50,7 @@ src - to hold all the sources, either pre-downloaded
```
Other scripts:
```
get-source.sh - a chunk of common code for the SlackBuilds
get-source.sh - common code for the SlackBuilds
- used for getting the sources, setting FLAGS,
creating build directories, ...
```
@ -106,7 +108,7 @@ cd tde-slackbuilds
git checkout gh-pages
```
which can be viewed [online](https://ray-v.github.io/tde-slackbuilds/cross-compiling-TDE-for-the-RPi3.html).
which can be [viewed online](https://ray-v.github.io/tde-slackbuilds/cross-compiling-TDE-for-the-RPi3.html).
Includes:
* Setting parameters for a 32-bit [armv7 hard float], or 64-bit [aarch64], build,

@ -395,7 +395,6 @@ cat $PKG/install/slack-desc | grep "^$PRGNAM" | grep -v handy > $OUTPUT/$PRGNAM-
umask ${_UMASK_}
}
## paths in doinst.sh should be relative to allow for installation to ROOT != "/"
doinst_sh_fn ()
{
@ -413,14 +412,15 @@ echo "
libpng16_fn ()
{
(cd /usr/bin
ln -sf libpng16-config libpng-config )
## restore libpng16 links
(cd /usr/include
ln -sf libpng16/pngconf.h pngconf.h
ln -sf libpng16/png.h png.h )
(cd /usr/lib$LIBDIRSUFFIX/pkgconfig
ln -sf libpng16.pc libpng.pc )
(cd /usr/lib$LIBDIRSUFFIX
ln -sf libpng16.so libpng.so
ln -sf libpng16.la libpng.la )
ln -sf libpng16.so libpng.so )
## if libpng14.so has been created for this build, remove it
[[ -e $TMPVARS/LPNG14so ]] && {
rm /usr/lib$LIBDIRSUFFIX/libpng14.so
rm $TMPVARS/LPNG14so
}
}

Loading…
Cancel
Save