merged gitbuild branch into master

modified k9copy and soundkonverter SlackBuilds for R14.0.4 clang builds

Apps/k9copy/k9copy.SlackBuild

@@ -41,21 +41,37 @@ langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po
 sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am
 langs=$(echo $langs | sed 's|.po||g')
 
+[[ $TDEVERSION == R14.0.4 ]] && {
+## patch for clang from commit 72845f6
+echo $'
+--- libk9copy/k9config.cpp
++++ libk9copy/k9config.cpp
+@@ -82,2 +82,2 @@
+-  m_prefButtonHiliteColor=m_config->readColorEntry("buttonHiliteColor",&TQColor(TQt::yellow));
+-  m_prefButtonTextColor=m_config->readColorEntry("buttonTextColor",&TQColor(TQt::yellow));
++  m_prefButtonHiliteColor=m_config->readColorEntry("buttonHiliteColor", &TQt::yellow);
++  m_prefButtonTextColor=m_config->readColorEntry("buttonTextColor", &TQt::yellow);
+' | while read line
+do
+patch -p0
+done
+}
+
 ltoolupdate_fn
 
 chown_fn
 
 cd_builddir_fn
 
-LDFLAGS="${SLKLDFLAGS}" \
+LDFLAGS=$SLKLDFLAGS \
-CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \
+CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \
-CXXFLAGS="${SLKCFLAGS}" \
+CXXFLAGS=$SLKCFLAGS \
-CC="gcc" \
+CC=$COMPILER \
-CXX="g++" \
+CXX=$COMPILER_CXX \
 ../configure \
-   --prefix=${INSTALL_TDE} \
+   --prefix=$INSTALL_TDE \
    --sysconfdir=$SYS_CNF_DIR \
-   --mandir=${INSTALL_TDE}/man \
+   --mandir=$INSTALL_TDE/man \
    --disable-rpath \
    --enable-closure \
    --enable-k3bdevices # do not activate hal/dbus support (use k3bdevice instead)

Apps/soundkonverter/soundkonverter.SlackBuild

@@ -39,6 +39,26 @@ langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po
 sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am
 langs=$(echo $langs | sed "s|.po||g")
 
+[[ $TDEVERSION == R14.0.4 ]] && {
+## patch for clang from commit 3f7e19f
+echo $'
+--- src/metadata/rmff/rmff.h
++++ src/metadata/rmff/rmff.h
+@@ -35,0 +36,2 @@
++   class AudioProperties;
++
+@@ -252,3 +254 @@
+-      
+-      class TagLib::AudioProperties;
+-      
++
+' | while read line
+do
+patch -p0
+done
+}
+
+
 listdocs_fn
 
 ltoolupdate_fn
@@ -51,8 +71,8 @@ cd_builddir_fn
 LDFLAGS=$SLKLDFLAGS \
 CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \
 CXXFLAGS=$SLKCFLAGS \
-CC="gcc" \
+CC=$COMPILER \
-CXX="g++" \
+CXX=$COMPILER_CXX \
 ../configure \
    --prefix=$INSTALL_TDE \
    --sysconfdir=$SYS_CNF_DIR \

Core/tde-i18n/README

@@ -2,5 +2,5 @@ There is an option in tde-i18n.SlackBuild to include a language specific patch f
 
 It needs to be named tde-i18n-{lang}-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 patch file must start with 'tde-i18n-{lang}' - see tde-i18n-en_GB-patch for an example.
+Because of its position in the Slackbuild and the patch -p0 option, the path to the patched file must start with 'tde-i18n-{lang}' - see tde-i18n-en_GB-patch for an example.
  

KNOWN-ISSUES

@@ -1,6 +0,0 @@
-soundkonverter and k9copy builds fail with clang, and their SlackBuilds have been set to use gcc regardless of what is selected in BUILD-TDE.sh
-
-If you have Slackware's KDE installed and TDE as well, you might have an issue with TDE launching the KDE4 Konsole and attempting to use it's ark. To fix please adjust your PATH so that the TDE directory comes before /usr/share/bin.
-
-THE BUG REPORTS FOR EVERYTHING IF YOU'RE INTERESTED
-https://bugs.trinitydesktop.org/buglist.cgi?quicksearch=ALL

README

@@ -1,8 +1,6 @@
-Build TDE [Trinity Desktop Environment] for Slackware 14.2 and current** on i586+, x86_64, or Raspberry Pi3 [see README-Raspberry-Pi3.md].
+Build TDE [Trinity Desktop Environment] for Slackware 14.2 and current[1] on i586+, x86_64, or Raspberry Pi3 [see README-Raspberry-Pi3.md].
 
-Run ./BUILD-TDE.sh - a dialog based script with a series of screens for user input.
+Run ./BUILD-TDE.sh - a dialog based script with a series of screens for user input. Includes an option to build the TDE development version from https://mirror.git.trinitydesktop.org/cgit/
-
-This branch includes a beta build for the TDE development version from https://mirror.git.trinitydesktop.org/cgit/ [see README-git].
 
 =============================================================
 
