Updates 14 August 2023

k9copy - cmake development build
 libkdcraw - renamed identify to identify_raw to avoid confusion with ImageMagick
 tdebluez - set PAPER_TYPE in tdebluez.Doxyfile.cmake for 14.1.x/14.2.0
 tdegraphics - KMRML removed from 14.2.0
 tdepim - KITCHENSYNC removed from 14.2.0
 Misc builds version updates - clamav, double conversion, inkscape, graphviz, imlib2, mp4v2
master
Ray-V 1 year ago
parent bd373bad7f
commit 8f26171a6f

@ -35,6 +35,11 @@ untar_fn
## clang build - C++11 requires a space between literal and identifier ## clang build - C++11 requires a space between literal and identifier
sed -i 's|%%"REG_b|%%" REG_b|;s|%%"REG_S|%%" REG_S|' k9vamps/cputest.cpp sed -i 's|%%"REG_b|%%" REG_b|;s|%%"REG_S|%%" REG_S|' k9vamps/cputest.cpp
## clang build - fix error for development builds
[[ ! $(grep sFileName.local8Bit\(\).data\(\) libk9copy/k9saveimage.cpp) ]] && \
sed -i 's|sFileName.local8Bit()|&.data()|' libk9copy/k9saveimage.cpp
[[ $TDEVERSION == 14.1.0 ]] && {
# set support for additional language(s) as per I18N variable # set support for additional language(s) as per I18N variable
# but only for languages available with this package # but only for languages available with this package
@ -48,14 +53,23 @@ sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am
[[ $(getconf LONG_BIT) == 32 && $(uname -m) == *64 ]] && \ [[ $(getconf LONG_BIT) == 32 && $(uname -m) == *64 ]] && \
sed -i 's|^UNAME_MACHINE=.*$|UNAME_MACHINE=i586|' admin/config.guess sed -i 's|^UNAME_MACHINE=.*$|UNAME_MACHINE=i586|' admin/config.guess
} || {
## for slack-desc
langs="";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang";done
}
listdocs_fn listdocs_fn
ltoolupdate_fn [[ $TDEVERSION == 14.1.0 ]] && ltoolupdate_fn
chown_fn chown_fn
cd_builddir_fn cd_builddir_fn
[[ $TDEVERSION == 14.1.0 ]] && {
[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility" [[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility"
CFLAGS="$SLKRCFLAGS" \ CFLAGS="$SLKRCFLAGS" \
@ -70,6 +84,13 @@ CXX=$COMPILER_CXX \
--enable-closure \ --enable-closure \
--enable-k3bdevices # do not activate hal/dbus support (use k3bdevice instead) --enable-k3bdevices # do not activate hal/dbus support (use k3bdevice instead)
} || {
cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_OPENGL="ON"
}
make_fn make_fn
installdocs_fn installdocs_fn

@ -33,7 +33,7 @@ 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.0.1 clamav_VERS=1.1.0
clamav_installed_fn () { pkg-config libclamav ;} clamav_installed_fn () { pkg-config libclamav ;}
## If it's already installed, go to end ## If it's already installed, go to end
clamav_installed_fn || { clamav_installed_fn || {

@ -33,8 +33,9 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION == 14.1.0 ]] && {
## Workaround to prevent chalk/krita crashing when loading PNGs it has saved ## Workaround to prevent chalk/krita crashing when loading PNGs it has saved
## Awaiting fix for koffice issue 20 ## Awaiting fix for koffice issue 20 - done for 14.1.x/14.1.1
patch -p0 << EOF patch -p0 << EOF
--- filters/chalk/png/kis_png_converter.cpp --- filters/chalk/png/kis_png_converter.cpp
+++ filters/chalk/png/kis_png_converter.cpp +++ filters/chalk/png/kis_png_converter.cpp
@ -47,6 +48,7 @@ patch -p0 << EOF
// Read information about the png // Read information about the png
EOF EOF
}
## fix chalk crashing - ## fix chalk crashing -
## - set liblcms as a direct dependency - see TI issue 37 for details ## - set liblcms as a direct dependency - see TI issue 37 for details

@ -40,7 +40,8 @@ sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" {README.md,doc/en/tdebluez.docbook}
[[ ! ${PS:-} ]] && { [[ ! ${PS:-} ]] && {
[[ $(locale LC_PAPER) == 297* ]] && PS=a4 || PS=letter [[ $(locale LC_PAPER) == 297* ]] && PS=a4 || PS=letter
} }
sed -i "s|^PAPER_TYPE.*$|PAPER_TYPE = $PS|" Doxyfile [[ $TDEVERSION == 14.1.0 ]] && DXYFILE=Doxyfile || DXYFILE=tdebluez.Doxyfile.cmake
sed -i "s|^PAPER_TYPE.*$|PAPER_TYPE = $PS|" $DXYFILE
## for slack-desc ## for slack-desc
langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done

@ -102,6 +102,14 @@ EOF
echo -e "\033[0m" echo -e "\033[0m"
} }
## _OBJECT_NAME_STRING defines have been removed from tqt.h for 14.1.x [aka 14.1.1] and 14.2.0,
## but KMRML remains an option for 14.1.x
[[ $TDEVERSION == 14.1.x ]] && {
sed -i 's|TQSTRINGLIST_OBJECT_NAME_STRING|"TQStringList"|' kmrml/kmrml/lib/watcher_stub.cpp
## and Q_OBJECT has been replaced with TQ_OBJECT
find kmrml/kmrml/ -type f -exec sed -i -e 's|Q_OBJECT|T&|' {} \;
}
listdocs_fn listdocs_fn
chown_fn chown_fn
@ -113,6 +121,8 @@ sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/g
# If imlib is installed, include Kuickshow: # If imlib is installed, include Kuickshow:
pkg-config imlib && KUICKSHOW=ON pkg-config imlib && KUICKSHOW=ON
## KMRML removed from 14.2.0
[[ $TDEVERSION != 14.2.0 ]] && BUILD_KMRML=-DBUILD_KMRML="ON"
cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_PAPER="OFF" \ -DWITH_PAPER="OFF" \
-DWITH_TIFF="ON" \ -DWITH_TIFF="ON" \
@ -132,7 +142,7 @@ cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DBUILD_KGAMMA="ON" \ -DBUILD_KGAMMA="ON" \
-DBUILD_KGHOSTVIEW="ON" \ -DBUILD_KGHOSTVIEW="ON" \
-DBUILD_TDEICONEDIT="ON" \ -DBUILD_TDEICONEDIT="ON" \
-DBUILD_KMRML="ON" \ ${BUILD_KMRML:-} \
-DBUILD_KOLOURPAINT="ON" \ -DBUILD_KOLOURPAINT="ON" \
-DBUILD_KPOVMODELER="ON" \ -DBUILD_KPOVMODELER="ON" \
-DBUILD_KRULER="ON" \ -DBUILD_KRULER="ON" \

