Updates 10 December 2023

clamav and inkscape versions
master
Ray-V 12 months ago
parent 88044b45d2
commit 41d8accfa0

@ -33,8 +33,8 @@ source ../../get-source.sh
## klamav needs clamav as a build time requirement ## klamav needs clamav as a build time requirement
[[ $(cat $TMPVARS/PRE_DOWNLOAD) != yes ]] && { [[ $(cat $TMPVARS/PRE_DOWNLOAD) != yes ]] && {
# ### clamav - start # ### clamav - start
clamav_VERS=1.2.0 clamav_VERS=1.2.1
clamav_installed_fn () { pkg-config libclamav ;} clamav_installed_fn () { pkg-config --atleast-version=$clamav_VERS libclamav ;}
## If it's already installed, go to end ## If it's already installed, go to end
clamav_installed_fn || { clamav_installed_fn || {
## otherwise, if the source archive is in 'src' .. ## otherwise, if the source archive is in 'src' ..
@ -94,7 +94,7 @@ strip_fn
cd $TMP_BUILD/package-clamav cd $TMP_BUILD/package-clamav
makepkg -l y -c n $OUTPUT/clamav-$clamav_VERS-$ARCH-$BUILD.txz makepkg -l y -c n $OUTPUT/clamav-$clamav_VERS-$ARCH-$BUILD.txz
installpkg $OUTPUT/clamav-$clamav_VERS-$ARCH-$BUILD.txz upgradepkg --install-new --reinstall $OUTPUT/clamav-$clamav_VERS-$ARCH-$BUILD.txz
) )
clamav_installed_fn && echo " clamav_installed_fn && echo "
now building klamav" || { echo -e "\033[39;1m now building klamav" || { echo -e "\033[39;1m
@ -111,7 +111,7 @@ echo -e "
( cd $BUILD_TDE_ROOT/src ( cd $BUILD_TDE_ROOT/src
wget https://www.clamav.net/downloads/production/clamav-$clamav_VERS.tar.gz ) wget https://www.clamav.net/downloads/production/clamav-$clamav_VERS.tar.gz )
\033[0m \033[0m
and re-run this script .. and re-run ./BUILD-TDE.sh, choosing Re-use ..
############ ############
" ; exit 1 ; } " ; exit 1 ; }

@ -24,7 +24,7 @@
# SUCH DAMAGE. # SUCH DAMAGE.
PRGNAM=inkscape PRGNAM=inkscape
VERSION=1.3 VERSION=1.3.2
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
ARCHIVE_TYPE="tar.xz" ARCHIVE_TYPE="tar.xz"
@ -100,7 +100,7 @@ echo -e "
( cd $BUILD_TDE_ROOT/src ( cd $BUILD_TDE_ROOT/src
wget https://github.com/google/double-conversion/archive/v3.3.0.tar.gz ) wget https://github.com/google/double-conversion/archive/v3.3.0.tar.gz )
\033[0m \033[0m
and re-run this script .. and re-run ./BUILD-TDE.sh, choosing Re-use ..
############ ############
" ; exit 1 ; } " ; exit 1 ; }
@ -115,7 +115,7 @@ untar_fn
sed -i 's|set(CMAKE_INSTALL_RPATH.*$|set(CMAKE_INSTALL_RPATH $ORIGIN)|' src/3rdparty/2geom/CMakeLists.txt sed -i 's|set(CMAKE_INSTALL_RPATH.*$|set(CMAKE_INSTALL_RPATH $ORIGIN)|' src/3rdparty/2geom/CMakeLists.txt
sed -i 's|libdir=.*$|libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@|' src/3rdparty/2geom/2geom.pc.in sed -i 's|libdir=.*$|libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@|' src/3rdparty/2geom/2geom.pc.in
### only build for required locales ### only build for required locales, always including en[_US]
## .. for translations and slack-desc ## .. for translations and slack-desc
locas="" locas=""
## .. for tutorials ## .. for tutorials
@ -127,12 +127,14 @@ I18N_SVG="about.svg start-welcome-text.svg"
# #
for locale in $I18N for locale in $I18N
do do
locas="$locas $locale" # only add translations where inkscape supports the locale
[[ $(grep $locale po/LINGUAS) ]] && locas="$locas $locale"
tuts="$tuts $(ls share/tutorials/*.$locale.*)" || true tuts="$tuts $(ls share/tutorials/*.$locale.*)" || true
pods="$pods $(ls man/*.$locale.pod.in)" || true pods="$pods $(ls man/*.$locale.pod.in)" || true
[[ -s share/screens/start-welcome-text.$locale.svg ]] && I18N_SVG="$I18N_SVG start-welcome-text.$locale.svg" && COUNT_TEXT=$[${COUNT_TEXT:-}+1] [[ -s share/screens/start-welcome-text.$locale.svg ]] && I18N_SVG="$I18N_SVG start-welcome-text.$locale.svg" && COUNT_TEXT=$[${COUNT_TEXT:-}+1]
COUNT_I18N=$[${COUNT_I18N:-}+1] COUNT_I18N=$[${COUNT_I18N:-}+1]
done done
[[ ${locas:-} ]] && NLS=ON
# #
pos=$(echo $locas | sed 's| |.po |g;s|$|.po|') pos=$(echo $locas | sed 's| |.po |g;s|$|.po|')
sed -i "s|*.po|$pos|" po/CMakeLists.txt sed -i "s|*.po|$pos|" po/CMakeLists.txt
@ -160,7 +162,6 @@ cd_builddir_fn
##| /usr/bin/ld: lib/libinkscape_base.so: undefined reference to `__atomic_load' ##| /usr/bin/ld: lib/libinkscape_base.so: undefined reference to `__atomic_load'
## Override the LIBATOMIC_NOT_NEEDED test in DefineDependsandFlags.cmake to add -latomic to the linker flags ## Override the LIBATOMIC_NOT_NEEDED test in DefineDependsandFlags.cmake to add -latomic to the linker flags
[[ $COMPILER == clang && $ARCH == i586 ]] && LIBATOMIC=-DLIBATOMIC_NOT_NEEDED=0 [[ $COMPILER == clang && $ARCH == i586 ]] && LIBATOMIC=-DLIBATOMIC_NOT_NEEDED=0
## options have been pulled from CMakeLists.txt ## options have been pulled from CMakeLists.txt
cmake ${G_NINJA:-} ${LIBATOMIC:-} \ cmake ${G_NINJA:-} ${LIBATOMIC:-} \
-DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \
@ -191,7 +192,7 @@ cmake ${G_NINJA:-} ${LIBATOMIC:-} \
-DWITH_LPETOOL="OFF" \ -DWITH_LPETOOL="OFF" \
-DLPE_ENABLE_TEST_EFFECTS="OFF" \ -DLPE_ENABLE_TEST_EFFECTS="OFF" \
-DWITH_MANPAGE_COMPRESSION="ON" \ -DWITH_MANPAGE_COMPRESSION="ON" \
-DWITH_NLS="ON" \ -DWITH_NLS="${NLS:-OFF}" \
-DWITH_OPENMP="ON" \ -DWITH_OPENMP="ON" \
-DWITH_PROFILING="OFF" \ -DWITH_PROFILING="OFF" \
-DWITH_SVG2="ON" \ -DWITH_SVG2="ON" \

Loading…
Cancel
Save