Updated for R14.0.9

Kvkbd - revised algorithm for Shift and Caps characters
      - option to set key/button background colour
      - added build to cross compiling page
tdelibs forced spell checker work-around
pull/25/head
Ray-V 4 years ago
parent 9ba6b8458e
commit 22bafa87e7

@ -33,15 +33,8 @@ getsource_fn
untar_fn untar_fn
# for 14.0.8, set support for additional language(s) as per I18N variable
# but only for languages available with this package
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh
#
langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang.po";done
[[ $TDEVERSION == 14.0.8 ]] && sed -i "s|\${po_files}|$langs|" translations/messages/CMakeLists.txt
[[ $langs != "" ]] && TRANS=ON
## for slack-desc ## for slack-desc
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 listdocs_fn
@ -57,7 +50,7 @@ cmake \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -88,7 +81,7 @@ $PRGNAM: is right-associative, for example: (2^3)^2*e^4/pi 2^3^2*e^4/pi
$PRGNAM: [The answers given by abakus: 1112.26437907 8898.11503252] $PRGNAM: [The answers given by abakus: 1112.26437907 8898.11503252]
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
" > $PKG/install/slack-desc " > $PKG/install/slack-desc

@ -33,15 +33,8 @@ getsource_fn
untar_fn untar_fn
# for 14.0.8, set support for additional language(s) as per I18N variable
# but only for languages available with this package
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh
#
langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang.po";done
[[ $TDEVERSION == 14.0.8 ]] && sed -i "s|\${po_files}|$langs|" translations/messages/CMakeLists.txt
[[ $langs != "" ]] && TRANS=ON
## for slack-desc ## for slack-desc
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 listdocs_fn
@ -60,7 +53,7 @@ cmake \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_GCC_VISIBILITY="OFF" \ -DWITH_GCC_VISIBILITY="OFF" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -87,7 +80,7 @@ echo "
$PRGNAM: Dolphin (a file manager for TDE) $PRGNAM: Dolphin (a file manager for TDE)
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:

@ -34,28 +34,19 @@ getsource_fn
untar_fn untar_fn
# set support for additional language(s) as per I18N variable ## for slack-desc
# but only for languages available with this package langs="en"
langs="" # the *.po file list ldocs="en"
ldocs="en man" # the help docs - en and man always
for Lang in $I18N for Lang in $I18N
do do
[[ -s translations/messages/$Lang.po ]] && { [[ -s translations/messages/$Lang.po ]] && {
langs="$langs $Lang.po" langs="$langs $Lang"
## ... and within that loop as doc locale only exists where translation exists ## ... and within that loop as doc locale only exists where translation exists
[[ -d doc/$Lang ]] && { [[ -d doc/$Lang ]] && {
ldocs="$ldocs $Lang" ldocs="$ldocs $Lang"
} }
} }
done done
#
sed -i "s|\${po_files}|$langs|" translations/messages/CMakeLists.txt
[[ $langs != "" ]] && TRANS=ON
#
sed -i "s|\${_dirs}|$ldocs|" doc/CMakeLists.txt
## for slack-desc
langs=$(echo $langs|sed 's|.po||g')
ldocs=$(echo $ldocs|sed 's| man||')
listdocs_fn listdocs_fn
@ -74,7 +65,7 @@ cmake \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -104,7 +95,7 @@ $PRGNAM: being used by graphically representating your filesystem as a set of
$PRGNAM: concentric segmented-rings. $PRGNAM: concentric segmented-rings.
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: With help documentation for: $PRGNAM: With help documentation for:
$PRGNAM: $ldocs $PRGNAM: $ldocs

@ -33,40 +33,13 @@ getsource_fn
untar_fn untar_fn
## https://mirror.git.trinitydesktop.org/cgit/kkbswitch, commit d8aff77
[[ $TDEVERSION == 14.0.8 ]] && {
patch -N -p0 << EOF || true
--- kkbswitch/CMakeLists.txt
+++ kkbswitch/CMakeLists.txt
# Install the translated kkbswitch.desktop file to default XDG_APPS_INSTALL_DIR
@@ -48,4 +48 @@
-tde_create_translated_desktop(
- SOURCE \${PROJECT_NAME}.desktop
- DESTINATION \${AUTOSTART_INSTALL_DIR}
-)
+tde_create_translated_desktop( \${PROJECT_NAME}.desktop )
# Install the translated kkbswitch.desktop file to AUTOSTART_INSTALL_DIR
@@ -54,2 +51,2 @@
- FILES \${PROJECT_NAME}.desktop
- DESTINATION \${APPS_INSTALL_DIR}/Utilities
+ FILES \${CMAKE_CURRENT_BINARY_DIR}/\${PROJECT_NAME}.desktop
+ DESTINATION \${AUTOSTART_INSTALL_DIR}
EOF
}
## edit man page ## edit man page
sed -i "s|/usr/share/doc/.*/HTML/en/kkbswitch/|$INSTALL_TDE/share/doc/tde/HTML/en/kkbswitch/|" doc/man/kkbswitch.1 sed -i "s|/usr/share/doc/.*/HTML/en/kkbswitch/|$INSTALL_TDE/share/doc/tde/HTML/en/kkbswitch/|" doc/man/kkbswitch.1
# for 14.0.8, set support for additional language(s) as per I18N variable
# but only for languages available with this package
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh
#
langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang.po";done
[[ $TDEVERSION == 14.0.8 ]] && sed -i "s|\${po_files}|$langs|" translations/messages/CMakeLists.txt
[[ $langs != "" ]] && TRANS=ON
[[ $langs == *ru* || $langs == *uk* ]] && RU_UA=ON
## for slack-desc ## for slack-desc
langs=$(echo $langs | sed "s|.po||g") langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
## Russian/Ukrainian combined keyboard mappings
[[ $langs == *ru* || $langs == *uk* ]] && RU_UA=ON
listdocs_fn listdocs_fn
@ -83,8 +56,9 @@ cmake \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_GCC_VISIBILITY="OFF" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-DWITH_RU_UA_LAYOUT=${RU_UA:-"OFF"} \ -DWITH_RU_UA_LAYOUT=${RU_UA:-"OFF"} \
-Wno-dev \ -Wno-dev \
.. ..
@ -117,7 +91,7 @@ $PRGNAM: group from the icon's menu
$PRGNAM: Toggle between the two most recently used groups. $PRGNAM: Toggle between the two most recently used groups.
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
" > $PKG/install/slack-desc " > $PKG/install/slack-desc

@ -41,16 +41,8 @@ sed -i 's|<tr><td>|<tr><td width=70%>|g' src/knemod/interfacetooltip.cpp
# patch # patch
sed -i 's|Default Gateway" ), LINK_QUALITY|Default Gateway" ), GATEWAY|' src/knemod/interfacetooltip.cpp sed -i 's|Default Gateway" ), LINK_QUALITY|Default Gateway" ), GATEWAY|' src/knemod/interfacetooltip.cpp
# set support for additional language(s) as per I18N variable ## for slack-desc
# but only for languages available with this package langs="en";for Lang in $I18N;do [[ -s translations/messages/knemod/$Lang.po ]] && langs="$langs $Lang";done
langs="";for Lang in $I18N;do [[ -d translations/$Lang ]] && langs="$langs $Lang/messages/kcm_knemo.po";done
## convoluted method to work around cmake 'add_custom_target' seeing duplicate files
langs2="" && \
for Lang in $I18N;do [[ -d translations/$Lang ]] && langs2="$langs2 $Lang/messages/knemod.po";done && \
langs="$langs $langs2" && \
sed -i "s|\${po_files}|$langs|" translations/CMakeLists.txt && \
langs=$(echo $langs2|sed "s|/messages/knemod.po||g")
[[ $langs != "" ]] && TRANS=ON
listdocs_fn listdocs_fn
@ -70,7 +62,7 @@ cmake \
-DWITH_GCC_VISIBILITY="OFF" \ -DWITH_GCC_VISIBILITY="OFF" \
-DWITH_LIBIW="OFF" \ -DWITH_LIBIW="OFF" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -99,7 +91,7 @@ $PRGNAM: outgoing traffic. For every network interface it displays an icon in
$PRGNAM: the Panel. $PRGNAM: the Panel.
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: IMPORTANT: KNemo has to be started using $PRGNAM: IMPORTANT: KNemo has to be started using
$PRGNAM: Trinity Control Center|Internet & Network|Network Monitor. $PRGNAM: Trinity Control Center|Internet & Network|Network Monitor.

