From 9fe3e836bccdf49ceb949bc1938d00f62f5a6ff6 Mon Sep 17 00:00:00 2001
From: Ray-V <ray42@inbox.lv>
Date: Wed, 9 May 2018 23:15:45 +0100
Subject: [PATCH] updates Revised koffice.SlackBuild lcms patch Added language
 selection to soundkonverter.SlackBuild Added patch for magic file
 identification to tdelibs.SlackBuild

---
 Apps/koffice/koffice.SlackBuild               |  3 +-
 Apps/soundkonverter/soundkonverter.SlackBuild | 28 +++++++++++--------
 Core/tdelibs/tdelibs.SlackBuild               | 15 ++++++++++
 get-source.sh                                 |  2 +-
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/Apps/koffice/koffice.SlackBuild b/Apps/koffice/koffice.SlackBuild
index cc4f8b7..7412df3 100755
--- a/Apps/koffice/koffice.SlackBuild
+++ b/Apps/koffice/koffice.SlackBuild
@@ -69,8 +69,7 @@ patch -p0
 done
 
 ## fix chalk crashing - set liblcms as a direct dependency - see issue 37 for details
-sed -i '2iLCMS1LIBS = -llcms' chalk/Makefile.am
-sed -i 's|LDADD) \\$(LIBS)|& \\$(LCMS1LIBS)|' admin/am_edit
+sed -i '23iKDE_CXXFLAGS = $(LCMS_LIBS)' chalk/Makefile.am
 
 ## building with installation directory /usr - see issue #43 for details
 [[ $INSTALL_TDE == /usr ]] && \
diff --git a/Apps/soundkonverter/soundkonverter.SlackBuild b/Apps/soundkonverter/soundkonverter.SlackBuild
index 92eaca5..434be51 100755
--- a/Apps/soundkonverter/soundkonverter.SlackBuild
+++ b/Apps/soundkonverter/soundkonverter.SlackBuild
@@ -33,6 +33,12 @@ 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")
+
 listdocs_fn
 
 ltoolupdate_fn
@@ -42,18 +48,17 @@ chown_fn
 cd_builddir_fn 
 
 # Fails with clang =[
-LDFLAGS="${SLKLDFLAGS}" \
-CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \
-CXXFLAGS="${SLKCFLAGS}" \
+LDFLAGS=$SLKLDFLAGS \
+CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \
+CXXFLAGS=$SLKCFLAGS \
 CC="gcc" \
 CXX="g++" \
 ../configure \
-   --prefix=${INSTALL_TDE} \
+   --prefix=$INSTALL_TDE \
    --sysconfdir="/etc/trinity" \
-   --mandir=${INSTALL_TDE}/man \
+   --mandir=$INSTALL_TDE/man \
    --disable-rpath \
-   --enable-closure \
-   --build=$ARCH-slackware-linux
+   --enable-closure
 
 make_fn
 
@@ -71,6 +76,7 @@ echo "
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
+       |-----handy-ruler------------------------------------------------------|
 $PRGNAM: $PRGNAM (frontend to various audio converters)
 $PRGNAM:
 $PRGNAM: soundKonverter is frontend to various audio converters.
@@ -80,21 +86,21 @@ $PRGNAM: 	- Audio conversion
 $PRGNAM: 	- Replay Gain calculation
 $PRGNAM:	- CD ripping
 $PRGNAM:
+$PRGNAM: With language support for:
+$PRGNAM: en $langs
 $PRGNAM:
-$PRGNAM:
-$PRGNAM: Home: https://www.trinitydesktop.org/index.php
 " > $PKG/install/slack-desc
 
 cat <<EOINS >> $PKG/install/doinst.sh
 # Update the desktop database:
 if [ -x usr/bin/update-desktop-database ]; then
-  chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1
+  chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1
 fi
 
 # Update hicolor theme cache:
 if [ -d usr/share/icons/hicolor ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null
+    chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null
   fi
 fi
 EOINS
diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild
index 547ec63..49e4571 100644
--- a/Core/tdelibs/tdelibs.SlackBuild
+++ b/Core/tdelibs/tdelibs.SlackBuild
@@ -45,6 +45,21 @@ do
 patch -p0
 done
 
+## patch for 'Magic file type detection not working' - bug 2713 - commit f54496a1
+echo $'
+--- tdeio/tdeio/kmimemagic.cpp
++++ tdeio/tdeio/kmimemagic.cpp
+@@ -195,1 +195,1 @@
+-	int magic_flags = MAGIC_CONTINUE|MAGIC_ERROR|MAGIC_MIME_TYPE/*|MAGIC_DEBUG*/;
++	int magic_flags = MAGIC_ERROR|MAGIC_MIME_TYPE/*|MAGIC_DEBUG*/;
+@@ -302,1 +302,1 @@
+-		int magic_flags = MAGIC_CONTINUE|MAGIC_ERROR|MAGIC_MIME_TYPE/*|MAGIC_DEBUG*/;
++		int magic_flags = MAGIC_ERROR|MAGIC_MIME_TYPE/*|MAGIC_DEBUG*/;
+' | while read line
+do
+patch -p0
+done
+
 listdocs_fn
 
 chown_fn
diff --git a/get-source.sh b/get-source.sh
index 538285f..4fea26f 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -132,7 +132,7 @@ tar -xf ${SOURCE}
 +++ admin/cvs.sh
 @@ -59 +59 @@
 -  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12* | automake*1.13* | automake*1.14* | automake*1.15* )
-+  automake*1.6.[1-9] | automake*1.[7-9].* | automake*1.1[0-6].* )
++  automake*1.6.* | automake*1.[7-9]* | automake*1.1[0-6]* )
 ' | while read line
 do
 patch -p0