Added R14.0.6 build

Removed old version builds
Updated get-source.sh for default TDE archive type tar.xz
 .. and added ARCHIVE_TYPE for misc builds which were tar.bz2
Updated xmedcon version [issue 14]
Corrected cd for koffice-i18n [issue 15]
Added cmake for libart-lgpl development version [issue 16]

Apps/koffice-i18n/koffice-i18n.SlackBuild

@@ -66,7 +66,7 @@ CXX=${COMPILER_CXX} \
 
 make_fn
 
-cd ../
+cd ../../
 done
 langs=$(echo $langdir | sed 's|koffice-i18n-||g')
 

BUILD-TDE.sh

@@ -89,11 +89,10 @@ dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Version " --menu
 Set the version of TDE to be built.
  
 " \
-14 75 4 \
-"R14.0.5" "the latest release from source archives" \
-"r14.0.6" "snapshot of the next release" \
-"cgit" "development source from Trinity git" \
-"R14.0.4" "the previous release" \
+14 75 3 \
+"14.0.6" "the R14.0.6 release - source from archives" \
+"cgit" "R14.1.0 development - source from Trinity git" \
+"r14.0.6" "snapshot" \
 2> $TMPVARS/TDEVERSION
 
 
@@ -572,7 +571,7 @@ If this is a first run, answer 'yes' - be patient, downloads from git are slowww
 
 For subsequent runs, 'yes' will update only.
 
-Local repositories are created/updated as for the single downloads for R14.0.4/5 builds.
+Local repositories are created/updated as for the single downloads for 14.0.6 builds.
 If the current build list includes new apps, and you don't want the existing repos updated, the new apps should be run as a new group initially as selective updating is not supported.
 
 Do you want to create or update the git repositories?

Deps/libart-lgpl/libart-lgpl.SlackBuild

@@ -39,16 +39,31 @@ chown_fn
 
 cd_builddir_fn
 
-LDFLAGS="$SLKLDFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-CC=${COMPILER} \
-CXX=${COMPILER_CXX} \
+[[ $TDEVERSION == *14.0.6 ]] && {
+
+LDFLAGS=$SLKLDFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+CFLAGS=$SLKCFLAGS \
+CC=$COMPILER \
+CXX=$COMPILER_CXX \
 ../configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --disable-static \
-  --build=$ARCH-slackware-linux \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
+  --disable-static
+
+} || {
+
+  cmake \
+    -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \
+    -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \
+    -DCMAKE_C_COMPILER=$COMPILER \
+    -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=$LIBDIRSUFFIX \
+    ..
+
+}
 
 make_fn
 

Misc/inkscape/inkscape.SlackBuild

@@ -28,6 +28,8 @@ VERSION=${VERSION:-0.92.3}
 BUILD=${BUILD:-1}
 
 SRCURL="https://media.inkscape.org/dl/resources/file/inkscape-$VERSION.tar.bz2"
+ARCHIVE_TYPE="tar.bz2"
+
 source ../../get-source.sh
 getsource_fn
 

Misc/libmp4v2/libmp4v2.SlackBuild

@@ -30,6 +30,8 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-}
 
 SRCURL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2"
+ARCHIVE_TYPE="tar.bz2"
+
 source ../../get-source.sh
 getsource_fn
 

Misc/xmedcon/xmedcon.SlackBuild

@@ -25,11 +25,12 @@
 #
 # 
 PRGNAM=xmedcon
-VERSION=${VERSION:-0.15.0}
+VERSION=${VERSION:-0.16.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_tde}
 
 SRCURL="https://downloads.sourceforge.net/project/xmedcon/XMedCon-Source/$VERSION/xmedcon-$VERSION.tar.bz2"
+ARCHIVE_TYPE="tar.bz2"
 
 source ../../get-source.sh
 getsource_fn

README.md

@@ -3,9 +3,10 @@
 
 ---
 ***Build TDE [Trinity Desktop Environment]***  
-for Slackware 14.2 or current on i586+, x86_64, or for Raspberry Pi3 [see [README-Raspberry-Pi3.md](./README-Raspberry-Pi3.md)], or cross compile for RPi3 armv7/aarch64 [see 'Cross compiling for RPi3'].
+for Slackware 14.2 or current on i586+ and x86_64.  
+Native building for Raspberry Pi3 [see [README-Raspberry-Pi3.md](./README-Raspberry-Pi3.md)] is now rather dated and cross compiling is preferred - see 'Cross compiling for RPi3' for armv7/aarch64 builds.
 
-Build the release versions R14.0.4/5, or pre-release snapshot r14.0.6, from tar archives; or the development version from trinitydesktop cgit.
+Build the release version R14.0.6 from tar archives; or the development version R14.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.  
 The default is to install the packages as they are built, which is necessary initially for the required packages and for some interdependencies [for example, tdesdk requires tdepim].  
@@ -15,6 +16,8 @@ Any package, or set of packages, can be selected in the 'TDE Packages Selection'
 The TDE mandatory packages can be pre-selected.
 Notes at the bottom of the dialog screen have been added for information about dependencies for some packages.
 