@ -48,6 +48,8 @@ pkg-config libcaldav && LCALDAV="ON"
# If libcarddav is installed, include it in the build for korganizer # If libcarddav is installed, include it in the build for korganizer
pkg-config libcarddav && LCARDDAV="ON" pkg-config libcarddav && LCARDDAV="ON"
## KITCHENSYNC removed from 14.2.0
[[ $TDEVERSION != 14.2.0 ]] && BUILD_KITCHENSYNC=-DBUILD_KITCHENSYNC="OFF"
cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_ARTS="ON" \ -DWITH_ARTS="ON" \
-DWITH_BIRTHDAYS="ON" \ -DWITH_BIRTHDAYS="ON" \
@ -75,7 +77,7 @@ cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DBUILD_KANDY="ON" \ -DBUILD_KANDY="ON" \
-DBUILD_KARM="ON" \ -DBUILD_KARM="ON" \
-DBUILD_KGANTT="ON" \ -DBUILD_KGANTT="ON" \
-DBUILD_KITCHENSYNC="OFF" \ ${BUILD_KITCHENSYNC:-} \
-DBUILD_KMAIL="ON" \ -DBUILD_KMAIL="ON" \
-DBUILD_KMAILCVT="ON" \ -DBUILD_KMAILCVT="ON" \
-DBUILD_KMOBILE="ON" \ -DBUILD_KMOBILE="ON" \