@@ -43,10 +41,22 @@ TDM may need some manual setting up - see Core/tdebase/README, which can also be
 See https://wiki.trinitydesktop.org/How_to_Build_TDE_Core_Modules for more information
 
 =========================================================
+Building from git sources
+
+The individual TDE apps can be cloned from Trinity git, so the build is set up to do that - except for individual language packs of tde-i18n. The whole tde-i18n download is ~1x10^6 bytes, so to reduce that, wget is used to download individual tde-i18n-$lang packs as they are not git repositories.
+
+Once any git repository has been cloned, further downloads are updates only[2].
+
+This gives the best options - only fetching what is needed, and incremental updates.
+
+The git repositories are cloned to 'src/cgit'
+
+
+KNOWN-ISSUES
+[1] Not tested on current since the Mass Rebuild of 2018-04-19.
 
-NOTE: The Misc directory contains SlackBuilds for software that might already be installed from slackbuilds.org or elsewhere.
+[2] The i18n downloads with wget can't be updated because cgit produces 'current' timestamps. The consequence is that if tde-i18n-$lang is a part of the build after its initial download, it will be downloaded again. As the latest update was a year ago, once built, there will probably be no need to do so again and so tde-i18n for a particular language will probably only be run once. On that basis I don't see this being a significant issue.
-Please check because any misc builds selected here could overwrite them.
 
-** Not tested on current since the Mass Rebuild of 2018-04-19. **
+[3] If Slackware's KDE is installed as well as TDE, there might be an issue with TDE launching the KDE4 Konsole and attempting to use it's ark. To fix, adjust the PATH so that the TDE directories come before /usr/share/bin.
 
-***Please be sure to read the KNOWN-ISSUES file prior to building.***
+[4] The Misc directory contains SlackBuilds for software that might already be installed from slackbuilds.org or elsewhere. Please check because any misc builds selected here could overwrite them.

README-git

@@ -1,38 +0,0 @@
-The individual TDE apps can be cloned from Trinity git, so the build is set up to do that - except for individual language packs of tde-i18n. The whole tde-i18n download is ~1x10^6 bytes, so to reduce that, wget is used to download individual tde-i18n-ab_CD packs as they are not git repositories.
-
-Once any git repository has been cloned, further downloads are updates only[*].
-
-This gives the best options - only fetching what is needed, and incremental updates.
-
-The git repositories are cloned to 'src/cgit', arranged in this tree format ignoring whether they are in Core, Deps, etc.
-
-src
-:
-└── cgit
-    ├── admin
-    ├── cmake
-    :
-    ├── tqt3
-    :
-    ├── tdelibs
-    :
-    ├── tdei18n
-    :   └── cgit
-            └── tde-i18n
-                └── plain
-                    ├── tde-i18n-en_GB
-                    └── tde-i18n-ru
-
-For the build, these repositories are copied to the build area where the R14.0.4 archives would otherwise be extracted. admin & cmake are also always copied, and libltdl and libtdevnc where they're needed.
-
-This has resulted in most of the modifications being in the main scripts, BUILD-TDE.sh and get-source.sh [in getsource_fn and untar_fn]. tde-i18n.SlackBuild had to be modified because it doesn't use untar_fn. Some other *.SlackBuild modifications are work-arounds to accommodate the patching already included in the git sources.
-
-All packages in the BUILD-TDE.sh " TDE Packages Selection " have now been tested and build using gcc - except for kdbusnotification:
-
-	In file included from daemon.moc.cpp:9:0:
-	../../../src/daemon/daemon.h:25:42: error: expected initializer before ‘:’ token
-	 class TDEUI_EXPORT NotificationContainer : public TDEPassivePopupStackContainer
-	                                          ^
-
-
-[*] I'm sure that checking timestamps with wget did work when I set it up, but it doesn't now as the server doesn't seem to be delivering that information. The consequence is that if tde-i18n-$lang is a part of the build after its initial download, it will be downloaded again. As the latest update was a year ago, once built, there will probably be no need to do so again and so tde-i18n for a particular language will probably only be run once. On that basis I don't see this being a significant issue.

src/cgit/README

@@ -1 +1 @@
-This directory is used to store the cloned tde-git repositories which are copied to the build area in place of the untarred R14.0.4 archives.
+This directory is used to store the cloned tde-git repositories which are copied to the build area in place of the extracted R14.0.4 archives.

src/cgit/tdei18n/README

@@ -1,2 +1,2 @@
 This directory is used for downloads of tde-i18n-ab_CD packs as they are not git repositories and therefore can't be cloned individually.
-They are copied to the build area in place of the untarred R14.0.4 archives.
+They are copied to the build area in place of the extracted R14.0.4 archives.