+Source archives can be stored locally pre-build, or will be downloaded during the build from a geoIP located mirror site. Development [cgit] sources are downloaded, with the option to update, during the build.
+
 The directory structure for the SlackBuild scripts is in line with the Trinity release source repositories:  
 ```
 Deps [dependencies/]
@@ -52,11 +55,7 @@ See https://wiki.trinitydesktop.org/How_to_Build_TDE_Core_Modules for more infor
 
 ---
 
-***Building a pre-release from snapshot sources***
-
-This is similar to the build for a release version, but the sources are taken from the TDE cgit repository @ https://git.trinitydesktop.org/cgit/{package}.
-
----
+[<img src="https://ray-v.github.io/TDE-version.png">](https://ray-v.github.io/TDE-version.png)
 
 ***Building the development version from git sources***
 
@@ -68,9 +67,16 @@ The git repositories are cloned to 'src/cgit'
 
 ---
 
+***Building a pre-release from snapshot sources***
+
+This option has been retained for updating any builds already based on these sources.  
+New builds should use the R14.0.6 archives.
+
+---
+
 ***Cross compiling for RPi3***
 
-There is a work-in-progress for cross compiling TDE for the Raspberry Pi3 based on these scripts - see the html page in the gh-pages branch:
+Cross compiling a number of packages for the Raspberry Pi3 based on these scripts is detailed in the html page in the gh-pages branch:
 ```
 git clone https://github.com/Ray-V/tde-slackbuilds.git  
 cd tde-slackbuilds  

get-source.sh

@@ -68,7 +68,7 @@ SRCDIR=$(cd $(dirname $0); pwd)
 ## if snapshot, need to change some variables:
 [[ $TDEVERSION == r14.0.6 && ! $TDEMIR_SUBDIR == misc ]] && \
 ARCHIVE_TYPE=tar.gz && \
-SRCURL=https://git.trinitydesktop.org/cgit/$PRGNAM/snapshot/$PRGNAM-$TDEVERSION.$ARCHIVE_TYPE && \
+SRCURL=https://mirror.git.trinitydesktop.org/cgit/$PRGNAM/snapshot/$PRGNAM-$TDEVERSION.$ARCHIVE_TYPE && \
 (
 ## download admin/cmake/libltdl/libtdevnc as prerequisites
 cd $SRCDIR/../../src/
@@ -78,22 +78,22 @@ libltdl
 libtdevnc' | while read line
 do
 [[ ! -s $line-$TDEVERSION.$ARCHIVE_TYPE && ! $line == libtdevnc ]] && \
-wget https://git.trinitydesktop.org/cgit/$line/snapshot/$line-$TDEVERSION.$ARCHIVE_TYPE
+wget https://mirror.git.trinitydesktop.org/cgit/$line/snapshot/$line-$TDEVERSION.$ARCHIVE_TYPE
 [[ ! -s $line-r14.0.1.$ARCHIVE_TYPE && $line == libtdevnc ]] && \
-wget https://git.trinitydesktop.org/cgit/$line/snapshot/$line-r14.0.1.$ARCHIVE_TYPE
+wget https://mirror.git.trinitydesktop.org/cgit/$line/snapshot/$line-r14.0.1.$ARCHIVE_TYPE
 done
 )
 
-## if [rR]14.0.? or misc, download archive:
-[[ $TDEVERSION == [rR]14.0.? || $TDEMIR_SUBDIR == misc ]] && \
+## if [r]14.0.? or misc, download archive:
+[[ $TDEVERSION == *14.0.? || $TDEMIR_SUBDIR == misc ]] && \
 {
 ## check for and remove any zero byte archive files
-[[ ! -s $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} ]] && \
-rm $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} 2>/dev/null || true
-ln -sf $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} $SRCDIR
-SOURCE=$SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"}
-# SRCURL for non-TDE archives, set in the SB, will override the Trinity default *tar.bz2 URL
-SRCURL=${SRCURL:-"https://$TDE_MIRROR/releases/$VERSION$TDEMIR_SUBDIR/$PRGNAM-$VERSION.tar.bz2"}
+[[ ! -s $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} ]] && \
+rm $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} 2>/dev/null || true
+ln -sf $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} $SRCDIR
+SOURCE=$SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"}
+# SRCURL for non-TDE archives, set in the SB, will override the Trinity default *tar.xz URL
+SRCURL=${SRCURL:-"https://$TDE_MIRROR/releases/R$VERSION/main$TDEMIR_SUBDIR/$PRGNAM-trinity-$VERSION.tar.xz"}
 # Source file availability:
 if ! [ -f $SOURCE ]; then
   echo "Source '$(basename $SOURCE)' not available yet..."
@@ -228,11 +228,11 @@ cd $TMP_BUILD/tmp-$PRGNAM
 ##
 ## [1] firstly test for R14 or misc ..
 ##
-[[ $TDEVERSION == R14.0.? || $TDEMIR_SUBDIR == misc ]] && {
+[[ $TDEVERSION == 14.0.? || $TDEMIR_SUBDIR == misc ]] && {
 ## unpack R14 or misc
 echo -e " unpacking $(basename $SOURCE) ... \n"
 tar -xf $SOURCE 
-[[ $TDEMIR_SUBDIR != misc ]] && cd ./$(echo $TDEMIR_SUBDIR | cut -d / -f 2) || true
+#[[ $TDEMIR_SUBDIR != misc ]] && cd ./$(echo $TDEMIR_SUBDIR | cut -d / -f 2) || true
 } || {
 ##
 ## [2] not R14 nor misc - is it r14 snapshot?
@@ -271,19 +271,6 @@ cp -a --parents {admin,cmake}/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/
 ##
 cd $PRGNAM*
 }
-[[ $TDEVERSION == R14.0.4 ]] && {
-## patch to allow automake 1.16.x
-[[ -s admin/cvs.sh ]] && echo $'
---- admin/cvs.sh
-+++ 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.* | automake*1.[7-9]* | automake*1.1[0-6]* )
-' | while read line
-do
-patch -p0
-done
-} || true # avoid exit 1 if patch n/a
 }
 
 listdocs_fn ()