Updates for R14.0.10:

translation options for kaffeine, kbookreader, kvpnc kdbg - docs for selected languages only kvkbd/backport.patch removed tde-i18n - template and translations sources added to the build additional cmake options for tdeartwork, tdebase, tdelibs cmake builds - kdbg, tdewebdev get-source.sh
4 years ago · 297ecde0da
parent d3a922e9df
commit 297ecde0da
15 changed files with 87 additions and 2989 deletions
--- a/Apps/kaffeine/kaffeine.SlackBuild
+++ b/Apps/kaffeine/kaffeine.SlackBuild
@ -33,17 +33,8 @@ getsource_fn

 untar_fn

-# set support for additional language(s) as per I18N variable
-# but only for languages available with this package
-[[ $TDEVERSION == 14.0.9 ]] && {
-langs="";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang.po";done
-## this GLOB overrides 'LANG auto' in po/CMakeLists.txt:
-sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake
-} || {
 ## for slack-desc
-langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
-}
-[[ $langs != "" ]] && TRANS=ON && langs=$(echo $langs | sed "s|.po||g")
+langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done

 listdocs_fn

@ -62,7 +53,7 @@ cmake \
    -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
    -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
    -DBUILD_DOC="ON" \
-    -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \
+    -DBUILD_TRANSLATIONS="ON" \
    -DWITH_GCC_VISIBILITY="OFF" \
    -DWITH_DPMS="ON" \
    -DWITH_XTEST="ON" \
@ -100,7 +91,7 @@ echo "
 $PRGNAM: kaffeine - a Media Player for TDE
 $PRGNAM:
 $PRGNAM: With language support for:
-$PRGNAM: en $langs
+$PRGNAM: $langs
 $PRGNAM:
 $PRGNAM:
 $PRGNAM:
--- a/Apps/kbookreader/kbookreader.SlackBuild
+++ b/Apps/kbookreader/kbookreader.SlackBuild
@ -33,12 +33,8 @@ 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 [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang.po";done
-sed -i "s|\${po_files}|$langs|" translations/messages/CMakeLists.txt
-langs=$(echo $langs|sed "s|.po||g")
-[[ $langs != "" ]] && TRANS=ON
+## for slack-desc
+langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done

 listdocs_fn

@ -55,7 +51,7 @@ cmake \
    -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
    -DLIB_SUFFIX=$LIBDIRSUFFIX \
    -DBUILD_DOC="ON" \
-    -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \
+    -DBUILD_TRANSLATIONS="ON" \
    -DWITH_GCC_VISIBILITY="OFF" \
    -Wno-dev \
    ..
@ -84,7 +80,7 @@ $PRGNAM:
 $PRGNAM: It supports multiple bookmarks, custom fonts, encoding selection.
 $PRGNAM:
 $PRGNAM: With language support for:
-$PRGNAM: en $langs
+$PRGNAM: $langs
 $PRGNAM:
 $PRGNAM:
 $PRGNAM:
--- a/Apps/kdbg/kdbg.SlackBuild
+++ b/Apps/kdbg/kdbg.SlackBuild
@ -33,36 +33,59 @@ 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 po/$Lang".po" ]] && langs="$langs $Lang"".po";done
-sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am
-langs=$(echo $langs | sed "s|.po||g")
-#
+## edit man page
+sed -i "s|/opt/trinity/share/doc/|$INSTALL_TDE/share/doc/|" kdbg/doc/man/kdbg.1
+
+## docs for selected languages only - LINGUAS=$I18N
+echo 'file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * )
+string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
+
+foreach( _dir ${_dirs} )
+  if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} AND
+      EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}/CMakeLists.txt )
+    if( "${_dir}" STREQUAL "en" OR
+        "${_dir}" STREQUAL "man" OR
+        "${_linguas}" MATCHES "^;*$" OR
+        ";${_linguas};" MATCHES ";${_dir};" )
+      add_subdirectory( ${_dir} )
+    endif( )
+  endif()
+endforeach()
+' > kdbg/doc/CMakeLists.txt
+
+## for slack-desc
+langs="en";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang";done
 ldocs="en";for Lang in $I18N;do [[ -d kdbg/doc/$Lang ]] && ldocs="$ldocs $Lang";done
