Updates 02 December 2023

kdiff3 - SlackBuild added
 soundkonverter - cmake for development builds
 k9copy - fix slack-desc
master
Ray-V 12 months ago
parent 3c1471c1a4
commit 88044b45d2

@ -33,8 +33,14 @@ getsource_fn
untar_fn
##${CMAKE_SYSTEM_PROCESSOR} is identified as x86_64 when using a 64 bit kernel on a 32 bit system
## which incorrectly sets the OS as 64 bit
[[ $(getconf LONG_BIT) == 32 && $(uname -m) == *64 ]] && \
sed -i 's|# architecture|&\n set ( CMAKE_SYSTEM_PROCESSOR i586 )|' ConfigureChecks.cmake
## for slack-desc
langs="";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang";done
[[ $TDEVERSION != 14.1.1 ]] && TRANS_DIR=translations/messages
langs="";for Lang in $I18N;do [[ -s ${TRANS_DIR:-po}/$Lang.po ]] && langs="$langs $Lang";done
listdocs_fn
@ -42,11 +48,6 @@ chown_fn
cd_builddir_fn
##${CMAKE_SYSTEM_PROCESSOR} is identified as x86_64 when using a 64 bit kernel on a 32 bit system
## which incorrectly sets the OS as 64 bit
[[ $(getconf LONG_BIT) == 32 && $(uname -m) == *64 ]] && \
sed -i 's|# architecture|&\n set ( CMAKE_SYSTEM_PROCESSOR i686 )|' ../ConfigureChecks.cmake
cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_OPENGL="ON"

@ -0,0 +1,6 @@
There is an option in kdiff3.SlackBuild to include a language specific patch file in the build.
It needs to be named {lang}.po.patch and will then automatically be included for the build for that language.
Because of its position in the Slackbuild and the patch -p0 option, the path to the patched file must be relative to the top level source directory - see en_GB.po.patch for an example.

@ -0,0 +1,26 @@
--- translations/messages/kdiff3/en_GB.po
+++ translations/messages/kdiff3/en_GB.po
@@ -1466 +1466 @@
-msgstr ""
+msgstr "Colour for manually aligned difference ranges:"
@@ -1475 +1475 @@
-msgstr ""
+msgstr "Newest file colour:"
@@ -1481 +1481,2 @@
-msgstr ""
+msgstr "Changing this colour will only be effective when starting the next directory "
+"comparison."
@@ -1485 +1486 @@
-msgstr ""
+msgstr "Oldest file colour:"
@@ -1489 +1490 @@
-msgstr ""
+msgstr "Middle age file colour:"
@@ -1493 +1494 @@
-msgstr ""
+msgstr "Colour for missing files:"
@@ -2098 +2099,3 @@
-msgstr ""
+msgstr "If enabled then the encoding from the input files is used.\n"
+"In ambiguous cases a dialogue will ask the user to choose the encoding for "
+"saving."