@ -33,20 +33,8 @@ getsource_fn
untar_fn untar_fn
# for 14.0.8, 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 translations/$Lang ]] && langs="$langs $Lang/messages/$PRGNAM.po";done
sed -i "s|\${po_files}|$langs|" translations/CMakeLists.txt
## for slack-desc
langs=$(echo $langs|sed "s|/messages/$PRGNAM.po||g")
#
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh
## for slack-desc ## for slack-desc
[[ $TDEVERSION != 14.0.8 ]] && { langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$Lang $langs";done
langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$Lang $langs";done
}
[[ $langs != "" ]] && TRANS=ON
listdocs_fn listdocs_fn
@ -63,7 +51,9 @@ cmake \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DWITH_GCC_VISIBILITY="OFF" \
-DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -91,7 +81,7 @@ $PRGNAM: knetstats is a simple TDE network monitor that shows rx/tx LEDs for
$PRGNAM: any network interface on a system tray icon. $PRGNAM: any network interface on a system tray icon.
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:

@ -33,24 +33,13 @@ getsource_fn
untar_fn untar_fn
# for 14.0.8, set support for additional language(s) as per I18N variable
# but only for languages available with this package
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh
#
[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages
#
# there is a Spanish language file in the source, but it has no translations in it .. # there is a Spanish language file in the source, but it has no translations in it ..
# the included es.po file is a Google translation - if you don't want to use it, # the included es.po file is a Google translation - if you don't want to use it,
# then comment out the following line: # then comment out the following line:
cp $SRCDIR/es.po ${PO_PATH:-po} cp $SRCDIR/es.po ${PO_PATH:-po}
#
langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done # for slack-desc
# langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
## for 14.0.8, this GLOB overrides 'LANG auto' in po/CMakeLists.txt:
[[ $TDEVERSION == 14.0.8 ]] && sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake
[[ $langs != "" ]] && TRANS=ON
## for slack-desc
langs=$(echo $langs | sed "s|.po||g")
listdocs_fn listdocs_fn
@ -66,8 +55,9 @@ cmake \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_GCC_VISIBILITY="OFF" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -99,7 +89,7 @@ $PRGNAM:
$PRGNAM: Needs separate chess engines, for example gnuchess, stockfish, komodo. $PRGNAM: Needs separate chess engines, for example gnuchess, stockfish, komodo.
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
" > $PKG/install/slack-desc " > $PKG/install/slack-desc

@ -33,19 +33,8 @@ getsource_fn
untar_fn untar_fn
# for 14.0.8, set support for additional language(s) as per I18N variable
# but only for languages available with this package
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh
#
[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages
#
langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done
#
## for 14.0.8, this GLOB overrides 'LANG auto' in po/CMakeLists.txt:
[[ $TDEVERSION == 14.0.8 ]] && sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake
[[ $langs != "" ]] && TRANS=ON
## for slack-desc ## for slack-desc
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 listdocs_fn
@ -64,7 +53,7 @@ cmake \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_GCC_VISIBILITY="OFF" \ -DWITH_GCC_VISIBILITY="OFF" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -97,7 +86,7 @@ $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
" > $PKG/install/slack-desc " > $PKG/install/slack-desc

@ -33,37 +33,15 @@ getsource_fn
untar_fn untar_fn
# for 14.0.8, set support for additional language(s) as per I18N variable
# but only for languages available with this package
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh
#
[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages
#
langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done
#
## for 14.0.8 autotools build:
[[ $TDEVERSION == 14.0.8 ]] && sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am
[[ $langs != "" ]] && TRANS=ON
## for slack-desc ## for slack-desc
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 listdocs_fn
[[ $TDEVERSION == 14.0.8 ]] && ltoolupdate_fn
chown_fn chown_fn
cd_builddir_fn cd_builddir_fn
[[ $TDEVERSION == 14.0.8 ]] && {
CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \
CXX=$COMPILER_CXX \
../configure \
--prefix=$INSTALL_TDE \
--disable-rpath
} || {
cmake \ cmake \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
@ -74,16 +52,15 @@ cmake \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_GCC_VISIBILITY="OFF" \ -DWITH_GCC_VISIBILITY="OFF" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
}
make_fn make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.8 ]] && mangzip_fn mangzip_fn
strip_fn strip_fn
@ -104,7 +81,7 @@ $PRGNAM: languages. Primarily, it is a front-end to the veteran Cscope,
$PRGNAM: a source-code browser originally developed at Bell Labs. $PRGNAM: a source-code browser originally developed at Bell Labs.
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:

@ -33,19 +33,8 @@ getsource_fn
untar_fn untar_fn
# for 14.0.8, set support for additional language(s) as per I18N variable
# but only for languages available with this package
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh
#
[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages
#
langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done
#
## for 14.0.8, this GLOB overrides 'LANG auto' in po/CMakeLists.txt:
[[ $TDEVERSION == 14.0.8 ]] && sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake
[[ $langs != "" ]] && TRANS=ON
## for slack-desc ## for slack-desc
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 listdocs_fn
@ -61,8 +50,9 @@ cmake \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_GCC_VISIBILITY="OFF" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -93,7 +83,7 @@ $PRGNAM: Read the 'sensors-detect' man page for warnings on usage, then
$PRGNAM: run 'sensors-detect' to scan for hardware monitoring chips. $PRGNAM: run 'sensors-detect' to scan for hardware monitoring chips.
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:

@ -33,33 +33,9 @@ getsource_fn
untar_fn untar_fn
# set support for additional language(s) as per I18N variable
# but only for languages available with this package
#
[[ $TDEVERSION == 14.0.8 ]] && {
langs="";for Lang in $I18N;do [[ -e 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
#
## always build 'en' [==kshutdown] docs ...
ldocs="kshutdown man"
} || {
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh
## langs= for slack-desc only ..
langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
ldocs="en man"
}
#
## ... and find other html docs required and available ...
for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
## ... and edit tde_auto_add_subdirectories GLOB:
[[ $TDEVERSION == 14.0.8 ]] && sed -i "s|} \* )|} $ldocs )|" cmake/modules/TDEMacros.cmake
#
[[ $langs != "" ]] && TRANS=ON
#
## for slack-desc ## for slack-desc
langs=$(echo $langs | sed "s|.po||g") langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
ldocs=$(echo $ldocs | sed "s|kshutdown|en|;s| man||") ldocs="en";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
listdocs_fn listdocs_fn
@ -77,8 +53,10 @@ cmake \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
-DWITH_GCC_VISIBILITY="OFF" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-DBUILD_EXTRAS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -105,7 +83,7 @@ echo "
$PRGNAM: KShutDown is an advanced shut down utility for TDE $PRGNAM: KShutDown is an advanced shut down utility for TDE
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: and help documentation for: $PRGNAM: and help documentation for:
$PRGNAM: $ldocs $PRGNAM: $ldocs

@ -1,9 +0,0 @@
Known issues with Kvkbd are:
Where the shift character is not the upper case of the lower alpha character, the upper case character will be shown on the key.
For example, on the French azerty keyboard, Shift eacute should show as 2, but shows as Eacute.
Where the KeyPad '.' character on the Del key is mapped as a comma for a particular locale, it stills shows on the key as a period.
These are only problems with the characters displayed on the keys - the correct characters are printed.

@ -70,8 +70,10 @@
When first launched, &kvkbd; will appear in the bottom-right corner of the screen. When first launched, &kvkbd; will appear in the bottom-right corner of the screen.
<sbr/>It can be moved by clicking and dragging on any part of the background area. <sbr/>It can be moved by clicking and dragging on any part of the background area.
<sbr/><sbr/>Resize it by clicking and dragging on the stripes at the bottom right. <sbr/>Resize it by clicking and dragging on the stripes at the bottom right.
<sbr/>The <guiicon><inlinegraphic fileref="exit-btn.png"/></guiicon> button on the top right is used to hide the keyboard - to show it again, just click on the tray icon. <sbr/><sbr/>The style will be the system default which can be overridden whether launched from the command line or via the .desktop file with any &tde; or &TQt; style installed on the system.
<sbr/>Example: <command>kvkbd --style plastik</command>, as shown here.
<sbr/><sbr/>The <guiicon><inlinegraphic fileref="exit-btn.png"/></guiicon> button on the top right is used to hide the keyboard - to show it again, just click on the tray icon.
<sbr/><sbr/> <sbr/><sbr/>
<emphasis role="bold">French keyboard:</emphasis> <emphasis role="bold">French keyboard:</emphasis>

@ -346,7 +346,7 @@ patch -N -p0 << EOF || true
+++ src/MainWidget.cpp +++ src/MainWidget.cpp
@@ -410 +410 @@ @@ -410 +410 @@
- int padx= 550; - int padx= 550;
+ int padx= 552; + int padx= 553;
# #
## move and resize keyboard ## move and resize keyboard
--- src/MainWidget.cpp --- src/MainWidget.cpp
@ -356,28 +356,28 @@ patch -N -p0 << EOF || true
+ int stx=17; + int stx=17;
@@ -593 +593 @@ @@ -593 +593 @@
- int d_width=550; - int d_width=550;
+ int d_width=552; + int d_width=553;
@@ -639,2 +639,2 @@ @@ -639,2 +639,2 @@
- sdxs = width() - (width() * (150.0/700.0)); - sdxs = width() - (width() * (150.0/700.0));
- VButton::pw=700.0; - VButton::pw=700.0;
+ sdxs = width() - (width() * (150.0/702.0)); + sdxs = width() - (width() * (150.0/704.0));
+ VButton::pw=702.0; + VButton::pw=704.0;
@@ -642 +642 @@ @@ -642 +642 @@
- setMinimumSize(700/3,235/3); - setMinimumSize(700/3,235/3);
+ setMinimumSize(702/3,235/3); + setMinimumSize(704/3,235/3);
@@ -646,2 +646,2 @@ @@ -646,2 +646,2 @@
- sdxb = width() + (width() * (150.0/550.0)); - sdxb = width() + (width() * (150.0/550.0));
- VButton::pw=550.0; - VButton::pw=550.0;
+ sdxb = width() + (width() * (150.0/552.0)); + sdxb = width() + (width() * (150.0/553.0));
+ VButton::pw=552.0; + VButton::pw=553.0;
@@ -649 +649 @@ @@ -649 +649 @@
- setMinimumSize(550/3,235/3); - setMinimumSize(550/3,235/3);
+ setMinimumSize(552/3,235/3); + setMinimumSize(553/3,235/3);
--- src/VButton.cpp
--- src/VButton.cpp --- src/VButton.cpp
+++ src/VButton.cpp
@@ -5 +5 @@ @@ -5 +5 @@
-double VButton::pw=550.0; -double VButton::pw=550.0;
+double VButton::pw=552.0; +double VButton::pw=553.0;
EOF EOF
## missing characters in keysymtab[] - for AC12 -> AD13 key on ua keyboard ## missing characters in keysymtab[] - for AC12 -> AD13 key on ua keyboard
@ -519,20 +519,231 @@ patch -N -p0 << EOF || true
EOF EOF
## fix azerty keyboards shift keys showing caps
# for 14.0.8, set support for additional language(s) as per I18N variable ## simplify the algorithm and use s for shift characters, leave u for upper case
# but only for languages available with this package patch -N -p0 << EOF || true
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh --- src/MainWidget.cpp
+++ src/MainWidget.cpp
@@ -905,30 +905,22 @@
KeyCode keycode=v.getKeyCode();
-
+// first level character keysym
KeySym keysym_l = XkbKeycodeToKeysym(display, keycode, 0, 0);
+// second level, ie shift, character keysym
+ KeySym keysym_s = XkbKeycodeToKeysym(display, keycode, 0, 1);
- KeySym keysym_u = XkbKeycodeToKeysym(display, keycode, 0, 1);
-
- long ret = keysym2ucs(keysym_l);
-
- TQString btn_text(TQChar((uint)ret));
+ long retl = keysym2ucs(keysym_l);
- TQChar c((uint)ret);
- if (c=='&')
+ TQChar l((uint)retl);
+ if (l=='&')
v.setText("&&");
else
- v.setText(btn_text);
+ v.setText(l);
- TQString btn_upper(btn_text.upper());
+ long rets = keysym2ucs(keysym_s);
- if (btn_upper==btn_text) {
- ret = keysym2ucs(keysym_u);
- TQChar c((uint)ret);
- if (c=='&')
+ TQChar s((uint)rets);
+ if (s=='&')
v.setShiftText("&&");
else
- v.setShiftText(c);
- }
- else {
- v.setShiftText(btn_upper);
- }
+ v.setShiftText(s);
}
EOF
# #
[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages patch -N -p0 << EOF || true
--- src/VButton.cpp
+++ src/VButton.cpp
@@ -22,16 +22,6 @@
{
- if (press==true){
- TQString tu=l.upper();
- if (tu.compare(l)==0){
- //TQPushButton::setText(tu);
- TQPushButton::setText(u);
- }
- else{
- TQPushButton::setText(tu);
- }
-
- }
- else{
+ if (press==true)
+ TQPushButton::setText(s);
+ else
TQPushButton::setText(l);
- }
}
@@ -39,14 +29,7 @@
{
- if (press==true){
+ if (press==true) {
TQString tu=l.upper();
- if (tu.compare(l)==0){
- TQPushButton::setText(tu);
- }
- else{
- TQPushButton::setText(u);
- }
- }
- else{
+ TQPushButton::setText(tu); }
+ else
TQPushButton::setText(l);
- }
}
@@ -60,3 +43,3 @@
{
- u=text;
+ s=text;
}
EOF
# #
langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done patch -N -p0 << EOF || true
--- src/VButton.h
+++ src/VButton.h
@@ -31,3 +31,3 @@
unsigned int keycode;
- TQString u;
+ TQString s;
TQString l;
EOF
# #
## for 14.0.8, this GLOB overrides 'LANG auto' in po/CMakeLists.txt: patch -N -p0 << EOF || true
[[ $TDEVERSION == 14.0.8 ]] && sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake --- src/numpadvbutton.cpp
[[ $langs != "" ]] && TRANS=ON +++ src/numpadvbutton.cpp
@@ -35,3 +35,3 @@
if (press==true){
- TQPushButton::setText(u);
+ TQPushButton::setText(s);
VButton::setKeyCode(numlock_code);
EOF
## set button background colour which otherwise defaults to system colour
## User option, set in ./BUILD-TDE.sh
## Note: this bleeds through on the corners when using the plastik style which has rounded corners
## and keramik which is even more shaped.
KEYCOLR=$(cat $TMPVARS/kvkbd-keycolr)
[[ $KEYCOLR ]] && {
patch -N -p0 << EOF || true
--- src/VButton.cpp
+++ src/VButton.cpp
@@ -11,2 +11,3 @@
//connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(sendKey()));
+ setPaletteBackgroundColor ( TQColor($KEYCOLR) );
setFocusPolicy(TQ_NoFocus);
EOF
}
## This is a work-in-progress, so these patches are in part revisions of previous patches
## Revise positions of keys and reformat code to represent the calculations left-to-right
patch -N -p0 << EOF || true
--- src/MainWidget.cpp
+++ src/MainWidget.cpp
@@ -75,3 +75,3 @@
- int stx=17;
+ int stx=16;
int sty=15;
@@ -96,3 +96,3 @@
f->setText ( "F"+TQString ( "%1" ).arg ( a+1 ) );
- f->move ( stx+esc->width() +3 + ( 35*a ) +25,sty );
+ f->move ( stx+esc->width() +30 + ( 35*a ),sty );
f->res();
@@ -106,3 +106,3 @@
f->setText ( "F"+TQString ( "%1" ).arg ( a+5 ) );
- f->move ( stx+esc->width() +3 + ( 35*a ) +40+ ( 4*35 ),sty );
+ f->move ( stx+esc->width() +30 + ( 4*35 ) +14 + ( 35*a ),sty );
f->res();
@@ -117,3 +117,3 @@
f->setText ( "F"+TQString ( "%1" ).arg ( a+9 ) );
- f->move ( stx+esc->width() +3 + ( 35*a ) +45+ ( 8*35 ) +10,sty );
+ f->move ( stx+esc->width() +30 + ( 8*35 ) +28 + ( 35*a ),sty );
f->res();
@@ -261,3 +261,3 @@
//v->setShiftText ( k4s.mid ( a,1 ) );
- v->move ( stx+35+15+ ( 35*a ),sty+ ( 4*35 ) );
+ v->move ( stx+lshft->width() +5+ ( 35*a ),sty+ ( 4*35 ) );
btns.append ( v );
@@ -269,3 +269,3 @@
sm->setKeyCode ( 59 );
- sm->move ( stx+ ( R4LEN *35 ) +lshft->width() +5,sty+ ( 4*35 ) );
+ sm->move ( stx+lshft->width() +5+ ( R4LEN *35 ) ,sty+ ( 4*35 ) );
//sm->setText ( "," );
@@ -278,3 +278,3 @@
gr->setKeyCode ( 60 );
- gr->move ( stx+ ( ( R4LEN +1 ) *35 ) +lshft->width() +5,sty+ ( 4*35 ) );
+ gr->move ( stx+lshft->width() +5+ ( ( R4LEN +1 ) *35 ) ,sty+ ( 4*35 ) );
//gr->setText ( "." );
@@ -287,3 +287,3 @@
sl->setKeyCode ( 61 );
- sl->move ( stx+ ( ( R4LEN +2 ) *35 ) +lshft->width() +5,sty+ ( 4*35 ) );
+ sl->move ( stx+lshft->width() +5+ ( ( R4LEN +2 ) *35 ) ,sty+ ( 4*35 ) );
//sl->setText ( "/" );
@@ -296,3 +296,3 @@
rshft->setKeyCode ( 62 );
- rshft->move ( stx+ ( ( R4LEN +3 ) *35 ) +lshft->width() +5,sty+ ( 4*35 ) );
+ rshft->move ( stx+lshft->width() +5+ ( ( R4LEN +3 ) *35 ) ,sty+ ( 4*35 ) );
rshft->resize ( 68,30 );
@@ -318,3 +318,3 @@
win->resize ( 45,30 );
- win->move ( 5+lctrl->x() +lctrl->width(), sty+ ( 5*35 ) );
+ win->move ( lctrl->x() +lctrl->width() +5, sty+ ( 5*35 ) );
win->setText ( "LWin" );
@@ -329,3 +329,3 @@
lalt->resize ( 45,30 );
- lalt->move ( 5+win->x() +win->width(), sty+ ( 5*35 ) );
+ lalt->move ( win->x() +win->width() +5, sty+ ( 5*35 ) );
lalt->setText ( "Alt" );
@@ -339,4 +339,4 @@
space->setKeyCode ( 65 );
- space->resize ( 5*35+28-45-5,30 );
- space->move ( 5+lalt->x() +lalt->width(),sty+ ( 5*35 ) );
+ space->resize ( 153,30 );
+ space->move ( lalt->x() +lalt->width() +5, sty+ ( 5*35 ) );
connect ( space, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) );
@@ -347,3 +347,3 @@
ralt->resize ( 45,30 );
- ralt->move ( 5+space->x() +space->width(), sty+ ( 5*35 ) );
+ ralt->move ( space->x() +space->width() +5, sty+ ( 5*35 ) );
ralt->setText ( "AltGr" );
@@ -356,3 +356,3 @@
rwin->resize ( 45,30 );
- rwin->move ( 5+ralt->x() +ralt->width(), sty+ ( 5*35 ) );
+ rwin->move ( ralt->x() +ralt->width() +5, sty+ ( 5*35 ) );
rwin->setText ( "RWin" );
@@ -367,3 +367,3 @@
mnu->resize ( 45,30 );
- mnu->move ( 5+rwin->x() +rwin->width(), sty+ ( 5*35 ) );
+ mnu->move ( rwin->x() +rwin->width() +5, sty+ ( 5*35 ) );
mnu->setText ( "Menu" );
@@ -378,3 +378,3 @@
rctrl->resize ( 45,30 );
- rctrl->move ( 5+mnu->x() +mnu->width(), sty+ ( 5*35 ) );
+ rctrl->move ( mnu->x() +mnu->width() +5, sty+ ( 5*35 ) );
rctrl->setText ( "Ctrl" );
EOF
## for slack-desc ## for slack-desc
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 listdocs_fn
@ -549,7 +760,7 @@ cmake \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DWITH_GCC_VISIBILITY="OFF" \ -DWITH_GCC_VISIBILITY="OFF" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -576,7 +787,7 @@ $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:

@ -33,35 +33,15 @@ getsource_fn
untar_fn untar_fn
# for 14.0.8, set support for additional language(s) as per I18N variable ## this lang variable is for slack-desc & setting TRANS
# but only for languages available with this package langs="en"
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang.po";done
#
[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages
## for cgit, this lang variable is only used for slack-desc
langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done
#
## for cgit, translations are generated via LINGUAS variable
[[ $TDEVERSION == 14.0.8 ]] && {
## this GLOB overrides 'LANG auto' in po/CMakeLists.txt:
sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake
#
## set up doc/CMakeLists.txt as per other apps
## to make compatible with the following docs routine
echo "tde_auto_add_subdirectories( )" > doc/CMakeLists.txt
}
## always build en_US docs ...
ldocs="en man misc tdeioslave"
## ... and find other html docs required and available ...
for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
## ... and edit tde_auto_add_subdirectories GLOB:
[[ $TDEVERSION == 14.0.8 ]] && sed -i "s|} \* )|} $ldocs )|" cmake/modules/TDEMacros.cmake
#
[[ $langs != "" ]] && TRANS=ON [[ $langs != "" ]] && TRANS=ON
## for slack-desc
langs=$(echo $langs | sed "s|.po||g") langs=$(echo $langs | sed "s|.po||g")
ldocs=$(echo $ldocs | sed "s| man misc||") ## this ldocs variable is only used for slack-desc
# ldocs="en tdeioslave"
for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
## add misc docs ## add misc docs
MISC_FILES=$(cd doc/misc/;ls README* pptp.txt) MISC_FILES=$(cd doc/misc/;ls README* pptp.txt)
cat << EOF > doc/misc/CMakeLists.txt cat << EOF > doc/misc/CMakeLists.txt
@ -71,8 +51,6 @@ INSTALL(
COMPONENT doc COMPONENT doc
) )
EOF EOF
## this will only work for cgit
## substituting tde_auto_add_subdirectories( ) above covers the 14.0.8 case
sed -i 's|add_subdirectory( tdeioslave )|&\nadd_subdirectory( misc )|' doc/CMakeLists.txt sed -i 's|add_subdirectory( tdeioslave )|&\nadd_subdirectory( misc )|' doc/CMakeLists.txt
chown_fn chown_fn
@ -115,7 +93,7 @@ echo "
$PRGNAM: kvpnc is a TDE frontend for various vpn clients. $PRGNAM: kvpnc is a TDE frontend for various vpn clients.
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: and help documentation for: $PRGNAM: and help documentation for:
$PRGNAM: $ldocs $PRGNAM: $ldocs

@ -33,31 +33,11 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages/
sed "s|po/|${PO_PATH:-po/}|" $SRCDIR/reformat-message.patch | patch -p0 sed "s|po/|${PO_PATH:-po/}|" $SRCDIR/reformat-message.patch | patch -p0
# for 14.0.8, set support for additional language(s) as per I18N variable
# but only for languages available with this package
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh
#
[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages
#
langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done
#
## for cgit, translations are generated via LINGUAS variable
## for 14.0.8, this GLOB overrides 'LANG auto' in po/CMakeLists.txt:
[[ $TDEVERSION == 14.0.8 ]] && sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake
[[ $langs != "" ]] && TRANS=ON
## for slack-desc ## for slack-desc
langs=$(echo $langs | sed "s|.po||g") 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
## always build 'en' docs ...
ldocs="en man"
## ... and find other html docs required and available ...
for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
## ... and edit tde_auto_add_subdirectories GLOB:
[[ $TDEVERSION == 14.0.8 ]] && sed -i "s|} \* )|} $ldocs )|" cmake/modules/TDEMacros.cmake
ldocs=$(echo $ldocs | sed 's| man||')
listdocs_fn listdocs_fn
@ -73,8 +53,9 @@ cmake \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_GCC_VISIBILITY="OFF" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -101,7 +82,7 @@ echo "
$PRGNAM: potracegui - a TDE interface for potrace $PRGNAM: potracegui - a TDE interface for potrace
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: With help documentation for: $PRGNAM: With help documentation for:
$PRGNAM: $ldocs $PRGNAM: $ldocs

@ -9,9 +9,9 @@
imagesTabs->setCurrentPage(1); imagesTabs->setCurrentPage(1);
setCursor(ArrowCursor); setCursor(ArrowCursor);
return; return;
--- po/potracegui.pot 2015-09-23 06:31:02.000000000 +0100 --- translations/messages/potracegui.pot 2015-09-23 06:31:02.000000000 +0100
+++ po/potracegui.pot 2016-06-20 20:46:04.586821425 +0100 +++ translations/messages/potracegui.pot 2016-06-20 20:46:04.586821425 +0100
@@ -234,7 +234,7 @@ @@ -236,7 +236,7 @@
-"Sorry, but the image format which you are working with\n" -"Sorry, but the image format which you are working with\n"
-"is not recognized by TDE.\n" -"is not recognized by TDE.\n"
+"Sorry, but the image format which you are working\n" +"Sorry, but the image format which you are working\n"
@ -25,8 +25,8 @@
+"format (EPS and PGM should work well) and only\n" +"format (EPS and PGM should work well) and only\n"
+"when you are satisfied with the result revert to\n" +"when you are satisfied with the result revert to\n"
+"the format of your choice and save the result." +"the format of your choice and save the result."
--- po/de.po 2015-09-23 06:31:02.000000000 +0100 --- translations/messages/de.po 2015-09-23 06:31:02.000000000 +0100
+++ po/de.po 2016-06-20 20:46:13.183713949 +0100 +++ translations/messages/de.po 2016-06-20 20:46:13.183713949 +0100
@@ -239,7 +239,7 @@ @@ -239,7 +239,7 @@
-"Sorry, but the image format which you are working with\n" -"Sorry, but the image format which you are working with\n"
-"is not recognized by TDE.\n" -"is not recognized by TDE.\n"

@ -33,12 +33,8 @@ getsource_fn
untar_fn untar_fn
# set support for additional language(s) as per I18N variable ## for slack-desc
# but only for languages available with this package langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$Lang $langs";done
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
listdocs_fn listdocs_fn
@ -56,7 +52,7 @@ cmake \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
-DWITH_GCC_VISIBILITY="OFF" \ -DWITH_GCC_VISIBILITY="OFF" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -79,7 +75,7 @@ echo "
$PRGNAM: lipstik style for TDE $PRGNAM: lipstik style for TDE
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:

@ -33,40 +33,6 @@ getsource_fn
untar_fn untar_fn
## errors:
##common/config_file.c:1611:57: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix]
## filename=TQFile::decodeName(cfgDir)+"../"OLD_CONFIG_FILE;
## ^
## and more ..
patch -N -p0 << EOF || true
--- common/config_file.c
+++ common/config_file.c
@@ -1611 +1611 @@
- filename=TQFile::decodeName(cfgDir)+"../"OLD_CONFIG_FILE;
+ filename=TQFile::decodeName(cfgDir)+"../" OLD_CONFIG_FILE;
@@ -2303 +2303 @@
- static const char * constFiles[]={ /*"/etc/qt4/"OLD_CONFIG_FILE, "/etc/qt3/"OLD_CONFIG_FILE, "/etc/qt/"OLD_CONFIG_FILE,*/ "/etc/"OLD_CONFIG_FILE, NULL };
+ static const char * constFiles[]={ /*"/etc/qt4/"OLD_CONFIG_FILE, "/etc/qt3/"OLD_CONFIG_FILE, "/etc/qt/"OLD_CONFIG_FILE,*/ "/etc/" OLD_CONFIG_FILE, NULL };
--- config/qtcurveconfig.cpp
+++ config/qtcurveconfig.cpp
@@ -802 +802 @@
- TQStringList files(TDEGlobal::dirs()->findAllResources("data", "QtCurve/*"EXTENSION, false, true));
+ TQStringList files(TDEGlobal::dirs()->findAllResources("data", "QtCurve/*" EXTENSION, false, true));
@@ -1377,2 +1377,2 @@
- i18n("*"EXTENSION"|QtCurve Settings Files\n"
- THEME_PREFIX"*"THEME_SUFFIX"|QtCurve TDE Theme Files"),
+ i18n("*" EXTENSION"|QtCurve Settings Files\n"
+ THEME_PREFIX"*" THEME_SUFFIX"|QtCurve TDE Theme Files"),
@@ -1387 +1387 @@
- TQString file(KFileDialog::getSaveFileName(TQString::null, i18n("*"EXTENSION"|QtCurve Settings Files"), this));
+ TQString file(KFileDialog::getSaveFileName(TQString::null, i18n("*" EXTENSION"|QtCurve Settings Files"), this));
--- config/exportthemedialog.cpp
+++ config/exportthemedialog.cpp
@@ -67 +67 @@
- TQString fileName(themeUrl->url()+"/"THEME_PREFIX+name+".themerc");
+ TQString fileName(themeUrl->url()+"/" THEME_PREFIX+name+".themerc");
EOF
# 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
langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done

@ -33,19 +33,8 @@ getsource_fn
untar_fn untar_fn
# for 14.0.8, set support for additional language(s) as per I18N variable
# but only for languages available with this package
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh
#
[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages
#
langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done
#
## for 14.0.8, this GLOB overrides 'LANG auto' in po/CMakeLists.txt:
[[ $TDEVERSION == 14.0.8 ]] && sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake
[[ $langs != "" ]] && TRANS=ON
## for slack-desc ## for slack-desc
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 listdocs_fn
@ -61,7 +50,9 @@ cmake \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DWITH_GCC_VISIBILITY="OFF" \
-DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -86,7 +77,7 @@ echo "
$PRGNAM: tdesudo (Graphical front end for the sudo command) $PRGNAM: tdesudo (Graphical front end for the sudo command)
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:

@ -33,19 +33,8 @@ getsource_fn
untar_fn untar_fn
# for 14.0.8, set support for additional language(s) as per I18N variable
# but only for languages available with this package
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh
#
[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages
#
langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done
#
## for 14.0.8, this GLOB overrides 'LANG auto' in po/CMakeLists.txt:
[[ $TDEVERSION == 14.0.8 ]] && sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake
[[ $langs != "" ]] && TRANS=ON
## for slack-desc ## for slack-desc
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 listdocs_fn
@ -53,7 +42,6 @@ chown_fn
cd_builddir_fn cd_builddir_fn
## all locales and html docs built by default, actually only en_US
cmake \ cmake \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
@ -65,7 +53,7 @@ cmake \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
-DWITH_GCC_VISIBILITY="OFF" \ -DWITH_GCC_VISIBILITY="OFF" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -89,11 +77,11 @@ echo "
|-----handy-ruler------------------------------------------------------| |-----handy-ruler------------------------------------------------------|
$PRGNAM: TDM theme module $PRGNAM: TDM theme module
$PRGNAM: $PRGNAM:
$PRGNAM: Currently this module is installed in TDE Components found in the $PRGNAM: This module is installed in TDE Components found in the
$PRGNAM: Trinity Control Center, under System Administration. $PRGNAM: Trinity Control Center, under System Administration.
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:

@ -33,20 +33,8 @@ getsource_fn
untar_fn untar_fn
# for 14.0.8, set support for additional language(s) as per I18N variable
# but only for languages available with this package
#
[[ $TDEVERSION == 14.0.8 ]] && {
langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang/$PRGNAM.po";done
sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt
## for slack-desc ## for slack-desc
langs=$(echo $langs|sed "s|/$PRGNAM.po||g") langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
} || {
## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh
## langs= for slack-desc only - translations are generated via LINGUAS variable
langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
}
[[ $langs != "" ]] && TRANS=ON
listdocs_fn listdocs_fn
@ -65,7 +53,7 @@ cmake \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DWITH_GCC_VISIBILITY="OFF" \ -DWITH_GCC_VISIBILITY="OFF" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -93,7 +81,7 @@ $PRGNAM: Yakuake is a Quake-style terminal emulator based on
$PRGNAM: TDE Konsole technology. $PRGNAM: TDE Konsole technology.
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:

@ -97,9 +97,9 @@ dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Version " --menu
Set the version of TDE to be built. Set the version of TDE to be built.
" \ " \
12 75 3 \ 13 75 3 \
"14.0.8" "the R14.0.8 release - source from archives" \ "14.0.9" "the R14.0.9 release - source from archives" \
"14.0.x" "r14.0.9 preview/wip - source from Trinity git" \ "14.0.x" "r14.0.10 preview/wip - source from Trinity git" \
"cgit" "R14.1.0 development - source from Trinity git" \ "cgit" "R14.1.0 development - source from Trinity git" \
2> $TMPVARS/TDEVERSION 2> $TMPVARS/TDEVERSION
@ -485,6 +485,26 @@ ${DLG_BOX:-0 0}
} }
## only run this if tdelibs has been selected
rm -f $TMPVARS/SPELL
[[ $(grep -o tdelibs $TMPVARS/TDEbuilds) ]] && {
dialog --cr-wrap --nocancel --no-shadow --colors --title " Spell checker " --menu \
"
Choose a Spell checker.
If you chose a spell checker it must be installed, or the build will exit.
This won't affect any Spell checker being installed later, it's just a work-around for a mandatory selection being forced in the source.
" \
19 75 4 \
" Aspell" "" \
" Hspell" "" \
" Ispell" "" \
" None" "Don't have one installed" \
2> $TMPVARS/SPELL
}
## only run this if tdebase has been selected ## only run this if tdebase has been selected
rm -f $TMPVARS/RUNLEVEL rm -f $TMPVARS/RUNLEVEL
[[ $(grep -o tdebase $TMPVARS/TDEbuilds) ]] && { [[ $(grep -o tdebase $TMPVARS/TDEbuilds) ]] && {
@ -551,6 +571,7 @@ sed -i 's|Apps/koffice|Misc/libpng &|' $TMPVARS/TDEbuilds
## only run this if kvkbd has been selected ## only run this if kvkbd has been selected
rm -f $TMPVARS/WinLock rm -f $TMPVARS/WinLock
rm -f $TMPVARS/kvkbd-bg rm -f $TMPVARS/kvkbd-bg
rm -f $TMPVARS/kvkbd-keycolr
[[ $(grep -o kvkbd $TMPVARS/TDEbuilds) ]] && { [[ $(grep -o kvkbd $TMPVARS/TDEbuilds) ]] && {
dialog --cr-wrap --no-shadow --yes-label "No Lock" --no-label "Lock" --colors --defaultno --title " Kvkbd Win Keys " --yesno \ dialog --cr-wrap --no-shadow --yes-label "No Lock" --no-label "Lock" --colors --defaultno --title " Kvkbd Win Keys " --yesno \
" "
@ -578,6 +599,23 @@ RGB: \Zb\Z6 205,192,176\Zn
" \ " \
19 75 "\"black\"" \ 19 75 "\"black\"" \
2> $TMPVARS/kvkbd-bg 2> $TMPVARS/kvkbd-bg
dialog --cr-wrap --no-collapse --nocancel --no-shadow --colors --title " Kvkbd keys/buttons colour " --inputbox \
"
The default colour for the keys and buttons is the system button colour.
To change it, enter the colour you want in any of these forms, including the double quotes where shown.
These examples are all the same colour:
Named: \Zb\Z6\"gray94\"\Zn
Hex: \Zb\Z6\"#f0f0f0\"\Zn
RGB: \Zb\Z6 240,240,240\Zn
Choosing a colour for the keys doesn't work for styles like plastik and keramik which have an outline within the 30x30 key background footprint, but is OK for cde and others.
" \
24 75 \
2> $TMPVARS/kvkbd-keycolr
} }
@ -662,9 +700,9 @@ Create and/or update the git repositories local copies.
#rm -f $TMPVARS/PRE_DOWNLOAD ## this is done at the head of this script #rm -f $TMPVARS/PRE_DOWNLOAD ## this is done at the head of this script
[[ $(cat $TMPVARS/TDEVERSION) == 14.0.8 ]] && PRE_DOWNLOAD_MESSAGE="Only the source archives not already in 'src' will be downloaded." [[ $(cat $TMPVARS/TDEVERSION) == 14.0.9 ]] && PRE_DOWNLOAD_MESSAGE="Only the source archives not already in 'src' will be downloaded."
[[ $(cat $TMPVARS/TDEVERSION) == cgit || $(cat $TMPVARS/TDEVERSION) == 14.0.x ]] && 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'." && LINES=18 [[ $(cat $TMPVARS/TDEVERSION) == cgit || $(cat $TMPVARS/TDEVERSION) == 14.0.x ]] && 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'." && LINES=18
## testing for cgit!=no will allow =yes or null, which is the 14.0.8 build case ## testing for cgit!=no will allow =yes or null, which is the 14.0.9 build case
[[ $(cat $TMPVARS/DL_CGIT) != no ]] && { [[ $(cat $TMPVARS/DL_CGIT) != no ]] && {
dialog --cr-wrap --no-shadow --colors --defaultno --title " Only download sources " --yesno \ dialog --cr-wrap --no-shadow --colors --defaultno --title " Only download sources " --yesno \
" "
@ -724,9 +762,7 @@ export ARCH=$(cat $TMPVARS/ARCH) # set again for the 'continue' option
export TDE_MIRROR=${TDE_MIRROR:-https://mirror.ppa.trinitydesktop.org/trinity} export TDE_MIRROR=${TDE_MIRROR:-https://mirror.ppa.trinitydesktop.org/trinity}
export NUMJOBS=$(cat $TMPVARS/NUMJOBS) export NUMJOBS=$(cat $TMPVARS/NUMJOBS)
export I18N=$(cat $TMPVARS/I18N) export I18N=$(cat $TMPVARS/I18N)
## for later versions, use the env variable LINGUAS to determine the supported locales - export LINGUAS=$I18N
## any of I18N not included in translations/... will be ignored -
[[ $TDEVERSION != 14.0.8 ]] && export LINGUAS=$I18N
export TQT_OPTS=$(cat $TMPVARS/TQT_OPTS) export TQT_OPTS=$(cat $TMPVARS/TQT_OPTS)
export EXIT_FAIL=$(cat $TMPVARS/EXIT_FAIL) export EXIT_FAIL=$(cat $TMPVARS/EXIT_FAIL)
export KEEP_BUILD=$(cat $TMPVARS/KEEP_BUILD) export KEEP_BUILD=$(cat $TMPVARS/KEEP_BUILD)

@ -1,23 +1,3 @@
## this patch needs some context to avoid unwanted patching at offsets for the git builds
--- tde-i18n-en_GB/messages/tdebase/libkickermenu_prefmenu.po
+++ tde-i18n-en_GB/messages/tdebase/libkickermenu_prefmenu.po
@@ -34,3 +34,2 @@
#: prefmenu.cpp:248
-#, fuzzy
msgid "Trinity Control Center"
--- tde-i18n-en_GB/messages/tdebase/khelpcenter.po
+++ tde-i18n-en_GB/messages/tdebase/khelpcenter.po
@@ -35,3 +35,2 @@
#: application.cpp:63
-#, fuzzy
msgid "Trinity Help Center"
@@ -40,5 +39,4 @@
#: application.cpp:65 navigator.cpp:476
-#, fuzzy
msgid "The Trinity Help Center"
-msgstr "The TDE Control Centre"
+msgstr "The TDE Help Centre"
## In the Configure Panel|Taskbar window, the Alt-c shortcut is assigned ## In the Configure Panel|Taskbar window, the Alt-c shortcut is assigned
## to the Cancel button, which takes priority over 'custom colors' ## to the Cancel button, which takes priority over 'custom colors'
## which becomes "Us&e custom colours", so force &Use .. ## which becomes "Us&e custom colours", so force &Use ..

@ -35,7 +35,7 @@ getsource_fn
## extract, build, and remove source for each language package one at a time ## extract, build, and remove source for each language package one at a time
cd $TMP_BUILD/tmp-$PRGNAM cd $TMP_BUILD/tmp-$PRGNAM
[[ $TDEVERSION == 14.0.8 ]] && { [[ $TDEVERSION == 14.0.9 ]] && {
# extract the cmake source once only # extract the cmake source once only
echo -e "\033[39;1m" echo -e "\033[39;1m"
echo "Extracting the cmake source from $(basename $SOURCE) ..." echo "Extracting the cmake source from $(basename $SOURCE) ..."
@ -45,7 +45,7 @@ tar xf $SOURCE $PRGNAM-trinity-$TDEVERSION/cmake
for lang in $I18N for lang in $I18N
do do
[[ $TDEVERSION == 14.0.8 ]] && { [[ $TDEVERSION == 14.0.9 ]] && {
# extract the source for one language at a time for each iteration of the loop # extract the source for one language at a time for each iteration of the loop
echo -e "\033[39;1m" echo -e "\033[39;1m"
echo "Extracting the $PRGNAM-$lang source from $(basename $SOURCE) ..." echo "Extracting the $PRGNAM-$lang source from $(basename $SOURCE) ..."

@ -108,7 +108,6 @@ sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" tdm/kfrontend/gentdmconf.c || true
sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" kcontrol/hwmanager/devicepropsdlg.cpp || true sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" kcontrol/hwmanager/devicepropsdlg.cpp || true
sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" tdeioslave/trash/testtrash.cpp || true sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" tdeioslave/trash/testtrash.cpp || true
[[ $TDEVERSION != 14.0.8 ]] && {
patch -N -p0 << EOF || true patch -N -p0 << EOF || true
--- translations/desktop_files/kcontrol-desktops/en_GB.po --- translations/desktop_files/kcontrol-desktops/en_GB.po
+++ translations/desktop_files/kcontrol-desktops/en_GB.po +++ translations/desktop_files/kcontrol-desktops/en_GB.po
@ -128,7 +127,6 @@ patch -N -p0 << EOF || true
+msgstr "Colour Profile" +msgstr "Colour Profile"
EOF EOF
}
listdocs_fn listdocs_fn

@ -43,7 +43,7 @@ patch -N -p0 << EOF || true
+ Py_XINCREF((objectvect.begin() +i)->ptr()); + Py_XINCREF((objectvect.begin() +i)->ptr());
EOF EOF
## for 14.0.8, already done in cgit ## for 14.0.9, already done in cgit
sed -i 's|Nome del file di input|Input filename|' kig/pykig/pykig.py sed -i 's|Nome del file di input|Input filename|' kig/pykig/pykig.py
## add some files to html docs ## add some files to html docs

@ -126,7 +126,9 @@ cd_builddir_fn
sed -i 's|TQT_INCLUDE_DIRS}|&\n ${AVAHI_TQT_INCLUDE_DIRS}|' ../dnssd/CMakeLists.txt sed -i 's|TQT_INCLUDE_DIRS}|&\n ${AVAHI_TQT_INCLUDE_DIRS}|' ../dnssd/CMakeLists.txt
} }
## comment out if setting ASPELL, HSPELL, or ISPELL 'ON' [[ $(grep Aspell $TMPVARS/SPELL) ]] && ASPELL=ON || {
[[ $(grep Hspell $TMPVARS/SPELL) ]] && HSPELL=ON ; } || {
[[ $(grep Ispell $TMPVARS/SPELL) ]] && ISPELL=ON ; } || \
sed -i 's|^.*Spell checker selected as default.*$|message( STATUS " ## no spell checker selected ##" )|' ../CMakeLists.txt sed -i 's|^.*Spell checker selected as default.*$|message( STATUS " ## no spell checker selected ##" )|' ../CMakeLists.txt
cmake \ cmake \
@ -144,7 +146,7 @@ cmake \
-DTDE_MALLOC_FULL="OFF" \ -DTDE_MALLOC_FULL="OFF" \
-DWITH_ALSA="ON" \ -DWITH_ALSA="ON" \
-DWITH_ARTS="ON" \ -DWITH_ARTS="ON" \
-DWITH_ASPELL="OFF" \ -DWITH_ASPELL=${ASPELL:-"OFF"} \
-DWITH_AVAHI=${AVAHI:-"OFF"} \ -DWITH_AVAHI=${AVAHI:-"OFF"} \
-DWITH_CONSOLEKIT="OFF" \ -DWITH_CONSOLEKIT="OFF" \
-DWITH_CRYPTSETUP="ON" \ -DWITH_CRYPTSETUP="ON" \
@ -154,9 +156,9 @@ cmake \
-DWITH_GAMIN="OFF" \ -DWITH_GAMIN="OFF" \
-DWITH_GCC_VISIBILITY="OFF" \ -DWITH_GCC_VISIBILITY="OFF" \
-DWITH_HAL="OFF" \ -DWITH_HAL="OFF" \
-DWITH_HSPELL="OFF" \ -DWITH_HSPELL=${HSPELL:-"OFF"} \
-DWITH_INOTIFY="ON" \ -DWITH_INOTIFY="ON" \
-DWITH_ISPELL="OFF" \ -DWITH_ISPELL=${ISPELL:-"OFF"} \
-DWITH_JASPER="OFF" \ -DWITH_JASPER="OFF" \
-DWITH_KDE4_MENU_SUFFIX="ON" \ -DWITH_KDE4_MENU_SUFFIX="ON" \
-DWITH_LIBART="ON" \ -DWITH_LIBART="ON" \

@ -37,27 +37,6 @@ listdocs_fn
chown_fn chown_fn
[[ $TDEVERSION == 14.0.8 ]] && {
#cd_builddir_fn - don't use
## add TQt headers directory to configure search list
sed -i "s|/usr/include/tqt|$TQTDIR/include/tqt|" configure
## QTDIR is needed for 14.0.8 because configure can't find tqmake from its algorithm
QTDIR=$TQTDIR \
CXXFLAGS="$SLKRCFLAGS" \
./configure
## configure uses the installed tqt mkspecs for its flags - if this is a re-build of this package only,
## it may pick up the wrong march/mtune flags, or none at all - use SET_march as set up in BUILD-TDE.sh
sed -i "s|-march=.*-mtune=[a-z,0-9,-]*||;s|fvisibility-inlines-hidden|& $SET_march|" Makefile
## set RPATH to ensure tqt libs are prioritized
sed -i "s|LFLAGS .*$|& -Wl,-rpath,'$INST_RPATH'|" Makefile
} || {
cd_builddir_fn cd_builddir_fn
cmake \ cmake \
@ -72,12 +51,8 @@ cmake \
-Wno-dev \ -Wno-dev \
.. ..
}
make ${NUMJOBS:-} || exit 1 make ${NUMJOBS:-} || exit 1
## INSTALL_ROOT is DESTDIR for builds beyond 14.0.8 make DESTDIR=$PKG install || exit 1
[[ $TDEVERSION == 14.0.8 ]] && INSTALL_ROOT=INSTALL_ROOT
make ${INSTALL_ROOT:-DESTDIR}=$PKG install || exit 1
installdocs_fn installdocs_fn

@ -6,7 +6,7 @@
.. for Slackware 14.2 or current on i586+ and x86_64. .. for Slackware 14.2 or current on i586+ and x86_64.
.. see 'Cross compiling for RPi3' for building for armv7/aarch64. .. see 'Cross compiling for RPi3' for building for armv7/aarch64.
Build the release version 14.0.8 from tar archives; or the development versions 14.0.9, 14.1.0 from trinitydesktop cgit. Build the release version 14.0.9 from tar archives; or the development versions 14.0.10, 14.1.0 from trinitydesktop cgit.
For a native build, run **./BUILD-TDE.sh** - a dialog based script with a series of screens for user input. For a native build, run **./BUILD-TDE.sh** - a dialog based script with a series of screens for user input.
[<img src="https://ray-v.github.io/TDE-version.png">](https://ray-v.github.io/TDE-version.png) [<img src="https://ray-v.github.io/TDE-version.png">](https://ray-v.github.io/TDE-version.png)
@ -19,7 +19,7 @@ This is a global option so can't be used where the build list includes packages
Any package, or set of packages, can be selected in the 'TDE Packages Selection' screen. Any package, or set of packages, can be selected in the 'TDE Packages Selection' screen.
Information about dependencies for some packages has been added at the bottom of the dialog screen. Information about dependencies for some packages has been added at the bottom of the dialog screen.
14.0.8 source archives will be downloaded from a geoIP located mirror site, or the development sources [14.0.9/14.1.0] cloned or updated from cgit. 14.0.9 source archives will be downloaded from a geoIP located mirror site, or the development sources [14.0.10/14.1.0] cloned or updated from cgit.
Downloading can be done pre-build [useful for an off-line build], or during the build. Downloading can be done pre-build [useful for an off-line build], or during the build.
If you're curious about what this might involve, [take a look at a sample build set up](https://ray-v.github.io/A_typical_TDE_SlackBuild.html). If you're curious about what this might involve, [take a look at a sample build set up](https://ray-v.github.io/A_typical_TDE_SlackBuild.html).
@ -27,7 +27,7 @@ If you're curious about what this might involve, [take a look at a sample build
--- ---
***Other command line options*** that can be used to set some build parameters: ***Other command line options*** that can be used to set some build parameters:
* TDE_MIRROR= - override the trinitydesktop.org geoIP redirector to use https - example, *https://mirrorservice.org/sites/trinitydesktop.org/trinity*. URLs @ https://www.trinitydesktop.org/mirrorstatus.php * TDE_MIRROR= - override the trinitydesktop.org geoIP redirector to use https - example, *https://trinitydesktop.mirrorservice.org/trinity*. URLs @ https://www.trinitydesktop.org/mirrorstatus.php
* BUILD= - sets the package build identifier, overriding the SlackBuild default of 1 * BUILD= - sets the package build identifier, overriding the SlackBuild default of 1
* USE_CMAKE_MM=yes - to build tdemultimedia with cmake - see Core/tdemultimedia/README. * USE_CMAKE_MM=yes - to build tdemultimedia with cmake - see Core/tdemultimedia/README.
* VERBOSE=1 - show command lines during cmake builds * VERBOSE=1 - show command lines during cmake builds

@ -67,8 +67,8 @@ rm -rf $OUTPUT/{checkout,configure,make,install,error,makepkg,patch}-$PRGNAM.log
# Where do we look for sources? # Where do we look for sources?
SRCDIR=$(cd $(dirname $0); pwd) SRCDIR=$(cd $(dirname $0); pwd)
## if 14.0.8 or misc, download archive: ## if 14.0.9 or misc, download archive:
[[ $TDEVERSION == 14.0.8 || $TDEMIR_SUBDIR == misc ]] && { [[ $TDEVERSION == 14.0.9 || $TDEMIR_SUBDIR == misc ]] && {
## check for and remove any zero byte archive files ## check for and remove any zero byte archive files
[[ ! -s $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} ]] && \ [[ ! -s $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} ]] && \
rm $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} 2>/dev/null || true rm $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} 2>/dev/null || true
@ -112,7 +112,7 @@ if [ "$P1" == "--download" ]; then
fi fi
} || \ } || \
{ {
## otherwise, not R14.0.8 or misc, and we are creating/updating git, ## otherwise, not R14.0.9 or misc, and we are creating/updating git,
## so [1] start with admin/cmake: ## so [1] start with admin/cmake:
[[ $(cat $TMPVARS/DL_CGIT) == yes ]] && { [[ $(cat $TMPVARS/DL_CGIT) == yes ]] && {
cd $BUILD_TDE_ROOT/src/cgit cd $BUILD_TDE_ROOT/src/cgit
@ -241,7 +241,7 @@ cd $TMP_BUILD/tmp-$PRGNAM
## ##
## [1] firstly test for R14 or misc .. ## [1] firstly test for R14 or misc ..
## ##
[[ $TDEVERSION == 14.0.8 || $TDEMIR_SUBDIR == misc ]] && { [[ $TDEVERSION == 14.0.9 || $TDEMIR_SUBDIR == misc ]] && {
## unpack R14 or misc ## unpack R14 or misc
echo -e "\n unpacking $(basename $SOURCE) ... \n" echo -e "\n unpacking $(basename $SOURCE) ... \n"
@ -251,7 +251,7 @@ tar -xf $SOURCE
} || { } || {
## [2] not 14.0.8 nor misc, so must be git .. ## [2] not 14.0.9 nor misc, so must be git ..
## but is it [2a] 14.0.x .. ## but is it [2a] 14.0.x ..
[[ $TDEVERSION == 14.0.x ]] && { [[ $TDEVERSION == 14.0.x ]] && {

Loading…
Cancel
Save