-sed -i "s|SUBDIRS =.*$|SUBDIRS =$ldocs|" kdbg/doc/Makefile.am

 listdocs_fn

-ltoolupdate_fn
-
 chown_fn

 cd_builddir_fn 

-CFLAGS="$SLKRCFLAGS" \
-CXXFLAGS="$SLKRCFLAGS" \
-CC=$COMPILER \
-CXX=$COMPILER_CXX \
-../configure \
-   --prefix=$INSTALL_TDE \
-   --disable-rpath \
-   --enable-closure
+cmake \
+    -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 \
+    -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+    -DWITH_GCC_VISIBILITY="OFF" \
+    -DWITH_TRACE_OUTPUT="OFF" \
+    -DWITH_GDB_TRANSCRIPT="ON" \
+    -DBUILD_DOC="ON" \
+    -DBUILD_TRANSLATIONS="ON" \
+    -DBUILD_TESTPROGS="OFF" \
+    -Wno-dev \
+    ..

 make_fn

 installdocs_fn

+mangzip_fn
+
 strip_fn

 mkdir_install_fn
@ -80,7 +103,7 @@ echo "
 $PRGNAM: This is KDbg, a graphical user interface around gdb using TDE
 $PRGNAM:
 $PRGNAM: With language support for:
-$PRGNAM: en $langs
+$PRGNAM: $langs
 $PRGNAM:
 $PRGNAM: With help documentation for:
 $PRGNAM: $ldocs
--- a/Apps/kvkbd/backport.patch
+++ b/Apps/kvkbd/backport.patch
--- a/Apps/kvkbd/kvkbd.SlackBuild
+++ b/Apps/kvkbd/kvkbd.SlackBuild
@ -33,10 +33,9 @@ getsource_fn

 untar_fn

-# ### 2021-04-16
 ## These patches could be broken by ongoing development.
 ## To build kvkbd with these patches, revert the repo to revisions known to work