@ -102,6 +102,9 @@ patch -p0 -N << EOF
+++ libkdcraw/test/CMakeLists.txt +++ libkdcraw/test/CMakeLists.txt
@@ -22,0 +23 @@ @@ -22,0 +23 @@
+ DESTINATION \${BIN_INSTALL_DIR} + DESTINATION \${BIN_INSTALL_DIR}
@@ -29,1 +30,1 @@
-tde_add_executable( identify AUTOMOC
+tde_add_executable( identify_raw AUTOMOC
@@ -30,0 +32 @@ @@ -30,0 +32 @@
+ DESTINATION \${BIN_INSTALL_DIR} + DESTINATION \${BIN_INSTALL_DIR}
@@ -38,0 +41 @@ @@ -38,0 +41 @@

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

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

@ -1,9 +1,6 @@
Inkscape v1 requires the non-Slackware package double-conversion. Inkscape v1 requires the non-Slackware package double-conversion.
The source will need to be pre-downloaded and placed in the 'src' directory and will then be built, packaged, and installed during the inkscape build. If the installation or source isn't found, the download URL will be displayed when running the SlackBuild.
Download from: The source will need to be pre-downloaded to the 'src' directory and will then be built, packaged, and installed during the inkscape build.
https://github.com/google/double-conversion/archive/v3.2.1.tar.gz
The URL will be displayed when running the SlackBuild if the installation or source isn't found.

@ -24,7 +24,7 @@
# SUCH DAMAGE. # SUCH DAMAGE.
PRGNAM=inkscape PRGNAM=inkscape
VERSION=1.2.2 VERSION=1.3
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
ARCHIVE_TYPE="tar.xz" ARCHIVE_TYPE="tar.xz"
@ -41,15 +41,15 @@ getsource_fn
## If it is already installed, go to end ## 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 double-conversion || ldconfig -p|grep libdouble-conversion 1>/dev/null || { # ldconfig if no .pc file
## otherwise, if the source archive is in 'src' .. ## otherwise, if the source archive is in 'src' ..
[[ -s $BUILD_TDE_ROOT/src/v3.2.1.tar.gz ]] && { [[ -s $BUILD_TDE_ROOT/src/v3.3.0.tar.gz ]] && {
## .. build, package, and install .. ## .. build, package, and install ..
( (
echo -e "\n building double-conversion \n" echo -e "\n building double-conversion \n"
cd /$TMP_BUILD cd /$TMP_BUILD
rm -rf *double-conversion* rm -rf *double-conversion*
tar xf $BUILD_TDE_ROOT/src/v3.2.1.tar.gz tar xf $BUILD_TDE_ROOT/src/v3.3.0.tar.gz
cd double-conversion-3.2.1/ cd double-conversion-3.3.0/
## add a pkg-config .pc file ## add a pkg-config .pc file
echo 'prefix=@CMAKE_INSTALL_PREFIX@ echo 'prefix=@CMAKE_INSTALL_PREFIX@
@ -72,8 +72,6 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.in
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
' >> CMakeLists.txt ' >> CMakeLists.txt
sed -i 's|VERSION 3.2.0|VERSION 3.2.1|' CMakeLists.txt
cd cmake/ cd cmake/
# LIBDIRSUFFIX not required - include(GNUInstallDirs) sets lib64 where appropriate .. # LIBDIRSUFFIX not required - include(GNUInstallDirs) sets lib64 where appropriate ..
cmake ${G_NINJA:-} \ cmake ${G_NINJA:-} \
@ -87,8 +85,8 @@ PKG=$TMP_BUILD/package-double-conversion
make_fn make_fn
cd $TMP_BUILD/package-double-conversion cd $TMP_BUILD/package-double-conversion
makepkg -l y -c n $OUTPUT/double-conversion-3.2.1-$ARCH-$BUILD.txz makepkg -l y -c n $OUTPUT/double-conversion-3.3.0-$ARCH-$BUILD.txz
installpkg $OUTPUT/double-conversion-3.2.1-$ARCH-$BUILD.txz installpkg $OUTPUT/double-conversion-3.3.0-$ARCH-$BUILD.txz
) )
echo -e "\n now building inkscape \n" echo -e "\n now building inkscape \n"
} || { ## .. but if the source archive isn't in 'src', display download URL .. } || { ## .. but if the source archive isn't in 'src', display download URL ..
@ -100,7 +98,7 @@ echo -e "
Download: Download:
\033[39;1m \033[39;1m
( cd $BUILD_TDE_ROOT/src ( cd $BUILD_TDE_ROOT/src
wget https://github.com/google/double-conversion/archive/v3.2.1.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 this script ..
@ -115,7 +113,7 @@ untar_fn
## set internal 2geom lib paths to lib$LIBDIRSUFFIX ## set internal 2geom lib paths to lib$LIBDIRSUFFIX
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=.*$|&$LIBDIRSUFFIX|" 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
## .. for translations and slack-desc ## .. for translations and slack-desc
@ -181,6 +179,7 @@ cmake ${G_NINJA:-} ${LIBATOMIC:-} \
-DWITH_FUZZ="OFF" \ -DWITH_FUZZ="OFF" \
-DWITH_GNU_READLINE="ON" \ -DWITH_GNU_READLINE="ON" \
-DWITH_GRAPHICS_MAGICK="ON" \ -DWITH_GRAPHICS_MAGICK="ON" \
-DWITH_GSOURCEVIEW="OFF" \
-DWITH_GSPELL="OFF" \ -DWITH_GSPELL="OFF" \
-DWITH_IMAGE_MAGICK="ON" \ -DWITH_IMAGE_MAGICK="ON" \
-DWITH_INTERNAL_2GEOM="ON" \ -DWITH_INTERNAL_2GEOM="ON" \

@ -24,7 +24,7 @@
# SUCH DAMAGE. # SUCH DAMAGE.
PRGNAM=mp4v2 PRGNAM=mp4v2
VERSION=2.1.2 VERSION=2.1.3
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-} TAG=${TAG:-}
@ -75,7 +75,7 @@ echo -e "\033[0m"
listdocs_fn listdocs_fn
## create mp4v2.pc.in after the installation libs and include directories have been set ## create mp4v2.pc.in after the installation directories have been set by GNUInstallDirs
sed -i '/^configure_pkg_config_file/d' CMakeLists.txt sed -i '/^configure_pkg_config_file/d' CMakeLists.txt
sed -i 's|install.*mp4v2.pc.*$|configure_pkg_config_file(mp4v2.pc.in)\n&|' CMakeLists.txt sed -i 's|install.*mp4v2.pc.*$|configure_pkg_config_file(mp4v2.pc.in)\n&|' CMakeLists.txt

Loading…
Cancel
Save