From fe154cede41b2e7aaf82a08de8661a03dd9ffe91 Mon Sep 17 00:00:00 2001 From: Thorn Inurcide Date: Sat, 13 Aug 2016 17:11:45 -0400 Subject: [PATCH] updates/fixes --- .../tdeamarok.SlackBuild} | 29 ++++++++------- .../tdegwenview-i18n.SlackBuild} | 29 ++++++++------- Apps/{gwenview => tdegwenview}/README | 0 .../tdegwenview.SlackBuild} | 33 ++++++++++------- .../tdek3b-i18n.SlackBuild} | 29 ++++++++------- .../tdek3b.SlackBuild} | 29 ++++++++------- BUILD-TDE.sh | 37 +++++++++---------- CHANGELOG | 1 + Core/tdegraphics/tdegraphics.SlackBuild | 2 - .../tdelibkdcraw.SlackBuild} | 29 ++++++++------- .../tdelibkexiv2.SlackBuild} | 30 +++++++-------- .../tdelibkipi.SlackBuild} | 29 ++++++++------- .../libmp4v2.SlackBuild} | 7 ++-- Misc/libmp4v2/slack-desc | 19 ++++++++++ Misc/mp4v2/slack-desc | 19 ---------- 15 files changed, 166 insertions(+), 156 deletions(-) rename Apps/{amarok/amarok.SlackBuild => tdeamarok/tdeamarok.SlackBuild} (88%) rename Apps/{gwenview-i18n/gwenview-i18n.SlackBuild => tdegwenview-i18n/tdegwenview-i18n.SlackBuild} (89%) rename Apps/{gwenview => tdegwenview}/README (100%) rename Apps/{gwenview/gwenview.SlackBuild => tdegwenview/tdegwenview.SlackBuild} (84%) rename Apps/{k3b-i18n/k3b-i18n.SlackBuild => tdek3b-i18n/tdek3b-i18n.SlackBuild} (87%) rename Apps/{k3b/k3b.SlackBuild => tdek3b/tdek3b.SlackBuild} (83%) rename Libs/{libkdcraw/libkdcraw.SlackBuild => tdelibkdcraw/tdelibkdcraw.SlackBuild} (83%) rename Libs/{libkexiv2/libkexiv2.SlackBuild => tdelibkexiv2/tdelibkexiv2.SlackBuild} (82%) rename Libs/{libkipi/libkipi.SlackBuild => tdelibkipi/tdelibkipi.SlackBuild} (83%) rename Misc/{mp4v2/mp4v2.SlackBuild => libmp4v2/libmp4v2.SlackBuild} (91%) create mode 100755 Misc/libmp4v2/slack-desc delete mode 100755 Misc/mp4v2/slack-desc diff --git a/Apps/amarok/amarok.SlackBuild b/Apps/tdeamarok/tdeamarok.SlackBuild similarity index 88% rename from Apps/amarok/amarok.SlackBuild rename to Apps/tdeamarok/tdeamarok.SlackBuild index 162df93..81956e5 100755 --- a/Apps/amarok/amarok.SlackBuild +++ b/Apps/tdeamarok/tdeamarok.SlackBuild @@ -22,6 +22,7 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +PKGNAM=tdeamarok PRGNAM=amarok VERSION=${VERSION:-R14.0.3} BUILD=${BUILD:-1} @@ -39,17 +40,17 @@ echo " # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -amarok: amarok (Amarok Music Player) -amarok: -amarok: Amarok music player for TDE -amarok: -amarok: -amarok: With language support for: -amarok: -amarok: en $(echo $langs) -amarok: -amarok: -amarok: Home: https://www.trinitydesktop.org/index.php +tdeamarok: tdeamarok (Amarok Music Player) +tdeamarok: +tdeamarok: Amarok music player for TDE +tdeamarok: +tdeamarok: +tdeamarok: With language support for: +tdeamarok: +tdeamarok: en $(echo $langs) +tdeamarok: +tdeamarok: +tdeamarok: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc } @@ -132,11 +133,11 @@ mkdir -p $PKG/install SlackDesc cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} +makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 +md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt +cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt # Restore the original umask: umask ${_UMASK_} diff --git a/Apps/gwenview-i18n/gwenview-i18n.SlackBuild b/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild similarity index 89% rename from Apps/gwenview-i18n/gwenview-i18n.SlackBuild rename to Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild index a23e550..8b7cd9e 100755 --- a/Apps/gwenview-i18n/gwenview-i18n.SlackBuild +++ b/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild @@ -22,6 +22,7 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +PKGNAM=tdegwenview-i18n PRGNAM=gwenview-i18n VERSION=${VERSION:-R14.0.3} BUILD=${BUILD:-1} @@ -39,17 +40,17 @@ echo " # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -gwenview-i18n: Internationalization files for gwenview. -gwenview-i18n: -gwenview-i18n: For languages: -gwenview-i18n: -gwenview-i18n: $(echo $langs) -gwenview-i18n: -gwenview-i18n: -gwenview-i18n: -gwenview-i18n: -gwenview-i18n: -gwenview-i18n: +tdegwenview-i18n: tdegwenview-i18n (Internationalization files for gwenview.) +tdegwenview-i18n: +tdegwenview-i18n: For languages: +tdegwenview-i18n: +tdegwenview-i18n: $(echo $langs) +tdegwenview-i18n: +tdegwenview-i18n: +tdegwenview-i18n: +tdegwenview-i18n: +tdegwenview-i18n: +tdegwenview-i18n: " > $PKG/install/slack-desc } @@ -130,11 +131,11 @@ SlackDesc ARCH="noarch" cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} +makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 +md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt +cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt # Restore the original umask: umask ${_UMASK_} diff --git a/Apps/gwenview/README b/Apps/tdegwenview/README similarity index 100% rename from Apps/gwenview/README rename to Apps/tdegwenview/README diff --git a/Apps/gwenview/gwenview.SlackBuild b/Apps/tdegwenview/tdegwenview.SlackBuild similarity index 84% rename from Apps/gwenview/gwenview.SlackBuild rename to Apps/tdegwenview/tdegwenview.SlackBuild index 8c65b62..fdfd9ea 100755 --- a/Apps/gwenview/gwenview.SlackBuild +++ b/Apps/tdegwenview/tdegwenview.SlackBuild @@ -22,6 +22,7 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +PKGNAM=tdegwenview PRGNAM=gwenview VERSION=${VERSION:-R14.0.3} BUILD=${BUILD:-1} @@ -39,17 +40,17 @@ echo " # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -gwenview: gwenview is an image viewer for TDE. -gwenview: -gwenview: -gwenview: -gwenview: -gwenview: -gwenview: -gwenview: -gwenview: -gwenview: -gwenview: +tdegwenview: tdegwenview (gwenview is an image viewer for TDE.) +tdegwenview: +tdegwenview: +tdegwenview: +tdegwenview: +tdegwenview: +tdegwenview: +tdegwenview: +tdegwenview: +tdegwenview: +tdegwenview: " > $PKG/install/slack-desc } @@ -78,6 +79,9 @@ chmod -R u+w,go+r-w,a+rX-st . mkdir -p build-${PRGNAM} cd build-${PRGNAM} +# The libkipi problem needs solved. Not being located in /opt/trinity and +# trying to compiles against kde4's libkipi which causes a build error as +# you would expect. # Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -87,6 +91,7 @@ CXXFLAGS="${SLKCFLAGS}" \ --sysconfdir="/etc/trinity" \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ + --without-kipi \ --enable-closure make $NUMJOBS || exit 1 @@ -107,11 +112,11 @@ SlackDesc cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} +makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 +md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt +cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt # Restore the original umask: umask ${_UMASK_} diff --git a/Apps/k3b-i18n/k3b-i18n.SlackBuild b/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild similarity index 87% rename from Apps/k3b-i18n/k3b-i18n.SlackBuild rename to Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild index c0f24c0..8b906eb 100755 --- a/Apps/k3b-i18n/k3b-i18n.SlackBuild +++ b/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild @@ -22,6 +22,7 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +PKGNAM=tdek3b-i18n PRGNAM=k3b-i18n VERSION=${VERSION:-R14.0.3} BUILD=${BUILD:-1} @@ -39,17 +40,17 @@ echo " # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -k3b-i18n: k3b-i18n (internationalization files for the CD Creator). -k3b-i18n: -k3b-i18n: For languages: -k3b-i18n: -k3b-i18n: $(echo $langs) -k3b-i18n: -k3b-i18n: -k3b-i18n: -k3b-i18n: -k3b-i18n: -k3b-i18n: +tdek3b-i18n: tdek3b-i18n (internationalization files for the CD Creator). +tdek3b-i18n: +tdek3b-i18n: For languages: +tdek3b-i18n: +tdek3b-i18n: $(echo $langs) +tdek3b-i18n: +tdek3b-i18n: +tdek3b-i18n: +tdek3b-i18n: +tdek3b-i18n: +tdek3b-i18n: " > $PKG/install/slack-desc } @@ -112,11 +113,11 @@ SlackDesc ARCH="noarch" cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} +makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 +md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt +cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt # Restore the original umask: umask ${_UMASK_} diff --git a/Apps/k3b/k3b.SlackBuild b/Apps/tdek3b/tdek3b.SlackBuild similarity index 83% rename from Apps/k3b/k3b.SlackBuild rename to Apps/tdek3b/tdek3b.SlackBuild index 0c2877b..6f7c1b7 100755 --- a/Apps/k3b/k3b.SlackBuild +++ b/Apps/tdek3b/tdek3b.SlackBuild @@ -22,6 +22,7 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +PKGNAM=tdek3b PRGNAM=k3b VERSION=${VERSION:-R14.0.3} BUILD=${BUILD:-1} @@ -39,17 +40,17 @@ echo " # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -k3b: k3b (The CD Creator, TDE R14.0.3 version) -k3b: -k3b: K3b makes writing cds under Linux easy. It has an easy to use -k3b: interface and supports CD burning (including on-the-fly), copying, -k3b: erasing, ripping, and more. -k3b: -k3b: K3b was written by Sebastian Trueg, Thomas Froescher, -k3b: Christian Kvasny, and Klaus-Dieter Krannich. -k3b: -k3b: For more information, visit: http://www.k3b.org -k3b: +tdek3b: tdek3b (The CD Creator, TDE R14.0.3 version) +tdek3b: +tdek3b: K3b makes writing cds under Linux easy. It has an easy to use +tdek3b: interface and supports CD burning (including on-the-fly), copying, +tdek3b: erasing, ripping, and more. +tdek3b: +tdek3b: K3b was written by Sebastian Trueg, Thomas Froescher, +tdek3b: Christian Kvasny, and Klaus-Dieter Krannich. +tdek3b: +tdek3b: For more information, visit: http://www.k3b.org +tdek3b: " > $PKG/install/slack-desc } @@ -109,11 +110,11 @@ SlackDesc cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} +makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 +md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt +cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt # Restore the original umask: umask ${_UMASK_} diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index 91e4fc8..7f775fb 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -7,7 +7,7 @@ fi dialog --no-shadow --colors --title " Introduction " --msgbox \ "\n - This is the set up script for TDE R14.0.3 SlackBuilds on Slackware Current for setting user preferences and options. + This is the set up script for TDE R14.0.3 SlackBuilds on Slackware 14.2 for setting user preferences and options. \n\n Source archives can be stored locally or downloaded during the build from a selected TDE mirror site. \n\n @@ -238,20 +238,20 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD " Misc/speex" "Audio compression format designed for speech" off "\Zb\Z6 Requires l/speexdsp \Zn" \ "Core/tdenetwork" "Networking applications for TDE" off "\Zb\Z6 Optional dependency - speex \Zn" \ "Core/tde-i18n" "Additional language support for TDE" off "\Zb\Z6 Required when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ -"Libs/libkdcraw" "Decode RAW picture files" off "\Zb\Z6 Required for digikam, gwenview and ksquirrel \Zn" \ -"Libs/libkexiv2" "Library to manipulate picture metadata" off "\Zb\Z6 Required for digikam, gwenview and ksquirrel. Needs l/exiv2... \Zn" \ -"Libs/libkipi" "A common plugin structure" off "\Zb\Z6 Required for digikam, gwenview and ksquirrel \Zn" \ -"Libs/kipi-plugins" "Additional functions for digiKam, ksquirrel and gwenview" off "\Zb\Z6 Required for digikam, gwenview and ksquirrel. Requires libkdcraw libkexiv2 libkipi. \Zn" \ +"Libs/tdelibkdcraw" "Decode RAW picture files" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel \Zn" \ +"Libs/tdelibkexiv2" "Library to manipulate picture metadata" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel. Needs l/exiv2... \Zn" \ +"Libs/tdelibkipi" "A common plugin structure" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel \Zn" \ +"Libs/kipi-plugins" "Additional functions for digiKam, ksquirrel and gwenview" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel. Requires tdelibkdcraw tdelibkexiv2 tdelibkipi. \Zn" \ "Libs/libksquirrel" "A set of image codecs for KSquirrel" off "\Zb\Z6 Required for ksquirrel \Zn" \ -"Apps/digikam" "A digital photo management application + Showfoto viewer" off "\Zb\Z6 Requires kipi-plugins libkdcraw libkexiv2 libkipi. \Zn" \ -"Apps/ksquirrel" "An image viewer with OpenGL and KIPI support." off "\Zb\Z6 Requires kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel. \Zn" \ -"Apps/gwenview" "An image viewer" off "\Zb\Z6 Requires kipi-plugins libkdcraw libkexiv2 libkipi. \Zn" \ -"Apps/gwenview-i18n" "Internationalization files for gwenview." off "\Zb\Z6 Required for gwenview when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ -" Misc/mp4v2" "Create and modify mp4 files" off "\Zb\Z6 \Zn" \ -"Apps/amarok" "A Music Player" off "\Zb\Z6 Optional dependencies - mp4v2, speex \Zn" \ -"Apps/k3b" "The CD Creator" off "\Zb\Z6 \Zn" \ -"Apps/k3b-i18n" "Internationalization files for k3b." off "\Zb\Z6 Required for k3b when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ -"Apps/k9copy" "A DVD backup utility" off "\Zb\Z6 Requires k3b \Zn" \ +"Apps/digikam" "A digital photo management application + Showfoto viewer" off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi. \Zn" \ +"Apps/ksquirrel" "An image viewer with OpenGL and KIPI support." off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi libksquirrel. \Zn" \ +"Apps/tdegwenview" "An image viewer" off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi. \Zn" \ +"Apps/tdegwenview-i18n" "Internationalization files for gwenview." off "\Zb\Z6 Required for tdegwenview when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ +" Misc/libmp4v2" "Create and modify mp4 files" off "\Zb\Z6 \Zn" \ +"Apps/tdeamarok" "A Music Player" off "\Zb\Z6 Optional dependencies - libmp4v2, speex \Zn" \ +"Apps/tdek3b" "The CD Creator" off "\Zb\Z6 \Zn" \ +"Apps/tdek3b-i18n" "Internationalization files for tdek3b." off "\Zb\Z6 Required for tdek3b when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ +"Apps/k9copy" "A DVD backup utility" off "\Zb\Z6 Requires tdek3b and ffmpeg \Zn" \ "Apps/knemo" "The TDE Network Monitor" off "\Zb\Z6 \Zn" \ "Apps/knights" "A graphical chess interface" off "\Zb\Z6 \Zn" \ "Apps/dolphin" "Dolphin file manager for TDE" off "\Zb\Z6 \Zn" \ @@ -369,11 +369,10 @@ do sed -ri "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $TMP/${package}-build-log || ${EXIT_FAIL:-"true"} # tde-i18n package installation is handled in tde-i18n.SlackBuild because if more than one i18n package is being built, only the last one will be installed by upgradepkg -if [[ $INST == 1 ]] -then -[[ ${package} != tde-i18n ]] && upgradepkg --install-new --reinstall $TMP/${package}-${version}-*-${build}*.txz -if [[ $(ls /var/log/packages/${package}-*${version}-*-${build}*) ]] -then +# Note to self: this alteration appears to fix the problem (Erroing and refusing to compile) BUT makes the script recomnpile it if you run the +# script with re-use even though it is installed +if [[ $INST == 1 ]] && [[ ${package} != tde-i18n ]]; then upgradepkg --install-new --reinstall $TMP/${package}-${version}-*-${build}*.txz +if [[ $(ls /var/log/packages/${package}-*${version}-*-${build}*) ]]; then sed -i "s|$dir ||" $TMPVARS/TDEbuilds else echo " diff --git a/CHANGELOG b/CHANGELOG index 31a7d37..a853fb9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1 +1,2 @@ 12/29/2015 Removed Avahi and krb5 as deps +08/01/2016 Overhaul to entire build process using a dialog script - Thanks Ray-V diff --git a/Core/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild index b56ff55..f2333e4 100755 --- a/Core/tdegraphics/tdegraphics.SlackBuild +++ b/Core/tdegraphics/tdegraphics.SlackBuild @@ -44,8 +44,6 @@ chmod -R u+w,go+r-w,a+rX-st . # Optional deps have been turned off as they mainly affect tdefile plugins which wont even build. # Kpdf has been turned off because I've yet to even get it to open anything. If you want to try any # of them feel free to turn the switches to "ON" -# Kuickshow requires imlib, which will not build on Slackware current/14.2.The patched SBo build -# produces compiler errors. # If imlib is installed, include Kuickshow: [[ $(ls /var/log/packages/imlib-*) ]] && KUICKSHOW=ON mkdir -p build-${PRGNAM} diff --git a/Libs/libkdcraw/libkdcraw.SlackBuild b/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild similarity index 83% rename from Libs/libkdcraw/libkdcraw.SlackBuild rename to Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild index 1dc8bec..fe94d2f 100755 --- a/Libs/libkdcraw/libkdcraw.SlackBuild +++ b/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild @@ -22,6 +22,7 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +PKGNAM=tdelibkdcraw PRGNAM=libkdcraw VERSION=${VERSION:-R14.0.3} BUILD=${BUILD:-1} @@ -39,17 +40,17 @@ echo " # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libkdcraw: Libkdcraw (dcraw Library Wrapper) -libkdcraw: -libkdcraw: Libkdcraw is a C++ interface around dcraw binary program used to -libkdcraw: decode RAW picture files. The library documentation is available -libkdcraw: on header files. This library is used by kipi-plugins, digiKam -libkdcraw: and other kipi host programs. -libkdcraw: -libkdcraw: With language support for: -libkdcraw: -libkdcraw: en $(echo $langs) -libkdcraw: +tdelibkdcraw: tdeLibkdcraw (dcraw Library Wrapper) +tdelibkdcraw: +tdelibkdcraw: Libkdcraw is a C++ interface around dcraw binary program used to +tdelibkdcraw: decode RAW picture files. The library documentation is available +tdelibkdcraw: on header files. This library is used by kipi-plugins, digiKam +tdelibkdcraw: and other kipi host programs. +tdelibkdcraw: +tdelibkdcraw: With language support for: +tdelibkdcraw: +tdelibkdcraw: en $(echo $langs) +tdelibkdcraw: " > $PKG/install/slack-desc } @@ -114,11 +115,11 @@ SlackDesc cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} +makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 +md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt +cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt # Restore the original umask: umask ${_UMASK_} diff --git a/Libs/libkexiv2/libkexiv2.SlackBuild b/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild similarity index 82% rename from Libs/libkexiv2/libkexiv2.SlackBuild rename to Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild index 741307f..c7a96da 100755 --- a/Libs/libkexiv2/libkexiv2.SlackBuild +++ b/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild @@ -21,7 +21,7 @@ # 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. - +PKGNAM=tdelibkexiv2 PRGNAM=libkexiv2 VERSION=${VERSION:-R14.0.3} BUILD=${BUILD:-1} @@ -39,17 +39,17 @@ echo " # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libkexiv2: Libkexiv2 (Exiv2 Library Wrapper) -libkexiv2: -libkexiv2: Libkexiv2 is a wrapper around Exiv2 library to manipulate picture -libkexiv2: metadata. This library is used by kipi-plugins, digiKam and other -libkexiv2: kipi host programs. The library documentation is available in the -libkexiv2: kexiv2.h header file. -libkexiv2: -libkexiv2: Homepage: http://www.kipi-plugins.org/ -libkexiv2: -libkexiv2: -libkexiv2: +tdelibkexiv2: tdeLibkexiv2 (Exiv2 Library Wrapper) +tdelibkexiv2: +tdelibkexiv2: Libkexiv2 is a wrapper around Exiv2 library to manipulate picture +tdelibkexiv2: metadata. This library is used by kipi-plugins, digiKam and other +tdelibkexiv2: kipi host programs. The library documentation is available in the +tdelibkexiv2: kexiv2.h header file. +tdelibkexiv2: +tdelibkexiv2: Homepage: http://www.kipi-plugins.org/ +tdelibkexiv2: +tdelibkexiv2: +tdelibkexiv2: " > $PKG/install/slack-desc } @@ -110,11 +110,11 @@ SlackDesc cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} +makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 +md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt +cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt # Restore the original umask: umask ${_UMASK_} diff --git a/Libs/libkipi/libkipi.SlackBuild b/Libs/tdelibkipi/tdelibkipi.SlackBuild similarity index 83% rename from Libs/libkipi/libkipi.SlackBuild rename to Libs/tdelibkipi/tdelibkipi.SlackBuild index 897ec26..b80e224 100755 --- a/Libs/libkipi/libkipi.SlackBuild +++ b/Libs/tdelibkipi/tdelibkipi.SlackBuild @@ -22,6 +22,7 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +PKGNAM=tdelibkipi PRGNAM=libkipi VERSION=${VERSION:-R14.0.3} BUILD=${BUILD:-1} @@ -39,17 +40,17 @@ echo " # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -libkipi: libKipi (KDE Image Plugin Interface) for TDE -libkipi: -libkipi: Kipi is an effort to develop a common plugin structure for digiKam, -libkipi: and other kipi host programs. Its aim is to share image plugins -libkipi: among graphic applications. Kipi is based on the old digiKam plugins -libkipi: implementation and is maintained by the digiKam team. -libkipi: -libkipi: With language support for: -libkipi: -libkipi: en $(echo $langs) -libkipi: +tdelibkipi: tdelibKipi (KDE Image Plugin Interface) for TDE +tdelibkipi: +tdelibkipi: Kipi is an effort to develop a common plugin structure for digiKam, +tdelibkipi: and other kipi host programs. Its aim is to share image plugins +tdelibkipi: among graphic applications. Kipi is based on the old digiKam plugins +tdelibkipi: implementation and is maintained by the digiKam team. +tdelibkipi: +tdelibkipi: With language support for: +tdelibkipi: +tdelibkipi: en $(echo $langs) +tdelibkipi: " > $PKG/install/slack-desc } @@ -114,11 +115,11 @@ SlackDesc cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} +makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 +md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt +cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt # Restore the original umask: umask ${_UMASK_} diff --git a/Misc/mp4v2/mp4v2.SlackBuild b/Misc/libmp4v2/libmp4v2.SlackBuild similarity index 91% rename from Misc/mp4v2/mp4v2.SlackBuild rename to Misc/libmp4v2/libmp4v2.SlackBuild index d60f2e4..9649e48 100755 --- a/Misc/mp4v2/mp4v2.SlackBuild +++ b/Misc/libmp4v2/libmp4v2.SlackBuild @@ -22,6 +22,7 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +PKGNAM=libmp4v2 PRGNAM=mp4v2 VERSION=${VERSION:-2.0.0} BUILD=${BUILD:-1} @@ -73,11 +74,11 @@ mkdir -p $PKG/install cat $SRCDIR/slack-desc > $PKG/install/slack-desc cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} +makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 +md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt +cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt # Restore the original umask: umask ${_UMASK_} diff --git a/Misc/libmp4v2/slack-desc b/Misc/libmp4v2/slack-desc new file mode 100755 index 0000000..1127f14 --- /dev/null +++ b/Misc/libmp4v2/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +libmp4v2: libmp4v2 (Create and modify mp4 files) +libmp4v2: +libmp4v2: The MP4v2 library provides an API to create and modify mp4 files as +libmp4v2: defined by ISO-IEC:14496-1:2001 MPEG-4 Systems. This file format +libmp4v2: is derived from Apple's QuickTime file format that has been +libmp4v2: used as a multimedia file format in a variety of platforms and +libmp4v2: applications. It is a very powerful and extensible format that can +libmp4v2: accommodate practically any type of media. +libmp4v2: +libmp4v2: +libmp4v2: Home: http://code.google.com/p/mp4v2/ diff --git a/Misc/mp4v2/slack-desc b/Misc/mp4v2/slack-desc deleted file mode 100755 index 6b4a2b5..0000000 --- a/Misc/mp4v2/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# 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------------------------------------------------------| -mp4v2: mp4v2 (Create and modify mp4 files) -mp4v2: -mp4v2: The MP4v2 library provides an API to create and modify mp4 files as -mp4v2: defined by ISO-IEC:14496-1:2001 MPEG-4 Systems. This file format -mp4v2: is derived from Apple's QuickTime file format that has been -mp4v2: used as a multimedia file format in a variety of platforms and -mp4v2: applications. It is a very powerful and extensible format that can -mp4v2: accommodate practically any type of media. -mp4v2: -mp4v2: -mp4v2: Home: http://code.google.com/p/mp4v2/