-[[ $TDEVERSION != 14.0.9 ]] && {
+[[ $TDEVERSION != 14.0.10 ]] && {
 (cd $BUILD_TDE_ROOT/src/cgit/$PRGNAM/
 git reset HEAD *
 rm -rf .git/worktrees/*
@ -62,18 +61,10 @@ cp -a $SRCDIR/doc .
 cp $SRCDIR/dock.png src/
 ## copy translations
 cp $SRCDIR/translations/messages/* translations/messages/
-## not in this version - introduced for the later qt4 build
-sed -i '/CSS Color themes/d' README
 ## remove meinproc check - there are a number of validity errors relating to the use of <sbr/> etc.,
 ## which I feel provides a better presentation. The help file displays as intended.
 sed -i 's|--check --cache index.cache.bz2|--cache index.cache.bz2|' cmake/modules/TDEMacros.cmake

-## Update 14.0.9 to development known working revision
-[[ $TDEVERSION == 14.0.9 ]] && {
-patch -p0 < $SRCDIR/backport.patch
-}
-
-## development build changes ..
 ## change num-pad keys text
 [[ $(cat $TMPVARS/Kvkbd_OPTS) == *numpad* ]] && {
 echo -e "\033[36;1m"'patching for num-pad text ..'"\033[0m"
--- a/Apps/kvpnc/kvpnc.SlackBuild
+++ b/Apps/kvpnc/kvpnc.SlackBuild
@ -33,12 +33,9 @@ getsource_fn

 untar_fn

-## this lang variable is for slack-desc & setting TRANS
+## for slack-desc
 langs="en"
-for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang.po";done
-[[ $langs != "" ]] && TRANS=ON
-langs=$(echo $langs | sed "s|.po||g")
-## this ldocs variable is only used for slack-desc
+for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
 ldocs="en tdeioslave"
 for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done

@ -66,7 +63,7 @@ cmake \
    -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
    -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
    -DBUILD_DOC="ON" \
-    -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \
+    -DBUILD_TRANSLATIONS="ON" \
    -Wno-dev \
    ..

--- a/BUILD-TDE.sh
+++ b/BUILD-TDE.sh
@ -103,8 +103,8 @@ Set the version of TDE to be built.
 
 " \
 13 75 3 \
-"14.0.9" "the R14.0.9 release - source from archives" \
-"14.0.x" "r14.0.10 preview/wip - source from Trinity git" \
+"14.0.10" "the R14.0.10 release - source from archives" \
+"14.0.x" "next release preview - source from Trinity git" \
 "14.1.0" "R14.1.0 development - source from Trinity git" \
 2> $TMPVARS/TDEVERSION

@ -855,7 +855,7 @@ for dir in $(cat $TMPVARS/TDEbuilds)
 do
 [[ ! -e $TMPVARS/download-failure ]] && {
   { [[ $dir == Deps* ]] && export TDEMIR_SUBDIR="/dependencies"; } \
-|| { [[ $dir == Core* ]] && export TDEMIR_SUBDIR=""; } \
+|| { [[ $dir == Core* ]] && export TDEMIR_SUBDIR="/core"; } \
 || { [[ $dir == Libs* ]] && export TDEMIR_SUBDIR="/libraries"; } \
 || { [[ $dir == Apps* ]] && export TDEMIR_SUBDIR="/applications"; } \
 || { [[ $dir == *Misc* ]] && export TDEMIR_SUBDIR="misc"; } # used for untar_fn - leading slash deliberately omitted
--- a/Core/tde-i18n/tde-i18n.SlackBuild
+++ b/Core/tde-i18n/tde-i18n.SlackBuild
@ -35,17 +35,27 @@ getsource_fn
 ## extract, build, and remove source for each language package one at a time

 cd $TMP_BUILD/tmp-$PRGNAM
-[[ $TDEVERSION == 14.0.9 ]] && {
+[[ $TDEVERSION == 14.0.10 ]] && {
 # extract the cmake source once only
 echo -e "\033[39;1m"
 echo "Extracting the cmake source from $(basename $SOURCE) ..."
 echo -e "\033[0m"
 tar xf $SOURCE $PRGNAM-trinity-$TDEVERSION/cmake
+# extract the template source once only
+echo -e "\033[39;1m"
+echo "Extracting the template source from $(basename $SOURCE) ..."
+echo -e "\033[0m"
+tar xf $SOURCE $PRGNAM-trinity-$TDEVERSION/template
+# extract the translations source once only
+echo -e "\033[39;1m"
+echo "Extracting the translations source from $(basename $SOURCE) ..."
+echo -e "\033[0m"
+tar xf $SOURCE $PRGNAM-trinity-$TDEVERSION/translations
 }

 for lang in $I18N
 do
-[[ $TDEVERSION == 14.0.9 ]] && {
+[[ $TDEVERSION == 14.0.10 ]] && {
 # extract the source for one language at a time for each iteration of the loop
 echo -e "\033[39;1m"
 echo "Extracting the $PRGNAM-$lang source from $(basename $SOURCE) ..."
--- a/Core/tdeartwork/tdeartwork.SlackBuild
+++ b/Core/tdeartwork/tdeartwork.SlackBuild
@ -48,6 +48,7 @@ cmake \
    -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
    -DLIB_SUFFIX=$LIBDIRSUFFIX \
    -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+    -DWITH_ALL_INCLUDED_XSCREENSAVERS="OFF" \
    -DWITH_ARTS="ON" \
    -DWITH_XSCREENSAVER="OFF" \
    -DWITH_LIBART="ON" \
--- a/Core/tdebase/tdebase.SlackBuild
+++ b/Core/tdebase/tdebase.SlackBuild
@ -160,7 +160,7 @@ cmake \
    -DWITH_PCRE="ON" \
    -DWITH_SAMBA="OFF" \
    -DWITH_SASL="OFF" \
-    -DWITH_SENSORS="OFF" \
+    -DWITH_SENSORS="ON" \
    -DWITH_SHADOW="ON" \
    -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="ON" \
    -DWITH_SUDO_TDESU_BACKEND="ON" \
@ -223,6 +223,7 @@ cmake \
    -DBUILD_TDESCREENSAVER="ON" \
    -DBUILD_TDESU="ON" \
    -DBUILD_TDM="ON" \
+    -DBUILD_TDM_SYSTEMD_UNIT_FILE="OFF" \
    -DBUILD_TQT3INTEGRATION="ON" \
    -DBUILD_TSAK="ON" \
    -DBUILD_TWIN="ON" \
--- a/Core/tdelibs/tdelibs.SlackBuild
+++ b/Core/tdelibs/tdelibs.SlackBuild
@ -162,6 +162,7 @@ cmake \
    -DWITH_GCC_VISIBILITY="OFF" \
    -DWITH_HAL="OFF" \
    -DWITH_HSPELL="OFF" \
+    -DWITH_IMAGETOPS_BINARY="OFF" \
    -DWITH_INOTIFY="ON" \
    -DWITH_ISPELL=${ISPELL:-"OFF"} \
    -DWITH_JASPER="OFF" \
--- a/Core/tdewebdev/README
+++ b/Core/tdewebdev/README
@ -1,2 +0,0 @@
-The build hasn't been updated to cmake because that doesn't yet include Kommander, KXSLDbg, KImageMapEditor, KLinkStatus
- 
--- a/Core/tdewebdev/tdewebdev.SlackBuild
+++ b/Core/tdewebdev/tdewebdev.SlackBuild
@ -39,35 +39,19 @@ sed -i "s|FileName=trinity|FileName=$PLUGIN_INSTALL_DIR|" quanta/data/config/plu
 sed -i "s|/opt/trinity|$INSTALL_TDE|" */*.tdevelop
 sed -i "s|trinity/|$PLUGIN_INSTALL_DIR/|" doc/*/*.docbook

-## /usr/bin/ld: quanta.o: undefined reference to symbol '_ZNK6KParts11PartManager5partsEv'
-[[ $TDEVERSION == 14.0.9 ]] && sed -i 's|-ltdefx|& $(LIB_TDEPARTS)|' quanta/src/Makefile.am
-
 listdocs_fn

-[[ $TDEVERSION == 14.0.9 ]] && ltoolupdate_fn
-
 chown_fn

 cd_builddir_fn

-[[ $TDEVERSION == 14.0.9 ]] && {
-
-CFLAGS="$SLKRCFLAGS" \
-CXXFLAGS="$SLKRCFLAGS" \
-CC=$COMPILER \
-CXX=$COMPILER_CXX \
-../configure \
-   --prefix=$INSTALL_TDE \
-   --disable-rpath \
-   --enable-closure
-
-} || {
-
 ## override hard coded trinity installation directory link
 sed -i "s|/opt/trinity|$INSTALL_TDE|" ../doc/man/*/*.1

 ## LIB_INSTALL_DIR is for ../kommander/{widget{,s},plugin}/CMakeLists.txt
 ## which defaults to $INSTALL_TDE/lib
+## TDEFileReplace has been moved to tdeutils for R14.1.0
+[[ $TDEVERSION != 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON"
 cmake \
    -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
    -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
@ -87,10 +71,10 @@ cmake \
    -DBUILD_KOMMANDER="ON" \
    -DBUILD_KXSLDBG="ON" \
    -DBUILD_QUANTA="ON" \
+    ${TDEFileReplace:-} \
    -Wno-dev \
    ..

-}

 make_fn

@ -102,8 +86,7 @@ mkdir_install_fn

 doinst_sh_fn

-## TDEFileReplace has been moved to tdeutils for R14.1.0
-[[ $TDEVERSION == 14.0.? ]] && TDEFileReplace=" * TDEFileReplace: powerful search and replace in multiple files"
+[[ $TDEVERSION != 14.1.0 ]] && TDEFileReplace=" * TDEFileReplace: powerful search and replace in multiple files"
 echo "
 # HOW TO EDIT THIS FILE:
 # The 'handy ruler' below makes it easier to edit a package description.  Line
--- a/README.md
+++ b/README.md
@ -44,12 +44,15 @@ Apps [applications/]
 Other directories are:  
 ```
 Misc - for non-Trinity package builds
-src - to hold all the sources, either pre-downloaded or downloaded during the build.
+src - to hold all the sources, either pre-downloaded
+      or downloaded during the build.
 ```
 Other scripts:  
 ```
 get-source.sh - a chunk of common code for the SlackBuilds
-              - used for getting the sources, setting FLAGS, creating build directories, ...
+              - used for getting the sources, setting FLAGS,
+                creating build directories, ...
+
 ```
 There is an override in the Misc SlackBuilds for non-trinity source archive URLs. Non-trinity builds have been included where a TDE package requires a dependency that is not in Slackware, or where it's an alternative to a TDE package.

--- a/get-source.sh
+++ b/get-source.sh
@ -68,15 +68,15 @@ rm -rf $OUTPUT/{checkout,configure,make,install,error,makepkg,patch}-$PRGNAM.log
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)

-## if 14.0.9 or misc, download archive:
-[[ $TDEVERSION == 14.0.9 || $TDEMIR_SUBDIR == misc ]] && {
+## if 14.0.10 or misc, download archive:
+[[ $TDEVERSION == 14.0.10 || $TDEMIR_SUBDIR == misc ]] && {
 ## check for and remove any zero byte archive files
 [[ ! -s $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} ]] && \
 rm $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} 2>/dev/null || true
 ## R14.0.6+ archive names include -trinity.
 ## To maintain compatibility with the previous naming convention,
 ## sym-link any pre-downloaded R14.0.6+ archives
-[[ $TDEVERSION == 14.0.[6-9] ]] && [[ -s $SRCDIR/../../src/$PRGNAM-trinity-$VERSION.tar.xz ]] && \
+[[ $TDEVERSION == 14.0.10 ]] && [[ -s $SRCDIR/../../src/$PRGNAM-trinity-$VERSION.tar.xz ]] && \
 (cd $SRCDIR/../../src/
 ln -sf $PRGNAM-trinity-$VERSION.tar.xz $PRGNAM-$VERSION.tar.xz)

@ -113,7 +113,7 @@ if [ "$P1" == "--download" ]; then
 fi
 } || \
 {
-## otherwise, not R14.0.9 or misc, and we are creating/updating git,
+## otherwise, not R14.0.10 or misc, and we are creating/updating git,
 ## so [1] start with admin/cmake:
 [[ $(cat $TMPVARS/DL_CGIT) == yes ]] && {
 cd $BUILD_TDE_ROOT/src/cgit
@ -170,7 +170,7 @@ git fetch origin r14.0.x:r14.0.x)
 git clone https://mirror.git.trinitydesktop.org/cgit/libltdl
 }

-## if tdenetwork, need libtdevnc, but not yet for 14.0.x==14.0.9 which uses krfb/libvncserver
+## if tdenetwork, need libtdevnc, but not yet for 14.0.x==14.0.11[?] which uses krfb/libvncserver
 [[ " tdenetwork " == *$PRGNAM* ]] && {
 [[ -d libtdevnc ]] && \
 (echo "Updating libtdevnc ..."
@ -242,7 +242,7 @@ cd $TMP_BUILD/tmp-$PRGNAM
 ##
 ## [1] firstly test for R14 or misc ..
 ##
-[[ $TDEVERSION == 14.0.9 || $TDEMIR_SUBDIR == misc ]] && {
+[[ $TDEVERSION == 14.0.10 || $TDEMIR_SUBDIR == misc ]] && {

 ## unpack R14 or misc
 echo -e "\n unpacking $(basename $SOURCE) ... \n"
@ -252,7 +252,7 @@ tar -xf $SOURCE

 } || {

-## [2] not 14.0.9 nor misc, so must be git ..
+## [2] not 14.0.10 nor misc, so must be git ..
 ## but is it [2a] 14.0.x ..
 [[ $TDEVERSION == 14.0.x ]] && {
				`@ -1,2 +0,0 @@`
				`The build hasn't been updated to cmake because that doesn't yet include Kommander, KXSLDbg, KImageMapEditor, KLinkStatus`