diff --git a/Apps/abakus/abakus.SlackBuild b/Apps/abakus/abakus.SlackBuild index 2e8146e..69dbb6e 100755 --- a/Apps/abakus/abakus.SlackBuild +++ b/Apps/abakus/abakus.SlackBuild @@ -42,6 +42,11 @@ chown_fn cd_builddir_fn +## Add man page for development builds +[[ $TDEVERSION != 14.0.12 ]] && { +MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man +} + cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ @@ -50,6 +55,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ + ${MANDIR:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ @@ -59,6 +65,8 @@ make_fn installdocs_fn +[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn + strip_fn mkdir_install_fn diff --git a/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild b/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild index d3537f5..a000b43 100755 --- a/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild +++ b/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild @@ -33,19 +33,23 @@ getsource_fn untar_fn +[[ $TDEVERSION == 14.0.12 ]] && { ## install theme engine to lib$LIBDIRSUFFIX sed -i 's|/lib/|/lib$(LIBDIRSUFFIX)/|' tdegtk/Makefile.am ## remove redundant KDE_INCLUDES which is null if installing to /usr and causes a '/tde not found' error sed -i 's| $(KDE_INCLUDES)/tde||' {tdegtk,tests}/Makefile.am +} listdocs_fn -ltoolupdate_fn +[[ $TDEVERSION == 14.0.12 ]] && ltoolupdate_fn chown_fn cd_builddir_fn +[[ $TDEVERSION == 14.0.12 ]] && { + CFLAGS="$SLKRCFLAGS" \ CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ @@ -55,6 +59,23 @@ CXX=$COMPILER_CXX \ --disable-rpath \ --enable-closure +} || { + +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ + -DBUILD_TESTS="OFF" \ + -Wno-dev \ + .. + +} + make_fn installdocs_fn diff --git a/Apps/k3b/k3b.SlackBuild b/Apps/k3b/k3b.SlackBuild index 6a50307..ea9bca9 100755 --- a/Apps/k3b/k3b.SlackBuild +++ b/Apps/k3b/k3b.SlackBuild @@ -323,6 +323,7 @@ patch -p0 << EOF EOF } +[[ $TDEVERSION == 14.0.12 ]] && { ## using cmake common rules find doc -name CMakeLists.txt | xargs rm @@ -337,16 +338,22 @@ tde_conditional_add_project_docs( BUILD_DOC )|' CMakeLists.txt mv doc/tdeioslave doc/en mv doc/en/en doc/en/tdeioslave mv doc/*.* doc/en/ - +} mkdir doc/misc mv FAQ doc/misc/ + listdocs_fn chown_fn cd_builddir_fn +## Add man page for development builds +[[ $TDEVERSION != 14.0.12 ]] && { +MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man +} + cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ @@ -356,6 +363,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ + ${MANDIR:-} \ -DWITH_LIBDVDREAD="ON" \ -DWITH_MUSICBRAINZ=${MUSICBRAINZ:-"OFF"} \ -DWITH_SYSTEM_LIBSAMPLERATE="ON" \ @@ -381,6 +389,8 @@ make_fn installdocs_fn +[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn + strip_fn mkdir_install_fn diff --git a/Apps/kile/kile.SlackBuild b/Apps/kile/kile.SlackBuild index 96f30a7..b84522e 100755 --- a/Apps/kile/kile.SlackBuild +++ b/Apps/kile/kile.SlackBuild @@ -46,6 +46,12 @@ chown_fn cd_builddir_fn +## Add man page for development builds +[[ $TDEVERSION != 14.0.12 ]] && { +MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man +sed -i '/If the TDE/,+2d' ../doc/man/kile.1 +} + cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ @@ -54,6 +60,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ + ${MANDIR:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ @@ -63,6 +70,8 @@ make_fn installdocs_fn +[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn + strip_fn mkdir_install_fn diff --git a/Apps/rosegarden/rosegarden.SlackBuild b/Apps/rosegarden/rosegarden.SlackBuild index 528fe9d..4d30915 100755 --- a/Apps/rosegarden/rosegarden.SlackBuild +++ b/Apps/rosegarden/rosegarden.SlackBuild @@ -33,6 +33,7 @@ getsource_fn untar_fn +[[ $TDEVERSION == 14.0.12 ]] && { ## remove help documentation build instruction from all locales ... sed -i '/tde_create_handbook/,+3d' doc/*/CMakeLists.txt || true ## ... and restore for 'en' @@ -55,8 +56,12 @@ ldocs="$ldocs $Lang" done # sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt -langs=$(echo $langs|sed "s|/$PRGNAM.po||g") -[[ $langs != "" ]] && TRANS=ON +[[ $langs != "" ]] && TRANS=ON && langs=" $(echo $langs|sed "s|/$PRGNAM.po||g")" +} || { +## for slack-desc and to set TRANS=ON until 14.0.12 build removed +langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang" && TRANS=ON;done +ldocs="";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done +} ## delete zero length files find data/pixmaps/feta -type f -empty -delete @@ -73,6 +78,13 @@ pkg-config jack && JACK="ON" # Check for DSSI aka "Dizzy" pkg-config dssi && DSSI="ON" +## Add man page for development builds +[[ $TDEVERSION != 14.0.12 ]] && { +MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man +## for cmake version 3.21.x? +sed -i 's|PROJECT(ROSEGARDEN)|project(rosegarden)|' ../CMakeLists.txt +} + cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ @@ -82,6 +94,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ + ${MANDIR:-} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DWANT_SOUND="ON" \ @@ -99,6 +112,8 @@ make_fn installdocs_fn +[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn + strip_fn mkdir_install_fn @@ -116,7 +131,7 @@ echo " $PRGNAM: Rosegarden is a MIDI and audio sequencer and musical notation editor. $PRGNAM: $PRGNAM: With language support for: -$PRGNAM: en $langs +$PRGNAM: en$langs $PRGNAM: $PRGNAM: With help documentation for: $PRGNAM: en$ldocs diff --git a/Apps/tdeio-locate/tdeio-locate.SlackBuild b/Apps/tdeio-locate/tdeio-locate.SlackBuild index a45f832..a5d81d8 100755 --- a/Apps/tdeio-locate/tdeio-locate.SlackBuild +++ b/Apps/tdeio-locate/tdeio-locate.SlackBuild @@ -33,12 +33,19 @@ getsource_fn untar_fn +[[ $TDEVERSION == 14.0.12 ]] && { # 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/$PRGNAM.po";done sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt -langs=$(echo $langs|sed "s|/$PRGNAM.po||g") -[[ $langs != "" ]] && TRANS=ON +[[ $langs != "" ]] && TRANS=ON && langs=" $(echo $langs|sed "s|/$PRGNAM.po||g")" +} || { +## for slack-desc and to set TRANS=ON until 14.0.12 build removed +langs="" +for Lang in $I18N +do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang" && TRANS=ON +done +} listdocs_fn @@ -79,7 +86,7 @@ echo " $PRGNAM: tdeio-locate is a TDE I/O Slave for the locate command. $PRGNAM: $PRGNAM: With language support for: -$PRGNAM: en $langs +$PRGNAM: en$langs $PRGNAM: $PRGNAM: $PRGNAM: diff --git a/Apps/tdepowersave/tdepowersave.SlackBuild b/Apps/tdepowersave/tdepowersave.SlackBuild index b6820f6..dc13a27 100755 --- a/Apps/tdepowersave/tdepowersave.SlackBuild +++ b/Apps/tdepowersave/tdepowersave.SlackBuild @@ -33,6 +33,7 @@ getsource_fn untar_fn +[[ $TDEVERSION == 14.0.12 ]] && { ## remove help documentation build instruction from all [non-en] locales ... sed -i '/tde_create_handbook/,+3d' doc/??{,_??}/CMakeLists.txt || true # .. restore for en always @@ -60,6 +61,11 @@ done ## this GLOB overrides "LANG auto" in po/CMakeLists.txt: sed -i "s| \*.po| $lpos|" cmake/modules/TDEMacros.cmake [[ $lpos != "" ]] && TRANS=ON +} || { +## for slack-desc and to set TRANS=ON until 14.0.12 build removed +langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang" && TRANS=ON;done +ldocs="";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done +} listdocs_fn diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index b1aeb1c..df08e9a 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -793,7 +793,7 @@ Create and/or update the git repositories local copies. [[ $(cat $TMPVARS/DL_CGIT) != no ]] && { dialog --cr-wrap --no-shadow --colors --defaultno --title " Only download sources " --yesno \ " -This would be useful for running the build off-line. +This is useful for running the build off-line. \Z1Y\Zb\Z0es\Zn Download the sources for the build list without building packages. diff --git a/Deps/arts/arts.SlackBuild b/Deps/arts/arts.SlackBuild index d0044fd..264ca4f 100755 --- a/Deps/arts/arts.SlackBuild +++ b/Deps/arts/arts.SlackBuild @@ -39,6 +39,14 @@ chown_fn cd_builddir_fn +## Add man pages for development builds +[[ $TDEVERSION != 14.0.12 ]] && { +MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man +BUILDDOC=-DBUILD_DOC="ON" +sed -i 's|^KDE|TDE|' ../README.md +for i in ../doc/man/*.1 ; do mv $i ${i%%-trinity.1}.1 ; done +} + cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ @@ -47,6 +55,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + ${MANDIR:-} \ -DWITH_ALSA="ON" \ -DWITH_AUDIOFILE="ON" \ -DWITH_ESOUND="OFF" \ @@ -55,6 +64,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DWITH_MAD="ON" \ -DWITH_SNDIO="OFF" \ -DWITH_VORBIS="ON" \ + ${BUILDDOC:-} \ -Wno-dev \ .. @@ -62,6 +72,8 @@ make_fn installdocs_fn +[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn + strip_fn mkdir_install_fn diff --git a/Misc/inkscape/inkscape.SlackBuild b/Misc/inkscape/inkscape.SlackBuild index b202ef5..b1e0518 100755 --- a/Misc/inkscape/inkscape.SlackBuild +++ b/Misc/inkscape/inkscape.SlackBuild @@ -39,7 +39,7 @@ getsource_fn # ### double-conversion - start { ## If it is already installed, go to end -ldconfig -p|grep libdouble-conversion 1>/dev/null || { +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' .. [[ -s $BUILD_TDE_ROOT/src/v3.2.0.tar.gz ]] && { ## .. build, package, and install .. @@ -51,6 +51,31 @@ rm -rf *double-conversion* tar xf $BUILD_TDE_ROOT/src/v3.2.0.tar.gz cd double-conversion-3.2.0/ +## add a pkg-config .pc file +echo 'prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ + +Name: Double conversion +Description: Provides binary-decimal and decimal-binary routines for IEEE doubles +Version: @PROJECT_VERSION@ + +Requires: +Libs: -L${libdir} -l@PROJECT_NAME@ +Cflags: -I${includedir}/@PROJECT_NAME@ +' > double-conversion.pc.in +# +patch -p0 << EOF +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -118,0 +119,4 @@ ++ ++configure_file( \${CMAKE_CURRENT_SOURCE_DIR}/\${PROJECT_NAME}.pc.in ++ \${CMAKE_CURRENT_BINARY_DIR}/\${PROJECT_NAME}.pc @ONLY IMMEDIATE ) ++install(FILES "\${CMAKE_CURRENT_BINARY_DIR}/\${PROJECT_NAME}.pc" DESTINATION \${CMAKE_INSTALL_LIBDIR}/pkgconfig) +EOF + cd cmake/ # LIBDIRSUFFIX not required - builds to lib64 where appropriate .. cmake ${G_NINJA:-} \ diff --git a/Misc/speex/README b/Misc/speex/README new file mode 100644 index 0000000..cac380c --- /dev/null +++ b/Misc/speex/README @@ -0,0 +1 @@ +The speex build for version 1.2.0 has been retained for 14.0.12 builds, but speex v1.2.1 is available as a Slackware 15.0 package and should be used for tdenetwork and amarok builds.