@ -0,0 +1,103 @@
#!/bin/sh
# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015 Eric Hameleers, Eindhoven, Netherlands
# Copyright 2015-2017 Thorn Inurcide
# Copyright 2015-2017 tde-slackbuilds project on GitHub
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
# any purpose with or without fee is hereby granted, provided that
# the above copyright notice and this permission notice appear in all
# copies.
#
# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
PRGNAM=kdiff3
VERSION=$TDEVERSION
BUILD=${BUILD:-1}
TAG=${TAG:-_tde}
source ../../get-source.sh
getsource_fn
untar_fn
## tidy man page ..
sed -i 's|KDE|TDE|g' doc/man/kdiff3.1
sed -i '85,$d' doc/man/kdiff3.1
## .. and the handbook
sed -i 's|KDE|TDE|' doc/en/index.docbook
sed -i 's|//TDE|//KDE|' doc/en/index.docbook
sed -i 's|\&kde|\&tde|' doc/en/index.docbook
sed -i 's|kde-dir|tde-dir|' doc/en/index.docbook
## the html is a duplicate of the handbook
rm -rf doc/html
## for slack-desc ..
langs="en"
for Lang in $I18N
do
## .. and user created language patches
[[ -e $SB_SRCDIR/$Lang.po.patch ]] && {
echo -e "\033[39;1m"
patch -N -p0 < $SB_SRCDIR/$Lang.po.patch
echo -e "\033[0m"
}
[[ -s translations/messages/kdiff3/$Lang.po ]] && langs="$langs $Lang"
done
listdocs_fn
chown_fn
cd_builddir_fn
cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
installdocs_fn
mangzip_fn
strip_fn
mkdir_install_fn
doinst_sh_fn
echo "
# HOW TO EDIT THIS FILE:
# The 'handy ruler' below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
# on the right side marks the last column you can put a character in. You must
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
$PRGNAM: kdiff3 - a diff and merge program.
$PRGNAM:
$PRGNAM: - compares and merges two or three input files or directories,
$PRGNAM: - allows recursive directory comparison and merging
$PRGNAM: - shows the differences line by line and character by character
$PRGNAM: - provides an automatic merge-facility
$PRGNAM: - has an integrated editor for comfortable solving of merge-conflicts
$PRGNAM: - has support for TDE-TDEIO (ftp, sftp, http, fish, smb)
$PRGNAM: - has a Konqueror service menu plugin
$PRGNAM:
$PRGNAM: With language support for:
$PRGNAM: $langs
" > $PKG/install/slack-desc
makepkg_fn

@ -33,23 +33,34 @@ getsource_fn
untar_fn
[[ $TDEVERSION == 14.1.1 ]] && {
# 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
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")
[[ $langs != "" ]] && langs=" $(echo $langs | sed 's|.po||g')"
## fix check for visibility support - tde-common-admin pull #20
sed -i 's| Q_EXPORT| TQ_EXPORT|' admin/acinclude.m4.in
} || {
## for slack-desc
langs="";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang";done
}
listdocs_fn
ltoolupdate_fn
[[ $TDEVERSION == 14.1.1 ]] && ltoolupdate_fn
chown_fn
cd_builddir_fn
[[ $TDEVERSION == 14.1.1 ]] && {
[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility"
CFLAGS="$SLKRCFLAGS" \
@ -62,6 +73,14 @@ CXX=$COMPILER_CXX \
--disable-rpath \
--enable-closure
} || {
sed -i 's|FILES soundkonverterui.rc$|& userscript.sh|' ../src/CMakeLists.txt
cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
}
make_fn
installdocs_fn
@ -88,7 +107,7 @@ $PRGNAM: - Replay Gain calculation
$PRGNAM: - CD ripping
$PRGNAM:
$PRGNAM: With language support for:
$PRGNAM: en $langs
$PRGNAM: en$langs
$PRGNAM:
$PRGNAM:
" > $PKG/install/slack-desc

@ -382,6 +382,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD
"Apps/kbookreader" "Twin-panel text files viewer esp. for reading e-books." off "\Zb\Z6 \Zn" \
"Apps/kdbg" "GUI for gdb using TDE" off "\Zb\Z6 \Zn" \
"Apps/kdbusnotification" "A DBUS notification to TDE interface" off "\Zb\Z6 \Zn" \
"Apps/kdiff3" "Compare two or three input files" off "\Zb\Z6 \Zn" \
"Apps/kile" "A TEX and LATEX source editor and shell" off "\Zb\Z6 \Zn" \
"Apps/kkbswitch" "A keyboard layout indicator" off "\Zb\Z6 \Zn" \
"Apps/klamav" "Antivirus manager for ClamAV" off "\Zb\Z6 ClamAV is a build time requirement, included in klamav.Slackbuild \Zn" \

@ -1,6 +1,7 @@
This file is for applications [Apps] download URLs, for BUILD-TDE.sh to identify which applications sub-directory a program source archive is in.
development-Apps/kdbg
development-Apps/kdiff3
development-Apps/kscope
development-Apps/piklab
games-Apps/knights

Loading…
Cancel
Save