Updates 28 April 2025 for 14.1.4 release

cmake builds - digikam, ksquirrel, ktorrent
 added 'ka' to supported locales lists
 misc builds revision updates - graphviz, imlib2, inkscape, xmedcon
master
Ray-V 8 months ago
parent 2b08f8cacd
commit affefc992f

@ -33,41 +33,32 @@ getsource_fn
untar_fn
# set support for additional language(s) as per I18N variable
# but only for languages available with this package
langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang";done
sed -i "s|SUBDIRS =.*$|SUBDIRS =.$langs|" po/Makefile.am
# only package help documents where they exist for the languages being included
ldocs="" # for slack-desc
langdocdk="digikam";for Lang in $langs;do [[ -d doc/$Lang"_digikam" ]] && langdocdk=$(echo $Lang"_digikam" $langdocdk) && ldocs="$ldocs $Lang";done
langdocsf="showfoto";for Lang in $langs;do [[ -d doc/$Lang"_showfoto" ]] && langdocsf=$(echo $Lang"_showfoto" $langdocsf);done
sed -i "s|SUBDIRS =.*$|SUBDIRS =. $langdocdk $langdocsf|" doc/Makefile.am
## fix check for visibility support - tde-common-admin pull #20
sed -i 's| Q_EXPORT| TQ_EXPORT|' admin/acinclude.m4.in
## for slack-desc
langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
ldocs="";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
listdocs_fn
ltoolupdate_fn
chown_fn
cd_builddir_fn
[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility"
pkg-config sqlite3 && SYS_SQL3="--without-included-sqlite3"
CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \
CXX=$COMPILER_CXX \
../configure \
--prefix=$INSTALL_TDE \
--mandir=$INSTALL_TDE/man \
${EN_GCC_VIS:-} \
${SYS_SQL3:-} \
--disable-rpath \
--enable-closure
# If building with additional language support, showfoto doesn't run using the language selected
# because showfoto.mo files are not being built.
# This duplicates the digikam .mo files and therefore takes up additional disk space where a symlink only is required
<<'option'
sed -i 's|BUILD_TRANSLATIONS )|&\
project( showfoto )\
tde_conditional_add_project_translations( BUILD_TRANSLATIONS )|' ../CMakeLists.txt
option
# SQLITE3 is a requirement for the build
# If a system version isn't found, the included source will be used
# Check for system SQLite3:
pkg-config sqlite3 && INT_SQL3="OFF"
cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_LOCAL_SQLITE3=${INT_SQL3:-"ON"}
make_fn
@ -91,6 +82,9 @@ ln -s digikam.mo showfoto.mo)
done
fi
# The apidocs folders are empty
rm -rf $PKG$INSTALL_TDE/share/doc/tde/HTML/en/digikam-apidocs
doinst_sh_fn
echo "

@ -33,7 +33,7 @@ source ../../get-source.sh
## klamav needs clamav as a build time requirement
[[ $(cat $TMPVARS/PRE_DOWNLOAD) != yes ]] && {
# ### clamav - start
clamav_VERS=1.4.1
clamav_VERS=1.4.2
clamav_installed_fn () { pkg-config --atleast-version=$clamav_VERS libclamav ;}
## If it's already installed, go to end
clamav_installed_fn || {

@ -37,40 +37,21 @@ untar_fn
tar xf $SB_SRCDIR/ksquirrel-en-docs.tar.xz
cp doc/ru/*png doc/en
# 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
sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am
langs=$(echo $langs | sed 's|.po||g')
# Only Russian and English help documents are in the source,
# if Russian is not required, only package English docs
ldocs="ru"
[[ $I18N != *ru* ]] && sed -i "s| ru||" doc/Makefile.am && ldocs=""
## fix check for visibility support - tde-common-admin pull #20
sed -i 's| Q_EXPORT| TQ_EXPORT|' admin/acinclude.m4.in
## for slack-desc
langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
ldocs="en";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
listdocs_fn
ltoolupdate_fn
chown_fn
#cd_builddir_fn - don't use
[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility"
cd_builddir_fn
CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \
CXX=$COMPILER_CXX \
./configure \
--prefix=$INSTALL_TDE \
--mandir=$INSTALL_TDE/man \
${EN_GCC_VIS:-} \
--disable-rpath \
--enable-closure
cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_KIPI="ON" \
-DWITH_KEXIF="OFF" \
-DBUILD_CONFIGURATOR="ON" \
-DBUILD_KPART="ON"
make_fn
@ -98,10 +79,10 @@ $PRGNAM: Image decoding is based on its own decoders (ksquirrel-libs)
$PRGNAM: With OpenGL and KIPI support.
$PRGNAM:
$PRGNAM: With language support for:
$PRGNAM: en $langs
$PRGNAM: $langs
$PRGNAM:
$PRGNAM: With help documentation for:
$PRGNAM: en $ldocs
$PRGNAM: $ldocs
$PRGNAM:
" > $PKG/install/slack-desc

@ -34,31 +34,28 @@ getsource_fn
untar_fn
# 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 translations/$Lang ]] && langs="$langs $Lang";done
sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" translations/Makefile.am
## for slack-desc
langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
sed -i '/On Debian systems/,+2d' doc/man/ktorrent.1
listdocs_fn
ltoolupdate_fn
chown_fn
cd_builddir_fn
CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \
CXX=$COMPILER_CXX \
../configure \
--prefix=$INSTALL_TDE \
--mandir=$INSTALL_TDE/man \
--disable-rpath \
--enable-torrent-mimetype \
--enable-closure
pkg-config avahi-tqt && ZeroConf="ON"
pkg-config geoip && GeoIp="ON" && BiGeoIp="OFF"
cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_ZEROCONF=${ZeroConf:-"OFF"} \
-DWITH_SYSTEM_GEOIP=${GeoIp:-"OFF"} \
-DWITH_BUILTIN_GEOIP=${BiGeoIp:-"ON"} \
-DWITH_BUILTIN_FLAGS=${BiGeoIp:-"ON"} \
-DWITH_TORRENT_MIMETYPE="OFF" \
-DWITH_MEMLEAK_TRACING="OFF" \
-DWITH_PROFILING_SUPPORT="OFF"
make_fn

@ -34,7 +34,7 @@ getsource_fn
untar_fn
## for slack-desc
langs="en";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang";done
langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
listdocs_fn

@ -101,7 +101,7 @@ Set the version of TDE to be built.
" \
13 75 3 \
"14.1.3" "the R14.1.3 release - source from archives" \
"14.1.4" "the R14.1.4 release - source from archives" \
"14.1.x" "next release preview - source from Trinity git" \
"14.2.0" "R14.2.0 development - source from Trinity git" \
2> $TMPVARS/TDEVERSION
@ -236,7 +236,7 @@ dialog --cr-wrap --nocancel --no-shadow --colors --help-button --help-label "REA
Multiple selections may be made - space separated.
Build language packages/support for any of:
\Zb\Z6af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es es_AR et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW\Zn
\Zb\Z6af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es es_AR et eu fa fi fr fy ga gl he hi hr hu is it ja ka kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW\Zn
" \
25 75 \
@ -753,8 +753,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.1.3 ]] && PRE_DOWNLOAD_MESSAGE="Only the source archives not already in 'src' will be downloaded." || 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.1.3 build case
[[ $(cat $TMPVARS/TDEVERSION) == 14.1.4 ]] && PRE_DOWNLOAD_MESSAGE="Only the source archives not already in 'src' will be downloaded." || 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.1.4 build case
[[ $(cat $TMPVARS/DL_CGIT) != no ]] && {
dialog --cr-wrap --no-shadow --colors --defaultno --title " Only download sources " --yesno \
"

Binary file not shown.

@ -38,7 +38,7 @@ getsource_fn
## extract, build, and remove source for each language package one at a time
cd $TMP_BUILD/tmp-$PRGNAM
[[ $TDEVERSION == 14.1.3 ]] && {
[[ $TDEVERSION == 14.1.4 ]] && {
# extract the template source once only
echo -e "\033[39;1m
Extracting the template source from $(basename $SOURCE) ...
@ -71,7 +71,7 @@ cp -a --parents cmake/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/)
for lang in $I18N
do
[[ $TDEVERSION == 14.1.3 ]] && {
[[ $TDEVERSION == 14.1.4 ]] && {
# extract the source for one language at a time for each iteration of the loop
echo -e "\033[39;1m
Extracting the $PRGNAM-$lang source from $(basename $SOURCE) ...

@ -36,7 +36,6 @@ untar_fn
## override hard coded trinity references - PLUGIN_INSTALL_DIR is derived from TDE_CNF_DIR,
## and is relative to the TDE libraries directory
sed -i "s|FileName=trinity|FileName=$PLUGIN_INSTALL_DIR|" quanta/data/config/plugins.rc
sed -i "s|/opt/trinity|$INSTALL_TDE|" */*.tdevelop
sed -i "s|trinity/|$PLUGIN_INSTALL_DIR/|" doc/*/*.docbook
sed -i "s|/opt/trinity|$INSTALL_TDE|" doc/man/*/*.1

@ -26,7 +26,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=graphviz
VERSION=12.1.1
VERSION=12.2.1
BUILD=${BUILD:-1}
TAG=${TAG:-}

@ -21,7 +21,7 @@
# SUCH DAMAGE.
PRGNAM=imlib2
VERSION=1.12.3
VERSION=1.12.5
BUILD=${BUILD:-1}
TAG=${TAG:-}

@ -3,4 +3,9 @@ Inkscape v1 requires the non-Slackware package double-conversion.
If the installation or source isn't found, the download URL will be displayed when running the SlackBuild.
The source will need to be pre-downloaded to the 'src' directory and will then be built, packaged, and installed during the inkscape build.
-----------------
Build errors might occur for v1.4 relating to glibmm and pangomm.
gcc and clang requirements are different, but in either case, minimum versions of glibmm-2.66.5 and pangomm-2.46.3 will enable a successful build.

@ -24,7 +24,8 @@
# SUCH DAMAGE.
PRGNAM=inkscape
VERSION=1.3.2
VERSION=1.4.1
DC_VERSION=3.3.1
BUILD=${BUILD:-1}
ARCHIVE_TYPE="tar.xz"
@ -39,17 +40,17 @@ getsource_fn
# ### double-conversion - start
{
## If it is already installed, go to end
pkg-config double-conversion || ldconfig -p|grep libdouble-conversion 1>/dev/null || { # ldconfig if no .pc file
pkg-config --atleast-version=$DC_VERSION double-conversion 1>/dev/null || {
## otherwise, if the source archive is in 'src' ..
[[ -s $BUILD_TDE_ROOT/src/v3.3.0.tar.gz ]] && {
[[ -s $BUILD_TDE_ROOT/src/v$DC_VERSION.tar.gz ]] && {
## .. build, package, and install ..
(
echo -e "\n building double-conversion \n"
cd /$TMP_BUILD
rm -rf *double-conversion*
tar xf $BUILD_TDE_ROOT/src/v3.3.0.tar.gz
cd double-conversion-3.3.0/
tar xf $BUILD_TDE_ROOT/src/v$DC_VERSION.tar.gz
cd double-conversion-$DC_VERSION/
## add a pkg-config .pc file
echo 'prefix=@CMAKE_INSTALL_PREFIX@
@ -72,6 +73,9 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.in
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
' >> CMakeLists.txt
## ensure correct version for future pkg-config check
sed -i "s|project(double-conversion VERSION.*$|project(double-conversion VERSION $DC_VERSION)|" CMakeLists.txt
cd cmake/
# LIBDIRSUFFIX not required - include(GNUInstallDirs) sets lib64 where appropriate ..
cmake ${G_NINJA:-} \
@ -85,8 +89,8 @@ PKG=$TMP_BUILD/package-double-conversion
make_fn
cd $TMP_BUILD/package-double-conversion
makepkg -l y -c n $OUTPUT/double-conversion-3.3.0-$ARCH-$BUILD.txz
installpkg $OUTPUT/double-conversion-3.3.0-$ARCH-$BUILD.txz
makepkg -l y -c n $OUTPUT/double-conversion-$DC_VERSION-$ARCH-$BUILD.txz
upgradepkg --install-new --reinstall $OUTPUT/double-conversion-$DC_VERSION-$ARCH-$BUILD.txz
)
echo -e "\n now building inkscape \n"
} || { ## .. but if the source archive isn't in 'src', display download URL ..
@ -98,7 +102,7 @@ echo -e "
Download:
\033[39;1m
( 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/v$DC_VERSION.tar.gz )
\033[0m
and re-run ./BUILD-TDE.sh, choosing Re-use ..
@ -123,7 +127,7 @@ tuts="tutorial-tracing.svg tutorial-tracing-pixelart.svg tutorial-tips.svg tutor
## .. for man pages
pods="inkscape.pod.in inkview.pod.in"
## .. for welcome screen text
I18N_SVG="about.svg start-welcome-text.svg"
I18N_SVG=""
#
for locale in $I18N
do
@ -145,11 +149,19 @@ sed -i "s|GLOB.*$|GLOB _FILES README $tuts)|" share/tutorials/CMakeLists.txt
pods=$(echo $pods|sed 's|man/||g')
sed -i "s|*.pod.in|$pods|" man/CMakeLists.txt
## and install man pages to $prefix, as per most other Slackware packages
sed -i 's|MANFILE_DEST "${CMAKE_INSTALL_FULL_MANDIR}|MANFILE_DEST "${CMAKE_INSTALL_PREFIX}/man|' CMakeScripts/Pod2man.cmake
sed -i 's|MANFILE_DEST "${CMAKE_INSTALL_MANDIR}|MANFILE_DEST "${CMAKE_INSTALL_PREFIX}/man|' CMakeScripts/Pod2man.cmake
#
## Add the TRANSLATING file if any of the locales has no start-welcome-text.$locale.svg
[[ ${COUNT_I18N:-} != ${COUNT_TEXT:-} ]] && I18N_SVG="TRANSLATING $I18N_SVG"
## Add the README & TRANSLATING files if any of the locales has no start-welcome-text.$locale.svg
[[ ${COUNT_I18N:-} != ${COUNT_TEXT:-} ]] && I18N_SVG="README TRANSLATING $I18N_SVG"
## Add the contents of the share/screens/ directories including any user generated
sed -i "s|\"\*.svg\"|$I18N_SVG|" share/screens/CMakeLists.txt
sed -i "s|GLOB _ABOUT|& about/README|" share/screens/CMakeLists.txt
# these READMEs might be useful information ..
sed -i 's|")|" README)|' share/attributes/CMakeLists.txt
sed -i 's| PATTERN "print_win32_vector| PATTERN "inkex/gui/README.md"\
PATTERN "other/clipart/README.md"\
&|' share/CMakeLists.txt
listdocs_fn
@ -182,9 +194,8 @@ cmake ${G_NINJA:-} ${LIBATOMIC:-} \
-DWITH_GRAPHICS_MAGICK="ON" \
-DWITH_GSOURCEVIEW="OFF" \
-DWITH_GSPELL="OFF" \
-DWITH_IMAGE_MAGICK="ON" \
-DWITH_IMAGE_MAGICK="OFF" \
-DWITH_INTERNAL_2GEOM="ON" \
-DWITH_INTERNAL_CAIRO="OFF" \
-DWITH_JEMALLOC="OFF" \
-DWITH_LIBCDR="ON" \
-DWITH_LIBVISIO="OFF" \

@ -25,7 +25,7 @@
#
#
PRGNAM=xmedcon
VERSION=0.24.0
VERSION=0.25.1
BUILD=${BUILD:-1}
TAG=${TAG:-}

@ -71,14 +71,14 @@ SRCDIR=$BUILD_TDE_ROOT/src
SB_SRCDIR=$(cd $(dirname $0); pwd)
## for 14.0.11 onwards, check for cmake archive ..
[[ $TDEVERSION == 14.1.3 && ! -s $SRCDIR/cmake-$TDEVERSION.tar.xz ]] && (
[[ $TDEVERSION == 14.1.4 && ! -s $SRCDIR/cmake-$TDEVERSION.tar.xz ]] && (
echo -e "\nDownloading to $SRCDIR"
wget -T 20 -O $SRCDIR/cmake-$TDEVERSION.tar.xz $TDE_MIRROR/releases/R$TDEVERSION/main/dependencies/tde-cmake-trinity-$TDEVERSION.tar.xz
echo -e "----\n"
)
## if 14.1.3 or misc, download archive:
[[ $TDEVERSION == 14.1.3 || $TDEMIR_SUBDIR == misc ]] && {
## if 14.1.4 or misc, download archive:
[[ $TDEVERSION == 14.1.4 || $TDEMIR_SUBDIR == misc ]] && {
## check for and remove any zero byte archive files
[[ ! -s $SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} ]] && \
rm $SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} 2>/dev/null || true
@ -114,7 +114,7 @@ if [ "$P1" == "--download" ]; then
exit 0
fi
} || {
## otherwise, not R14.1.3 nor misc, and we are creating/updating git,
## otherwise, not R14.1.4 nor misc, and we are creating/updating git,
## so [1] start with admin/cmake:
[[ $(cat $TMPVARS/DL_CGIT) == yes ]] && {
cd $BUILD_TDE_ROOT/src/cgit
@ -252,7 +252,7 @@ cd $TMP_BUILD/tmp-$PRGNAM
##
## [1] firstly test for R14 or misc ..
##
[[ $TDEVERSION == 14.1.3 || $TDEMIR_SUBDIR == misc ]] && {
[[ $TDEVERSION == 14.1.4 || $TDEMIR_SUBDIR == misc ]] && {
## unpack R14 or misc
echo -e "\n unpacking $(basename $SOURCE) ... \n"
tar -xf $SOURCE
@ -266,7 +266,7 @@ tar xf $SRCDIR/cmake-$TDEVERSION.tar.xz --strip-components=1 --one-top-level=cma
} || {
## [2] not 14.1.3 nor misc, so must be git ..
## [2] not 14.1.4 nor misc, so must be git ..
[[ $TDEVERSION == 14.2.0 ]] && DEV_BRANCH=master || DEV_BRANCH=r14.1.x
## copy git content to build area:

Loading…
Cancel
Save