From 2570a9a3cde4aa498ff61eed64e1d527f213fd01 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Thu, 19 Mar 2020 09:19:16 +0000 Subject: [PATCH] =?UTF-8?q?Removals,=20revisions=20and=20patches=20..=20Se?= =?UTF-8?q?t=20a=20number=20of=20installation=20directories=20in=20tqt3.Sl?= =?UTF-8?q?ackBuild=20to=20install=20tqt3/tqtinterface=20to=20TDE=20instal?= =?UTF-8?q?lation=20directory=20to=20create=20what=20I=20feel=20is=20a=20m?= =?UTF-8?q?ore=20compact=20and=20logical=20tree:=20/opt/tde=20=E2=94=9C?= =?UTF-8?q?=E2=94=80=E2=94=80=20bin=20=E2=94=9C=E2=94=80=E2=94=80=20includ?= =?UTF-8?q?e=20=E2=94=82=C2=A0=C2=A0=20=E2=94=94=E2=94=80=E2=94=80=20tqt?= =?UTF-8?q?=20=E2=94=82=C2=A0=C2=A0=20=20=C2=A0=C2=A0=20=E2=94=94=E2=94=80?= =?UTF-8?q?=E2=94=80=20private=20=E2=94=9C=E2=94=80=E2=94=80=20lib64=20?= =?UTF-8?q?=E2=94=82=C2=A0=C2=A0=20=E2=94=9C=E2=94=80=E2=94=80=20pkgconfig?= =?UTF-8?q?=20=E2=94=82=C2=A0=C2=A0=20=E2=94=9C=E2=94=80=E2=94=80=20tde=20?= =?UTF-8?q?=E2=94=82=C2=A0=C2=A0=20=E2=94=82=C2=A0=C2=A0=20=E2=94=94?= =?UTF-8?q?=E2=94=80=E2=94=80=20plugins=20=E2=94=82=C2=A0=C2=A0=20?= =?UTF-8?q?=E2=94=82=C2=A0=C2=A0=20=20=20=20=20=E2=94=9C=E2=94=80=E2=94=80?= =?UTF-8?q?=20designer=20=E2=94=82=C2=A0=C2=A0=20=E2=94=82=C2=A0=C2=A0=20?= =?UTF-8?q?=20=20=20=20=E2=94=94=E2=94=80=E2=94=80=20styles=20=E2=94=82?= =?UTF-8?q?=C2=A0=C2=A0=20=E2=94=94=E2=94=80=E2=94=80=20tqt=20=E2=94=82?= =?UTF-8?q?=C2=A0=C2=A0=20=20=20=20=20=E2=94=9C=E2=94=80=E2=94=80=20mkspec?= =?UTF-8?q?s=20=E2=94=82=C2=A0=C2=A0=20=20=20=20=20=E2=94=94=E2=94=80?= =?UTF-8?q?=E2=94=80=20plugins=20=E2=94=82=C2=A0=C2=A0=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=E2=94=9C=E2=94=80=E2=94=80=20crypto=20=E2=94=82=C2=A0?= =?UTF-8?q?=C2=A0=20=20=20=20=20=20=20=20=20=E2=94=9C=E2=94=80=E2=94=80=20?= =?UTF-8?q?designer=20=E2=94=82=C2=A0=C2=A0=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=E2=94=9C=E2=94=80=E2=94=80=20inputmethods=20=E2=94=82=C2=A0?= =?UTF-8?q?=C2=A0=20=20=20=20=20=20=20=20=20=E2=94=9C=E2=94=80=E2=94=80=20?= =?UTF-8?q?integration=20=E2=94=82=C2=A0=C2=A0=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=E2=94=94=E2=94=80=E2=94=80=20styles=20=E2=94=94=E2=94=80?= =?UTF-8?q?=E2=94=80=20share=20=20=20=20=20=E2=94=94=E2=94=80=E2=94=80=20t?= =?UTF-8?q?qt=20=20=20=20=20=20=C2=A0=C2=A0=20=E2=94=94=E2=94=80=E2=94=80?= =?UTF-8?q?=20translations=20Revised=20doinst.sh=20and=20pkgconfig.sh=20se?= =?UTF-8?q?tup=20in=20tqt3.SlackBuild=20Removed=20PREPEND=20which=20probab?= =?UTF-8?q?ly=20never=20worked=20anyway=20Removed=20TQT=5FINCLUDE=5FPATH?= =?UTF-8?q?=20C*FLAGS=20-=20patched=20admin/acinclude.m4.in=20Removed=20SL?= =?UTF-8?q?KLDFLAGS=20-=20not=20used=20Removed=20ld=20error=20workaround?= =?UTF-8?q?=20patches=20Fixed=20build=20not=20stopping=20when=20set=20to?= =?UTF-8?q?=20Stop=20Fixed=20retaining=20tde-i18n=20build=20data=20when=20?= =?UTF-8?q?set=20to=20Keep=20ALL=20Revised=20cmake=20options=20Set=20TDE?= =?UTF-8?q?=20binaries=20directory=20to=20head=20of=20PATH=20Patch=20in=20?= =?UTF-8?q?tdelibs.SlackBuild=20to=20find=20avahi-tqt=20headers=20Patches?= =?UTF-8?q?=20in=20{tdevelop,tdeedu,tdemultimedia}.SlackBuild=20to=20find?= =?UTF-8?q?=20libtqt-mt=20Patch=20in=20tdewebdev.SlackBuild=20for=20'undef?= =?UTF-8?q?ined=20reference'=20error=20Added=20RPATH=20to=20all=20SlackBui?= =?UTF-8?q?lds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/abakus/abakus.SlackBuild | 8 +- Apps/amarok/amarok.SlackBuild | 52 +++-- Apps/digikam/digikam.SlackBuild | 7 +- Apps/dolphin/dolphin.SlackBuild | 8 +- Apps/filelight/filelight.SlackBuild | 9 +- Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild | 9 +- .../gtk3-tqt-engine.SlackBuild | 7 +- Apps/gwenview-i18n/gwenview-i18n.SlackBuild | 8 +- Apps/gwenview/gwenview.SlackBuild | 7 +- Apps/k3b-i18n/k3b-i18n.SlackBuild | 4 +- Apps/k3b/k3b.SlackBuild | 9 +- Apps/k9copy/k9copy.SlackBuild | 7 +- Apps/kaffeine/kaffeine.SlackBuild | 14 +- Apps/kbfx/kbfx.SlackBuild | 11 +- Apps/kbookreader/kbookreader.SlackBuild | 7 +- Apps/kdbg/kdbg.SlackBuild | 7 +- .../kdbusnotification.SlackBuild | 8 +- Apps/kile/kile.SlackBuild | 7 +- Apps/kkbswitch/kkbswitch.SlackBuild | 8 +- Apps/knemo/knemo.SlackBuild | 9 +- Apps/knetstats/knetstats.SlackBuild | 8 +- Apps/knights/knights.SlackBuild | 8 +- Apps/knmap/knmap.SlackBuild | 8 +- Apps/koffice-i18n/koffice-i18n.SlackBuild | 10 +- Apps/koffice/koffice.SlackBuild | 31 +-- Apps/krusader/krusader.SlackBuild | 10 +- Apps/kscope/kscope.SlackBuild | 10 +- Apps/ksensors/ksensors.SlackBuild | 8 +- Apps/kshutdown/kshutdown.SlackBuild | 10 +- Apps/ksquirrel/ksquirrel.SlackBuild | 7 +- Apps/ktorrent/ktorrent.SlackBuild | 7 +- Apps/kvkbd/kvkbd.SlackBuild | 8 +- Apps/kvpnc/kvpnc.SlackBuild | 12 +- Apps/piklab/piklab.SlackBuild | 9 +- Apps/potracegui/potracegui.SlackBuild | 8 +- Apps/rosegarden/rosegarden.SlackBuild | 8 +- Apps/soundkonverter/soundkonverter.SlackBuild | 7 +- .../tde-style-lipstik.SlackBuild | 10 +- .../tde-style-qtcurve.SlackBuild | 9 +- Apps/tdeio-locate/tdeio-locate.SlackBuild | 9 +- Apps/tdepowersave/tdepowersave.SlackBuild | 13 +- Apps/tdesudo/tdesudo.SlackBuild | 8 +- Apps/tdmtheme/tdmtheme.SlackBuild | 9 +- .../twin-style-crystal.SlackBuild | 7 +- Apps/yakuake/yakuake.SlackBuild | 8 +- BUILD-TDE.sh | 207 +++++++++--------- Core/tde-i18n/tde-i18n-en_GB-patch | 2 +- Core/tde-i18n/tde-i18n.SlackBuild | 31 +-- .../tdeaccessibility.SlackBuild | 7 +- Core/tdeaddons/tdeaddons.SlackBuild | 9 +- Core/tdeadmin/tdeadmin.SlackBuild | 9 +- Core/tdeartwork/tdeartwork.SlackBuild | 9 +- Core/tdebase/tdebase.SlackBuild | 30 +-- Core/tdeedu/tdeedu.SlackBuild | 26 ++- Core/tdegames/tdegames.SlackBuild | 9 +- Core/tdegraphics/tdegraphics.SlackBuild | 8 +- Core/tdelibs/tdelibs.SlackBuild | 35 ++- Core/tdemultimedia/tdemultimedia.SlackBuild | 23 +- Core/tdenetwork/tdenetwork.SlackBuild | 17 +- Core/tdepim/tdepim.SlackBuild | 9 +- Core/tdesdk/tdesdk.SlackBuild | 9 +- Core/tdetoys/tdetoys.SlackBuild | 9 +- Core/tdeutils/tdeutils.SlackBuild | 9 +- Core/tdevelop/tdevelop.SlackBuild | 13 +- Core/tdewebdev/tdewebdev.SlackBuild | 14 +- Deps/akode/akode.SlackBuild | 8 +- Deps/arts/arts.SlackBuild | 10 +- Deps/avahi-tqt/avahi-tqt.SlackBuild | 8 +- Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild | 8 +- Deps/dbus-tqt/dbus-tqt.SlackBuild | 8 +- Deps/libart-lgpl/libart-lgpl.SlackBuild | 7 +- Deps/libcaldav/libcaldav.SlackBuild | 7 +- Deps/libcarddav/libcarddav.SlackBuild | 7 +- Deps/tqca-tls/tqca-tls.SlackBuild | 26 ++- Deps/tqt3/tqt3.SlackBuild | 171 ++++++--------- Deps/tqtinterface/tqtinterface.SlackBuild | 22 +- Libs/kipi-plugins/kipi-plugins.SlackBuild | 7 +- Libs/libkdcraw/libkdcraw.SlackBuild | 7 +- Libs/libkexiv2/libkexiv2.SlackBuild | 8 +- Libs/libkipi/libkipi.SlackBuild | 8 +- Libs/libksquirrel/libksquirrel.SlackBuild | 7 +- Misc/GraphicsMagick/GraphicsMagick.SlackBuild | 7 +- Misc/graphviz/graphviz.SlackBuild | 7 +- Misc/imlib/imlib.SlackBuild | 4 +- Misc/inkscape/inkscape.SlackBuild | 9 +- Misc/libpng/libpng.SlackBuild | 5 +- Misc/lxml/lxml.SlackBuild | 2 +- Misc/moodbar/moodbar.SlackBuild | 7 +- Misc/mp4v2/mp4v2.SlackBuild | 7 +- Misc/potrace/potrace.SlackBuild | 7 +- Misc/speex/speex.SlackBuild | 7 +- Misc/tidy-html5/tidy-html5.SlackBuild | 3 +- Misc/xmedcon/xmedcon.SlackBuild | 6 +- Misc/yauap/yauap.SlackBuild | 2 +- README.md | 17 +- get-source.sh | 29 ++- 96 files changed, 711 insertions(+), 660 deletions(-) diff --git a/Apps/abakus/abakus.SlackBuild b/Apps/abakus/abakus.SlackBuild index 2b33ad4..4246a10 100755 --- a/Apps/abakus/abakus.SlackBuild +++ b/Apps/abakus/abakus.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=abakus -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -57,13 +57,15 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ \ + -Wno-dev \ .. make_fn diff --git a/Apps/amarok/amarok.SlackBuild b/Apps/amarok/amarok.SlackBuild index ab9b1b1..d18b653 100755 --- a/Apps/amarok/amarok.SlackBuild +++ b/Apps/amarok/amarok.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=amarok PKGNAM=$TDEPFX$PRGNAM -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -75,42 +75,52 @@ chown_fn cd_builddir_fn -# If libmp4v2 is installed, use mp4 metadata sources in build, otherwise use m4a .. -[[ $(grep -E "mp4\.h|mp4v2\.h" /var/log/packages/*) ]] && LMP4V2="ON" || sed -i 's|tagmp4-static|tagm4a-static|' ../amarok/src/metadata/CMakeLists.txt +# If mp4v2 is installed, use mp4 metadata sources in build, otherwise use m4a .. +[[ -s /usr/include/mp4v2/mp4v2.h ]] && MP4V2="ON" || sed -i 's|tagmp4-static|tagm4a-static|' ../amarok/src/metadata/CMakeLists.txt -# See if xine-lib package from Slackware is installed. (Need this to play music so hopefully it is.) +## Build xine-engine? [[ -s /usr/include/xine.h ]] && XINE="ON" -# If yauap is installed this can be used as an engine for music playback as well. +## Build yauap-engine_plugin? # Yauap does NOT handle the mp3 format. [[ -s $(which yauap) ]] && YAUAP="ON" -## Error: .../arm-slackware-linux-gnueabi/bin/ld: cannot find -ldbus-tqt-1 -## Ref: /usr/share/cmake-3.10/Help/envvar/LDFLAGS.rst - add LDFLAGS= -# -LDFLAGS=$SLKLDFLAGS \ +## Build aKode-engine? +[[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && AKODE="ON" + cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DWITH_MP4V2=${LMP4V2:-"OFF"} \ - -DWITH_XINE=${XINE:-"OFF"} \ - -DWITH_YAUAP=${YAUAP:-"OFF"} \ - -DWITH_LIBVISUAL="ON" \ - -DWITH_KONQSIDEBAR="ON" \ - -DWITH_AKODE="OFF" \ - -DWITH_IPOD="OFF" \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DWITH_AKODE=${AKODE:-"OFF"} \ + -DWITH_AMAZON="ON" \ + -DWITH_DAAP="OFF" \ + -DWITH_EMBEDDED_SQLITE="OFF" \ + -DWITH_GCC_VISIBILITY="OFF" \ -DWITH_IFP="OFF" \ - -DWITH_NJB="OFF" \ + -DWITH_INOTIFY="OFF" \ + -DWITH_IPOD="OFF" \ + -DWITH_KONQSIDEBAR="ON" \ + -DWITH_LIBVISUAL="ON" \ + -DWITH_MP4V2=${MP4V2:-"OFF"} \ -DWITH_MTP="ON" \ + -DWITH_MYSQL="OFF" \ + -DWITH_NJB="OFF" \ + -DWITH_OPENGL="ON" \ + -DWITH_POSTGRESQL="OFF" \ -DWITH_RIOKARMA="OFF" \ - -DWITH_DAAP="OFF" \ - -DWITH_INOTIFY="OFF" \ + -DWITH_SYSTEM_SQLITE="ON" \ + -DWITH_XINE=${XINE:-"OFF"} \ + -DWITH_YAUAP=${YAUAP:-"OFF"} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -Wno-dev \ .. make_fn diff --git a/Apps/digikam/digikam.SlackBuild b/Apps/digikam/digikam.SlackBuild index 967e087..abc3422 100755 --- a/Apps/digikam/digikam.SlackBuild +++ b/Apps/digikam/digikam.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=digikam -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -51,9 +51,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Apps/dolphin/dolphin.SlackBuild b/Apps/dolphin/dolphin.SlackBuild index 038a645..d60729b 100755 --- a/Apps/dolphin/dolphin.SlackBuild +++ b/Apps/dolphin/dolphin.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=dolphin -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -48,16 +48,18 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_GCC_VISIBILITY="OFF" \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -Wno-dev \ .. make_fn diff --git a/Apps/filelight/filelight.SlackBuild b/Apps/filelight/filelight.SlackBuild index a8c8fec..e7bd2f2 100755 --- a/Apps/filelight/filelight.SlackBuild +++ b/Apps/filelight/filelight.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=filelight PKGNAM=$TDEPFX$PRGNAM -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -64,15 +64,18 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -Wno-dev \ .. make_fn diff --git a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild index 3b02631..097fd74 100755 --- a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild +++ b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=gtk-qt-engine -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -49,15 +49,14 @@ cd_builddir_fn ## BONOBO will be included in the build if installed cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -Wno-dev \ .. diff --git a/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild b/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild index 8b19aa3..d3537f5 100755 --- a/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild +++ b/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=gtk3-tqt-engine -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -46,9 +46,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Apps/gwenview-i18n/gwenview-i18n.SlackBuild b/Apps/gwenview-i18n/gwenview-i18n.SlackBuild index f3ad4c4..fbe066d 100755 --- a/Apps/gwenview-i18n/gwenview-i18n.SlackBuild +++ b/Apps/gwenview-i18n/gwenview-i18n.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=gwenview-i18n PKGNAM=$TDEPFX$PRGNAM [[ $PRE_DOWNLOAD != yes ]] && [[ $I18N == "" ]] && echo -e "\033[39;1m\nYou have tried to build $PRGNAM without selecting any language(s)\n\033[0m" && exit -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -76,13 +76,15 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ + -Wno-dev \ .. make_fn diff --git a/Apps/gwenview/gwenview.SlackBuild b/Apps/gwenview/gwenview.SlackBuild index ab2d8c8..3a1811b 100755 --- a/Apps/gwenview/gwenview.SlackBuild +++ b/Apps/gwenview/gwenview.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=gwenview PKGNAM=$TDEPFX$PRGNAM -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -42,9 +42,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Apps/k3b-i18n/k3b-i18n.SlackBuild b/Apps/k3b-i18n/k3b-i18n.SlackBuild index 30ac851..b7c365b 100755 --- a/Apps/k3b-i18n/k3b-i18n.SlackBuild +++ b/Apps/k3b-i18n/k3b-i18n.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=k3b-i18n PKGNAM=$TDEPFX$PRGNAM [[ $PRE_DOWNLOAD != yes ]] && [[ $I18N == "" ]] && echo -e "\033[39;1m\nYou have tried to build $PRGNAM without selecting any language(s)\n\033[0m" && exit -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -66,9 +66,11 @@ cd_builddir_fn cmake \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DBUILD_DOC="ON" \ -DBUILD_MESSAGES="ON" \ + -Wno-dev \ .. make_fn diff --git a/Apps/k3b/k3b.SlackBuild b/Apps/k3b/k3b.SlackBuild index 476c75f..0bc807b 100755 --- a/Apps/k3b/k3b.SlackBuild +++ b/Apps/k3b/k3b.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=k3b PKGNAM=$TDEPFX$PRGNAM -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -50,12 +50,14 @@ cd_builddir_fn [[ -s /usr/include/musicbrainz/mb_c.h ]] && MUSICBRAINZ="ON" cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_LIBDVDREAD="ON" \ -DWITH_MUSICBRAINZ=${MUSICBRAINZ:-"OFF"} \ -DWITH_SYSTEM_LIBSAMPLERATE="ON" \ @@ -74,6 +76,7 @@ cmake \ -DWITH_LAME=${LAME:-"OFF"} \ -DBUILD_K3BSETUP="ON" \ -DBUILD_DOC="ON" \ + -Wno-dev \ .. make_fn diff --git a/Apps/k9copy/k9copy.SlackBuild b/Apps/k9copy/k9copy.SlackBuild index f47a8d4..f7b69ee 100755 --- a/Apps/k9copy/k9copy.SlackBuild +++ b/Apps/k9copy/k9copy.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=k9copy -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -47,9 +47,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Apps/kaffeine/kaffeine.SlackBuild b/Apps/kaffeine/kaffeine.SlackBuild index dc7622b..a18fff4 100755 --- a/Apps/kaffeine/kaffeine.SlackBuild +++ b/Apps/kaffeine/kaffeine.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=kaffeine -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -49,13 +49,15 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DWITH_GCC_VISIBILITY="OFF" \ @@ -69,6 +71,7 @@ cmake \ -DWITH_DVB="ON" \ -DUSE_TQT_ONLY="OFF" \ -DWITH_XINIT_WORKAROUND="OFF" \ + -Wno-dev \ .. : # don't go to autotools build if this fails - set exit 0 always @@ -89,9 +92,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Apps/kbfx/kbfx.SlackBuild b/Apps/kbfx/kbfx.SlackBuild index 3519e1d..40eb1a3 100755 --- a/Apps/kbfx/kbfx.SlackBuild +++ b/Apps/kbfx/kbfx.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=kbfx -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,6 +40,8 @@ langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake langs=$(echo $langs | sed "s|.po||g") [[ $langs != "" ]] && TRANS=ON +## only install html docs +echo 'add_subdirectory( en )' > doc/CMakeLists.txt cd doc;listdocs_fn;cd ../ @@ -48,16 +50,19 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DUSE_STRIGI="OFF" \ -DUSE_MENUDRAKE="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Apps/kbookreader/kbookreader.SlackBuild b/Apps/kbookreader/kbookreader.SlackBuild index a50dd68..3819de5 100755 --- a/Apps/kbookreader/kbookreader.SlackBuild +++ b/Apps/kbookreader/kbookreader.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=kbookreader -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -48,8 +48,8 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ @@ -58,6 +58,7 @@ cmake \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DWITH_GCC_VISIBILITY="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Apps/kdbg/kdbg.SlackBuild b/Apps/kdbg/kdbg.SlackBuild index 0ab89ba..4c9f9e6 100755 --- a/Apps/kdbg/kdbg.SlackBuild +++ b/Apps/kdbg/kdbg.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=kdbg -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -50,9 +50,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Apps/kdbusnotification/kdbusnotification.SlackBuild b/Apps/kdbusnotification/kdbusnotification.SlackBuild index 7862b0e..f4dcc85 100755 --- a/Apps/kdbusnotification/kdbusnotification.SlackBuild +++ b/Apps/kdbusnotification/kdbusnotification.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=kdbusnotification -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,12 +40,14 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DWITH_GCC_VISIBILITY="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Apps/kile/kile.SlackBuild b/Apps/kile/kile.SlackBuild index e760334..89d8936 100755 --- a/Apps/kile/kile.SlackBuild +++ b/Apps/kile/kile.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=kile -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -49,9 +49,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Apps/kkbswitch/kkbswitch.SlackBuild b/Apps/kkbswitch/kkbswitch.SlackBuild index cc54461..982102a 100755 --- a/Apps/kkbswitch/kkbswitch.SlackBuild +++ b/Apps/kkbswitch/kkbswitch.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=kkbswitch -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -55,8 +55,8 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ @@ -66,7 +66,7 @@ cmake \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DWITH_RU_UA_LAYOUT=${RU_UA:-"OFF"} \ - -DCMAKE_SKIP_RPATH="ON" \ + -Wno-dev \ .. make_fn diff --git a/Apps/knemo/knemo.SlackBuild b/Apps/knemo/knemo.SlackBuild index 0907381..d641839 100755 --- a/Apps/knemo/knemo.SlackBuild +++ b/Apps/knemo/knemo.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=knemo -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -59,15 +59,16 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ - -DCMAKE_SKIP_RPATH="ON" \ + -Wno-dev \ .. make_fn diff --git a/Apps/knetstats/knetstats.SlackBuild b/Apps/knetstats/knetstats.SlackBuild index 8b07747..bf7fcf2 100755 --- a/Apps/knetstats/knetstats.SlackBuild +++ b/Apps/knetstats/knetstats.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=knetstats -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -47,8 +47,8 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ @@ -56,7 +56,7 @@ cmake \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ - -DCMAKE_SKIP_RPATH="ON" \ + -Wno-dev \ .. make_fn diff --git a/Apps/knights/knights.SlackBuild b/Apps/knights/knights.SlackBuild index 326de10..405f2a8 100755 --- a/Apps/knights/knights.SlackBuild +++ b/Apps/knights/knights.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=knights -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -53,14 +53,16 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -Wno-dev \ .. make_fn diff --git a/Apps/knmap/knmap.SlackBuild b/Apps/knmap/knmap.SlackBuild index c07e449..1c4068f 100755 --- a/Apps/knmap/knmap.SlackBuild +++ b/Apps/knmap/knmap.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=knmap -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,15 +40,15 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DCMAKE_SKIP_RPATH=ON \ + -Wno-dev \ .. make_fn diff --git a/Apps/koffice-i18n/koffice-i18n.SlackBuild b/Apps/koffice-i18n/koffice-i18n.SlackBuild index 0a03008..e8ded14 100755 --- a/Apps/koffice-i18n/koffice-i18n.SlackBuild +++ b/Apps/koffice-i18n/koffice-i18n.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=koffice-i18n [[ $PRE_DOWNLOAD != yes ]] && [[ $I18N == "" ]] && echo -e "\033[39;1m\nYou have tried to build $PRGNAM without selecting any language(s)\n\033[0m" && exit -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -48,13 +48,13 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ - --prefix=$INSTALL_TDE + --prefix=$INSTALL_TDE \ + --disable-rpath make_fn diff --git a/Apps/koffice/koffice.SlackBuild b/Apps/koffice/koffice.SlackBuild index d3bb4b0..2355a3f 100755 --- a/Apps/koffice/koffice.SlackBuild +++ b/Apps/koffice/koffice.SlackBuild @@ -24,17 +24,16 @@ # SUCH DAMAGE. PRGNAM=koffice -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} ## ignore this if pre-downloading sources [[ $PRE_DOWNLOAD != yes ]] && { ## build with libpng-1.4 - set in BUILD-TDE.sh - loading pngs in chalk/krita crashes with libpng16 -LIBPNG_VERSION=$(grep VERSION:- ../../Misc/libpng/libpng.SlackBuild | grep -o [.0-9]*) -[[ ${USE_PNG14:-} == yes ]] && \ +[[ $(cat $TMPVARS/Krita_OPTS) == *libpng14* ]] && \ [[ $(ls -l /usr/include/png.h) != *libpng14* ]] && \ -{ installpkg $LIBPNG_TMP/libpng-$LIBPNG_VERSION-$ARCH-1.txz || \ +{ installpkg $LIBPNG_TMP/libpng-1.4.22-$ARCH-*.txz || \ { echo -e "\033[39;1m\n (re)install libpng-1.4 \n\033[0m" && \ exit } @@ -46,22 +45,22 @@ getsource_fn untar_fn -## fix chalk crashing - set liblcms as a direct dependency - see issue 37 for details +## fix chalk crashing - +## - set liblcms as a direct dependency - see issue 37 for details sed -i '23iKDE_CXXFLAGS = $(LCMS_LIBS)' chalk/Makefile.am +## - when launched from Applications menu +sed -i "s|Exec=.*$|Exec=$INSTALL_TDE/bin/chalk %U|" chalk/chalk.desktop ## building with installation directory /usr - see issue #43 for details [[ $INSTALL_TDE == /usr ]] && \ -{ mv $TQTDIR/lib/libtqt-mt.la $TQTDIR/lib/libtqt-mt.la-bak 2>/dev/null || true +{ mv $TQTDIR/lib$LIBDIRSUFFIX/libtqt-mt.la $TQTDIR/lib$LIBDIRSUFFIX/libtqt-mt.la-bak 2>/dev/null || true } -## fix chalk crashing when launched from Applications menu -sed -i "s|Exec=.*$|Exec=$INSTALL_TDE/bin/chalk %U|" chalk/chalk.desktop - ## fix build problem for karbon - see issue 40 for details sed -i 's|(Magick-config|(Wand-config|' configure.in.in ## revert name 'chalk' to 'krita' - option set in BUILD-TDE.sh -[[ ${REVERT:-} == yes ]] && APP=krita && \ +[[ $(cat $TMPVARS/Krita_OPTS) == *krita* ]] && APP=krita && \ (echo -e "\n Reverting chalk to krita .. \n" ## Rename directories and files: mv chalk krita @@ -81,6 +80,9 @@ find . -type f -exec sed -i -e 's/CHALK/KRITA/g' {} \; find . -type f -exec sed -i -e 's/Chalk/Krita/g' {} \; sed -i 's|Swedish for krita|Swedish for chalk|' krita/README) +## Don't need translation files unless additional language == Polish +[[ I18N != *pl* ]] && sed -i '/pl/d' kexi/tools/{add,delete}_column/Makefile.am + listdocs_fn ltoolupdate_fn @@ -89,9 +91,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ @@ -133,9 +134,9 @@ $PRGNAM: makepkg_fn ## restore libpng16 links -[[ ${USE_PNG14:-} == yes ]] && libpng16_fn || true +[[ $(cat $TMPVARS/Krita_OPTS) == *libpng14* ]] && libpng16_fn || true ## restore libtqt-mt.la [[ $INSTALL_TDE == /usr ]] && \ -{ mv $TQTDIR/lib/libtqt-mt.la-bak $TQTDIR/lib/libtqt-mt.la 2>/dev/null || true +{ mv $TQTDIR/lib$LIBDIRSUFFIX/libtqt-mt.la-bak $TQTDIR/lib$LIBDIRSUFFIX/libtqt-mt.la 2>/dev/null || true } diff --git a/Apps/krusader/krusader.SlackBuild b/Apps/krusader/krusader.SlackBuild index 06d737a..9d6769b 100755 --- a/Apps/krusader/krusader.SlackBuild +++ b/Apps/krusader/krusader.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=krusader -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -81,16 +81,14 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ --mandir=$INSTALL_TDE/man \ - --disable-debug \ - --build=$ARCH-slackware-linux + --disable-rpath make_fn diff --git a/Apps/kscope/kscope.SlackBuild b/Apps/kscope/kscope.SlackBuild index cddc188..3f80a9e 100755 --- a/Apps/kscope/kscope.SlackBuild +++ b/Apps/kscope/kscope.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=kscope -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -47,13 +47,13 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ - --prefix=$INSTALL_TDE + --prefix=$INSTALL_TDE \ + --disable-rpath make_fn diff --git a/Apps/ksensors/ksensors.SlackBuild b/Apps/ksensors/ksensors.SlackBuild index 01c1f2a..1424a2b 100755 --- a/Apps/ksensors/ksensors.SlackBuild +++ b/Apps/ksensors/ksensors.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=ksensors -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -48,14 +48,16 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -Wno-dev \ .. make_fn diff --git a/Apps/kshutdown/kshutdown.SlackBuild b/Apps/kshutdown/kshutdown.SlackBuild index 986b735..42067da 100755 --- a/Apps/kshutdown/kshutdown.SlackBuild +++ b/Apps/kshutdown/kshutdown.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=kshutdown -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -55,14 +55,18 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -Wno-dev \ .. make_fn diff --git a/Apps/ksquirrel/ksquirrel.SlackBuild b/Apps/ksquirrel/ksquirrel.SlackBuild index 4ddab18..e43abb3 100755 --- a/Apps/ksquirrel/ksquirrel.SlackBuild +++ b/Apps/ksquirrel/ksquirrel.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=ksquirrel -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -56,9 +56,8 @@ chown_fn #cd_builddir_fn - don't use -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ./configure \ diff --git a/Apps/ktorrent/ktorrent.SlackBuild b/Apps/ktorrent/ktorrent.SlackBuild index a7899fd..1a22365 100755 --- a/Apps/ktorrent/ktorrent.SlackBuild +++ b/Apps/ktorrent/ktorrent.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=ktorrent PKGNAM=$TDEPFX$PRGNAM -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -47,9 +47,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Apps/kvkbd/kvkbd.SlackBuild b/Apps/kvkbd/kvkbd.SlackBuild index 8fbac89..6d0bc83 100755 --- a/Apps/kvkbd/kvkbd.SlackBuild +++ b/Apps/kvkbd/kvkbd.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=kvkbd -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -43,14 +43,16 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="OFF" \ -DWITH_GCC_VISIBILITY="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Apps/kvpnc/kvpnc.SlackBuild b/Apps/kvpnc/kvpnc.SlackBuild index a144f21..986eb2c 100755 --- a/Apps/kvpnc/kvpnc.SlackBuild +++ b/Apps/kvpnc/kvpnc.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=kvpnc -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -41,6 +41,10 @@ sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake langs=$(echo $langs | sed "s|.po||g") [[ $langs != "" ]] && TRANS=ON +## set up doc/CMakeLists.txt as per all others +## and make compatible with the following edit +[[ $TDEVERSION == cgit ]] && echo "tde_auto_add_subdirectories( )" > doc/CMakeLists.txt + ## always build 'en' docs ... langdoc="en man tdeioslave" ## ... and find other html docs required and available ... @@ -53,14 +57,16 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -Wno-dev \ .. make_fn diff --git a/Apps/piklab/piklab.SlackBuild b/Apps/piklab/piklab.SlackBuild index 57d27ec..ce94045 100755 --- a/Apps/piklab/piklab.SlackBuild +++ b/Apps/piklab/piklab.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=piklab -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -47,15 +47,14 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ --mandir=$INSTALL_TDE/man \ - --disable-debug + --disable-rpath make_fn diff --git a/Apps/potracegui/potracegui.SlackBuild b/Apps/potracegui/potracegui.SlackBuild index eb9355f..bd4a58f 100755 --- a/Apps/potracegui/potracegui.SlackBuild +++ b/Apps/potracegui/potracegui.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=potracegui -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -57,14 +57,16 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -Wno-dev \ .. make_fn diff --git a/Apps/rosegarden/rosegarden.SlackBuild b/Apps/rosegarden/rosegarden.SlackBuild index 1eb0cfb..364ed4d 100755 --- a/Apps/rosegarden/rosegarden.SlackBuild +++ b/Apps/rosegarden/rosegarden.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=rosegarden -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -71,10 +71,11 @@ cd_builddir_fn [[ $(grep -E "dssi.h" /var/log/packages/*) ]] && DSSI="ON" cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DBUILD_DOC="ON" \ @@ -87,6 +88,7 @@ cmake \ -DWANT_LIRC="OFF" \ -DWANT_PCH="OFF" \ -DWANT_TEST="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Apps/soundkonverter/soundkonverter.SlackBuild b/Apps/soundkonverter/soundkonverter.SlackBuild index 66d4f70..6f52ba9 100755 --- a/Apps/soundkonverter/soundkonverter.SlackBuild +++ b/Apps/soundkonverter/soundkonverter.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=soundkonverter -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -47,9 +47,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild index 235c9c6..bd7c0e6 100755 --- a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild +++ b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tde-style-lipstik -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,17 +40,17 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DCMAKE_SKIP_RPATH=ON \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DBUILD_TRANSLATIONS="ON" \ -DWITH_GCC_VISIBILITY="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild index 5c3759c..78bf9a9 100755 --- a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild +++ b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tde-style-qtcurve -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -48,16 +48,17 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DBUILD_CONFIG_MODULE="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -Wno-dev \ .. make_fn diff --git a/Apps/tdeio-locate/tdeio-locate.SlackBuild b/Apps/tdeio-locate/tdeio-locate.SlackBuild index f6007d7..5027b7d 100755 --- a/Apps/tdeio-locate/tdeio-locate.SlackBuild +++ b/Apps/tdeio-locate/tdeio-locate.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdeio-locate -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -47,16 +47,17 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -Wno-dev \ .. make_fn diff --git a/Apps/tdepowersave/tdepowersave.SlackBuild b/Apps/tdepowersave/tdepowersave.SlackBuild index 373995f..90ebcdc 100755 --- a/Apps/tdepowersave/tdepowersave.SlackBuild +++ b/Apps/tdepowersave/tdepowersave.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdepowersave -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -67,20 +67,19 @@ chown_fn cd_builddir_fn -## /usr/bin/ld: cannot find -ldbus-1-tqt, firstly for a library, then for executable -## Needs all _LINKER_FLAGS_INIT strings, so just set LDFLAGS .. -## Ref: /usr/share/cmake-3.10/Help/envvar/LDFLAGS.rst -LDFLAGS=$SLKLDFLAGS \ cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -Wno-dev \ .. make_fn diff --git a/Apps/tdesudo/tdesudo.SlackBuild b/Apps/tdesudo/tdesudo.SlackBuild index 9fca34e..ad96135 100755 --- a/Apps/tdesudo/tdesudo.SlackBuild +++ b/Apps/tdesudo/tdesudo.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdesudo -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -48,13 +48,15 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -Wno-dev \ .. make_fn diff --git a/Apps/tdmtheme/tdmtheme.SlackBuild b/Apps/tdmtheme/tdmtheme.SlackBuild index 31dfe75..e2005e7 100755 --- a/Apps/tdmtheme/tdmtheme.SlackBuild +++ b/Apps/tdmtheme/tdmtheme.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdmtheme -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -41,14 +41,15 @@ cd_builddir_fn ## all locales and html docs built by default, actually only en_US cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DCMAKE_SKIP_RPATH=ON \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ + -Wno-dev \ .. make_fn diff --git a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild index 3d1dfb1..bf241a2 100755 --- a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild +++ b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=twin-style-crystal -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -41,9 +41,8 @@ ltoolupdate_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Apps/yakuake/yakuake.SlackBuild b/Apps/yakuake/yakuake.SlackBuild index 2c4895a..7be2a08 100755 --- a/Apps/yakuake/yakuake.SlackBuild +++ b/Apps/yakuake/yakuake.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=yakuake -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -47,8 +47,8 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ @@ -58,7 +58,7 @@ cmake \ -DWITH_GCC_VISIBILITY="OFF" \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ - -DCMAKE_SKIP_RPATH="ON" \ + -Wno-dev \ .. make_fn diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index 48450d6..9a1c823 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -11,7 +11,7 @@ rm -f $TMPVARS/admin-cmake-done ## remove any PRE_DOWNLOAD record to allow BUILD-TDE.sh to be run in Re-use mode after a pre-download rm -f $TMPVARS/PRE_DOWNLOAD ## .. and if building 14.1.0, turn off cgit downloads -[[ $(cat $TMPVARS/CGIT) == yes ]] && echo \\Z0\\Zbno > $TMPVARS/CGIT +[[ $(cat $TMPVARS/DL_CGIT) == yes ]] && echo \\Z0\\Zbno > $TMPVARS/DL_CGIT ## don't need this if this script has already been run @@ -121,13 +121,18 @@ Any other option will have to be edited into BUILD-TDE.sh rm -f $TMPVARS/SYS_CNF_DIR dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE System Configuration " --menu \ " -Select the directory that the TDE System Configuration files should be installed in. - -Selecting '/etc/tde' will also set TDEHOME=~/.tde and TDEROOTHOME=/root/.tde, -otherwise the defaults of TDEHOME=~/.trinity and TDEROOTHOME=/root/.trinity will apply. +Select the directory that the TDE System Configuration files +should be installed in. + +Selecting '/etc/tde' will also: +* set TDEHOME=~/.tde and TDEROOTHOME=/root/.tde + \Z0\Zbotherwise defaults to + TDEHOME=~/.trinity and TDEROOTHOME=/root/.trinity\Zn +* install plugins in $(cat $TMPVARS/INSTALL_TDE)/lib$LIBDIRSUFFIX/tde + \Z0\Zbotherwise defaults to $(cat $TMPVARS/INSTALL_TDE)/lib$LIBDIRSUFFIX/trinity\Zn " \ -18 75 2 \ +20 75 2 \ "/etc/tde" "" \ "/etc/trinity" "" \ 2> $TMPVARS/SYS_CNF_DIR @@ -319,48 +324,6 @@ Keep \ZuALL\ZU the temporary files, including for successfully built packages?" [[ $? == 1 ]] && echo no > $TMPVARS/KEEP_BUILD -rm -f $TMPVARS/SELECT -dialog --cr-wrap --no-shadow --colors --defaultno --title " Required dependencies " --yesno \ -" -Pre-select TDE core modules and required dependencies for the build list? - -Select \Zr\Zb\Z4No\Zn here if they have already been built and installed and you are building additional packages. -" \ -11 75 -[[ $? == 0 ]] && echo on > $TMPVARS/SELECT -[[ $? == 1 ]] && echo off > $TMPVARS/SELECT -export SELECT=$(cat $TMPVARS/SELECT) - - -rm -f $TMPVARS/PREPEND -EXITVAL=2 -until [[ $EXITVAL -lt 2 ]] ; do -dialog --cr-wrap --no-shadow --yes-label "Prepend" --help-button --help-label "README" --no-label "Default" --colors --defaultno --title " Libraries Search Path " --yesno \ -" -Select <\Z1P\Zb\Z0repend\Zn> to add the TDE libs paths to the beginning of the search path. - -Try \Zr\Zb\Z4Default\Zn first - in most cases this will work. -" \ -10 75 -EXITVAL=$? -[[ $EXITVAL == 0 ]] && echo yes > $TMPVARS/PREPEND -[[ $EXITVAL == 1 ]] && 2> $TMPVARS/PREPEND -[[ $EXITVAL == 2 ]] && dialog --cr-wrap --no-shadow --colors --ok-label "Return" --msgbox \ -" -The default with the tqt3 build is to append the TDE libs paths to /etc/ld.so.conf. - -This means that TDE libs will be at the end of the search path. If the package configuration sets up the search path without using the shell variables set up in this script, those TDE libs will not be used if a library of the same name exists - a conflict which could arise if another DE is installed. - -If you experience any problems of this nature, then try the \Z1P\Zb\Z0repend\Zn option, which will set up doinst.sh for tqt3 to add the TDE libs paths to the beginning of the search path. - - Then \Zb\Z2rebuild tqt3\Zn. This build option only applies to that package. -OR - Edit /etc/ld.so.conf .. -" \ - 22 75 -done - - rm -f $TMPVARS/TDEbuilds dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Packages Selection " --item-help --checklist \ " @@ -372,16 +335,16 @@ Look out for messages in the bottom line of the screen, especially relating to d Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TDE packages." \ 0 0 0 \ -"Deps/tqt3" "\Zb\Zr\Z4R\Zn The Qt package for TDE" ${SELECT:-off} "\Zb\Z6 \Zn" \ -"Deps/tqtinterface" "\Zb\Zr\Z4R\Zn TDE bindings to tqt3." ${SELECT:-off} "\Zb\Z6 \Zn" \ -"Deps/arts" "\Zb\Zr\Z4R\Zn Sound server for TDE" ${SELECT:-off} "\Zb\Z6 \Zn" \ -"Deps/dbus-tqt" "\Zb\Zr\Z4R\Zn A simple IPC library" ${SELECT:-off} "\Zb\Z6 \Zn" \ -"Deps/dbus-1-tqt" "\Zb\Zr\Z4R\Zn D-Bus bindings" ${SELECT:-off} "\Zb\Z6 \Zn" \ -"Deps/libart-lgpl" "\Zb\Zr\Z4R\Zn The LGPL'd component of libart" ${SELECT:-off} "\Zb\Z6 \Zn" \ -"Deps/tqca-tls" "\Zb\Zr\Z4R\Zn Plugin to provide SSL/TLS capability" ${SELECT:-off} "\Zb\Z6 \Zn" \ +"Deps/tqt3" "\Zb\Zr\Z4R\Zn The Qt package for TDE" off "\Zb\Z6 \Zn" \ +"Deps/tqtinterface" "\Zb\Zr\Z4R\Zn TDE bindings to tqt3." off "\Zb\Z6 \Zn" \ +"Deps/arts" "\Zb\Zr\Z4R\Zn Sound server for TDE" off "\Zb\Z6 \Zn" \ +"Deps/dbus-tqt" "\Zb\Zr\Z4R\Zn A simple IPC library" off "\Zb\Z6 \Zn" \ +"Deps/dbus-1-tqt" "\Zb\Zr\Z4R\Zn D-Bus bindings" off "\Zb\Z6 \Zn" \ +"Deps/libart-lgpl" "\Zb\Zr\Z4R\Zn The LGPL'd component of libart" off "\Zb\Z6 \Zn" \ +"Deps/tqca-tls" "\Zb\Zr\Z4R\Zn Plugin to provide SSL/TLS capability" off "\Zb\Z6 \Zn" \ "Deps/avahi-tqt" "Avahi support" off "\Zb\Z6 Optional for tdelibs and used if installed. Requires Avahi. \Zn" \ -"Core/tdelibs" "\Zb\Zr\Z4R\Zn TDE libraries" ${SELECT:-off} "\Zb\Z6 Will build with Avahi support if avahi/avahi-tqt are installed. \Zn" \ -"Core/tdebase" "\Zb\Zr\Z4R\Zn TDE base" ${SELECT:-off} "\Zb\Z6 \Zn" \ +"Core/tdelibs" "\Zb\Zr\Z4R\Zn TDE libraries" off "\Zb\Z6 Will build with Avahi support if avahi/avahi-tqt are installed. \Zn" \ +"Core/tdebase" "\Zb\Zr\Z4R\Zn TDE base" off "\Zb\Z6 \Zn" \ "Core/tde-i18n" "Additional language support for TDE" off "\Zb\Z6 Required when any \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ "Core/tdeaccessibility" "Accessibility programs" off "\Zb\Z6 \Zn" \ "Core/tdeadmin" "System admin packages" off "\Zb\Z6 \Zn" \ @@ -390,8 +353,8 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Core/tdegames" "Games for TDE - atlantik, kasteroids, katomic, etc." off "\Zb\Z6 \Zn" \ " Misc/imlib" "An image loading and rendering library" off "\Zb\Z6 Build-time option for tdegraphics - needed for kuickshow \Zn" \ "Core/tdegraphics" "Misc graphics apps" off "\Zb\Z6 \Zn" \ -"Deps/akode" "A player and plugins for aRts music formats" off "\Zb\Z6 For tdemultimedia - aRts-plugin and Juk \Zn" \ -"Core/tdemultimedia" "Multimedia packages for TDE" off "\Zb\Z6 \Zn" \ +"Deps/akode" "A player and plugins for aRts music formats" off "\Zb\Z6 For tdemultimedia - aRts-plugin and Juk, and amarok engine \Zn" \ +"Core/tdemultimedia" "Multimedia packages for TDE" off "\Zb\Z6 Optional build-time dependency - akode \Zn" \ " Misc/speex" "Audio compression format designed for speech" off "\Zb\Z6 Buildtime option for tdenetwork and amarok. Requires l/speexdsp \Zn" \ "Core/tdenetwork" "Networking applications for TDE" off "\Zb\Z6 Optional build-time dependency - speex \Zn" \ "Deps/libcaldav" "Calendaring Extensions to WebDAV" off "\Zb\Z6 Optional dependency for korganizer [tdepim] \Zn" \ @@ -414,7 +377,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD " Misc/mp4v2" "Create and modify mp4 files" off "\Zb\Z6 Buildtime option for Amarok \Zn" \ " Misc/moodbar" "GStreamer plugin for Amarok for moodbar feature" off "\Zb\Z6 Runtime option for Amarok \Zn" \ " Misc/yauap" "A simple commandline audio player" off "\Zb\Z6 Provides an optional engine for Amarok \Zn" \ -"Apps/amarok" "A Music Player" off "\Zb\Z6 Optional dependencies - xine-lib, mp4v2, speex, moodbar \Zn" \ +"Apps/amarok" "A Music Player" off "\Zb\Z6 Optional dependencies - xine-lib, mp4v2, speex, moodbar, akode, yauap \Zn" \ "Apps/digikam" "A digital photo management application + Showfoto viewer" off "\Zb\Z6 Requires kipi-plugins libkdcraw libkexiv2 libkipi. \Zn" \ "Apps/dolphin" "Dolphin file manager for TDE" off "\Zb\Z6 A d3lphin.desktop file is included - see dolphin.SlackBuild. \Zn" \ "Apps/filelight" "Graphical diskspace display" off "\Zb\Z6 Runtime requirement x/xdpyinfo \Zn" \ @@ -471,6 +434,7 @@ sed -i 's|$| |;s|" M|M|g;s|"||g' $TMPVARS/TDEbuilds ## only run this if tqt3 has been selected rm -f $TMPVARS/TQT_OPTS +rm -f $TMPVARS/PKG_CONFIG_PATH_MOD [[ $(grep -o tqt3 $TMPVARS/TDEbuilds) ]] && { dialog --cr-wrap --nocancel --no-shadow --colors --title " TQt options " --item-help --checklist \ " @@ -479,15 +443,44 @@ A minimal packaging of tqt3 will install only the run-time library required for But tdepim, ksquirrel, and tdevelop need additional libraries. If you select minimal packaging and intend to build any of those at any time, select keeping their required libs now. TQt html documentation is ~21M, and can be excluded from the package. + +mkspecs is only required for linux-g++ " \ -21 75 4 \ +25 75 5 \ " minimal" "Minimal packaging" off "\Zb\Z6 Exclude libs and binaries not required for TDE \Zn" \ -" pim_ksq" "Keep lib for tdepim and/or ksquirrel" off "\Zb\Z6 Only required if minimal build selected \Zn" \ -" tdevel" "Keep libs for tdevelop" off "\Zb\Z6 Only required if minimal build selected \Zn" \ +" pim_ksq" " ├─ Keep lib for tdepim and/or ksquirrel" off "\Zb\Z6 Only required if minimal build selected \Zn" \ +" tdevel" " └─ Keep libs for tdevelop" off "\Zb\Z6 Only required if minimal build selected \Zn" \ " nodocs" "Exclude html documentation" on "\Zb\Z6 \Zn" \ +" mkspecs" "linux-g++ only" on "\Zb\Z6 Uncheck for the complete set \Zn" \ 2> $TMPVARS/TQT_OPTS + + +PKG_CONFIG_PATH_MOD=$(echo $PKG_CONFIG_PATH| tr : \\n | awk '!seen[$0]++' | tr \\n :|sed 's|:$||') +# +[[ $PKG_CONFIG_PATH != $PKG_CONFIG_PATH_MOD ]] && \ +PKGCF_MESSAGE="PKG_CONFIG_PATH is: +\Zb\Z6$PKG_CONFIG_PATH\Zn + +This can be set to: +\Zb\Z6$PKG_CONFIG_PATH_MOD\Zn +to remove duplicated paths." || { +PKGCF_MESSAGE="PKG_CONFIG_PATH can be set to remove duplicated paths in its string." && DLG_BOX="14 65" } +dialog --aspect 3 --cr-wrap --yes-label "Set" --no-label "Leave" --defaultno --no-shadow --colors --title " Setting PKG_CONFIG_PATH " --yesno \ +" +$PKGCF_MESSAGE + +This will be done with doinst.sh -> pkgconfig.sh and it will therefore apply whenever this build of tqt3 is installed. + +Either way, the TDE and TQT pkgconfig paths will be added if not already included. + +" \ +${DLG_BOX:-0 0} +[[ $? == 0 ]] && echo set > $TMPVARS/PKG_CONFIG_PATH_MOD +[[ $? == 1 ]] && echo leave > $TMPVARS/PKG_CONFIG_PATH_MOD +} + ## only run this if tdebase has been selected rm -f $TMPVARS/RUNLEVEL @@ -606,7 +599,7 @@ $(cat $TMPVARS/READMEs)" \ } -rm -f $TMPVARS/CGIT # place this here to facilitate testing for summary screen +rm -f $TMPVARS/DL_CGIT # place this here to facilitate testing for summary screen [[ $(cat $TMPVARS/TDEVERSION) == cgit ]] && \ [[ $(grep -o [ACDLM][a-z]*/ $TMPVARS/TDEbuilds | sort | head -n1) != Misc/ ]] && { dialog --cr-wrap --no-shadow --colors --defaultno --title " TDE development build " --yesno \ @@ -627,8 +620,8 @@ Create and/or update the git repositories local copies. " \ 19 75 -[[ $? == 0 ]] && echo yes > $TMPVARS/CGIT -[[ $? == 1 ]] && echo no > $TMPVARS/CGIT +[[ $? == 0 ]] && echo yes > $TMPVARS/DL_CGIT +[[ $? == 1 ]] && echo no > $TMPVARS/DL_CGIT } @@ -636,7 +629,7 @@ Create and/or update the git repositories local copies. [[ $(cat $TMPVARS/TDEVERSION) == 14.0.7 ]] && PRE_DOWNLOAD_MESSAGE="Only the source archives not already in 'src' will be downloaded." [[ $(cat $TMPVARS/TDEVERSION) == cgit ]] && PRE_DOWNLOAD_MESSAGE="All cgit sources for the build list packages will be cloned/updated.\nMisc archives will only be downloaded if not already in 'src'." && LINES=18 ## testing for cgit!=no will allow =yes or null, which is the 14.0.7 build case -[[ $(cat $TMPVARS/CGIT) != no ]] && { +[[ $(cat $TMPVARS/DL_CGIT) != no ]] && { dialog --cr-wrap --no-shadow --colors --defaultno --title " Only download sources " --yesno \ " This would be useful for running the build off-line. @@ -659,6 +652,10 @@ ${LINES:-17} 75 } +# Is this a 32 or 64 bit system? +# 'uname -m' won't identify a 32 bit system with a 64 bit kernel +[[ $(getconf LONG_BIT) == 64 ]] && LIBDIRSUFFIX="64" || LIBDIRSUFFIX="" + [[ ! -e $TMPVARS/TDEbuilds ]] && run_dialog # option to change to stop the build when it fails @@ -694,67 +691,70 @@ export I18N=$(cat $TMPVARS/I18N) export TQT_OPTS=$(cat $TMPVARS/TQT_OPTS) export EXIT_FAIL=$(cat $TMPVARS/EXIT_FAIL) export KEEP_BUILD=$(cat $TMPVARS/KEEP_BUILD) -export PREPEND=$(cat $TMPVARS/PREPEND) export RUNLEVEL=$(cat $TMPVARS/RUNLEVEL) export PRE_DOWNLOAD=$(cat $TMPVARS/PRE_DOWNLOAD) export TDEPFX=$(cat $TMPVARS/TDEPFX) -# these exports are for koffice.SB -[[ $(cat $TMPVARS/Krita_OPTS) == *krita* ]] && export REVERT=yes -[[ $(cat $TMPVARS/Krita_OPTS) == *libpng14* ]] && export USE_PNG14=yes - -# Is this a 64 bit system? -# 'uname -m' won't identify a 32 bit system with a 64 bit kernel -[[ ! -d /lib64 ]] && LIBDIRSUFFIX="" || LIBDIRSUFFIX="64" -TQTDIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3 - -CPLUS_INCLUDE_PATH=$TQTDIR/include:${CPLUS_INCLUDE_PATH:-} +## Set installation directory for tqt +TQTDIR=$INSTALL_TDE PKG_CONFIG_PATH=$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig:${PKG_CONFIG_PATH:-} +[[ $TQTDIR != $INSTALL_TDE ]] && PKG_CONFIG_PATH=$TQTDIR/lib$LIBDIRSUFFIX/pkgconfig:$PKG_CONFIG_PATH -PATH=$TQTDIR/bin:$INSTALL_TDE/bin:$PATH - -# needed for CMAKE_C_FLAGS -# and used for CFLAGS instead of 'configure --with-qt-includes=' option which doesn't always work -TQT_INCLUDE_PATH="-I$TQTDIR/include" +PATH=$INSTALL_TDE/bin:$PATH +[[ $TQTDIR != $INSTALL_TDE ]] && PATH=$TQTDIR/bin:$PATH export LIBDIRSUFFIX export TQTDIR -export CPLUS_INCLUDE_PATH export PKG_CONFIG_PATH export PATH -export TQT_INCLUDE_PATH ## to provide an ARCH suffix for the package name - see makepkg_fn in get-source.sh export ARM_FABI=$(readelf -Ah $(which bash)|grep -oE "soft|hard") +## override hard coded trinity plugins directory - used for: +## autotools: get-source.sh|ltoolupdate_fn +## cmake: -DPLUGIN_INSTALL_DIR= +export PLUGIN_INSTALL_DIR=$(cat $TMPVARS/SYS_CNF_DIR | cut -d/ -f3) ### set up variables for the summary list: ## New build [[ $(cat $TMPVARS/build-new) != no ]] && NEW_BUILD=yes || NEW_BUILD='no - re-using existing' +# ## Action on failure [[ $EXIT_FAIL == "exit 1" ]] && AOF=stop +# ## if tdebase selected -[[ $(grep -o tdebase $TMPVARS/TDEbuilds) ]] && TDMRL=\\Zb\\Z6$RUNLEVEL\\Zn && SHADERL=" " +[[ $(grep -o tdebase $TMPVARS/TDEbuilds) ]] && TDMRL=$RUNLEVEL +# ## koffice - only if it is being built -[[ $(sed 's|koffice-||' $TMPVARS/TDEbuilds | grep -o Apps/koffice) ]] && { -[[ $REVERT == yes ]] && RVT=\\Zb\\Z6yes\\Zn || RVT=\\Zb\\Z6no\\Zn -[[ $(cat $TMPVARS/Krita_OPTS) == *useGM* ]] && USE_GM=\\Zb\\Z6yes\\Zn || USE_GM=\\Zb\\Z6no\\Zn -[[ $USE_PNG14 == yes ]] && USE_PNG=\\Zb\\Z6yes\\Zn || USE_PNG=\\Zb\\Z6no\\Zn -SHADEKO=" " -} +[[ $(grep -o "Apps/koffice " $TMPVARS/TDEbuilds) ]] && { +[[ $(cat $TMPVARS/Krita_OPTS) == *krita* ]] && RVT=yes || RVT=no +[[ $(cat $TMPVARS/Krita_OPTS) == *libpng14* ]] && USE_PNG=yes || USE_PNG=no +[[ $(cat $TMPVARS/Krita_OPTS) == *useGM* ]] && USE_GM=yes || USE_GM=no +} && \ +KOFFICE=" +koffice: + revert chalk to krita \Zb\Z6$RVT\Zn + build with libpng14 \Zb\Z6$USE_PNG\Zn + build with GraphicsMagick \Zb\Z6$USE_GM\Zn" +# ## tqt3 options, if tqt3 is being built [[ $(grep -o tqt3 $TMPVARS/TDEbuilds) ]] && { TQT_BLD=yes && [[ $TQT_OPTS != *minimal* ]] && TQT_BLD=no TQT_DOCS=no && [[ $TQT_OPTS != *nodocs* ]] && TQT_DOCS=yes } +# ## whether cloning or updating cgit -CLONE=$(cat $TMPVARS/CGIT) +CLONE=$(cat $TMPVARS/DL_CGIT) +# ## whether installing packages as they are built INST_PACKAGE=yes && [[ $INST == 0 ]] && INST_PACKAGE=no +# ## emphasise downloading only, not building [[ $PRE_DOWNLOAD == yes ]] && DL_BLD_MSG="Download sources" +# ## whether using tde prefix [[ -e $TMPVARS/TDEPFX ]] && tde_prefix=\\Zn\\Zb\\Z2tde\\Zn && [[ ! -s $TMPVARS/TDEPFX ]] && tde_prefix=no - +# ## start dialog EXITVAL=2 until [[ $EXITVAL -lt 2 ]] ; do @@ -765,23 +765,18 @@ Setup is complete - these are the build options: New build list \Zb\Z6$NEW_BUILD\Zn TDE version \Zb\Z6$TDEVERSION\Zn Clone/update cgit local repositories \Zb\Z6${CLONE:-\Z0\Zbn/a}\Zn -Only download sources \Zb\Z6${PRE_DOWNLOAD:-\Z0\Zbno}\Zn +Only download sources \Zb\Z6${PRE_DOWNLOAD:-\Z0\Zbn/a}\Zn TDE installation directory \Zb\Z6$INSTALL_TDE\Zn TDE system configuration directory \Zb\Z6$SYS_CNF_DIR\Zn Compiler \Zb\Z6$COMPILER\Zn gcc cpu optimization \Zb\Z6$SET_march\Zn Number of parallel jobs \Zb\Z6$(echo $NUMJOBS|sed 's|-j||')\Zn -Additional languages \Zb\Z6${I18N:-\Z0\Zbnone}\Zn +Additional languages \Zb\Z6${I18N:-none}\Zn Minimal tqt build \Zb\Z6${TQT_BLD:-\Z0\Zbn/a}\Zn Include tqt html docs \Zb\Z6${TQT_DOCS:-\Z0\Zbn/a}\Zn Action on failure \Zb\Z6${AOF:-continue}\Zn Keep the temporary build files \Zb\Z6$KEEP_BUILD\Zn -Prepend TDE libs paths \Zb\Z6${PREPEND:-no}\Zn${SHADERL:-\Z0\Zb} -Runlevel for TDM ${TDMRL:-n/a}\Zn${SHADEKO:-\Z0\Zb} -koffice: - revert chalk to krita ${RVT:-n/a} - build with libpng14 ${USE_PNG:-n/a} - build with GraphicsMagick ${USE_GM:-n/a}\Zn +Runlevel for TDM \Zb\Z6${TDMRL:-\Z0\Zbn/a}\Zn${KOFFICE:-}\Zn Install packages as they are built \Zb\Z6$INST_PACKAGE\Zn Prefix for packages common to KDE \Zb\Z6${tde_prefix:-\Z0\Zbn/a}\Zn @@ -828,10 +823,10 @@ do cd $BUILD_TDE_ROOT/$dir || ${EXIT_FAIL:-"true"} # Get the version - version=$(cat $package.SlackBuild | grep "VERSION:" | head -n1 | cut -d "-" -f2 | rev | cut -c 2- | rev) + version=$(grep "VERSION=" $package.SlackBuild | head -n1 | cut -d "=" -f2) # Get the build - build=$(cat $package.SlackBuild | grep "BUILD:" | cut -d "-" -f2 | rev | cut -c 2- | rev) + build=${BUILD:-$(grep "BUILD:" $package.SlackBuild | cut -d "-" -f2 | sed 's|}||')} # The real build starts here echo -e "\033[39;1m @@ -863,7 +858,7 @@ echo " Check the ${LOG:-build} log $TMP/$TDE_PFX$package-$(eval echo $version)-${LOG:-"${ARCH_i18n:-$ARCH}-$build-build"}-log " ## if koffice was building with libpng14, restore the libpng16 headers for any following builds -[[ ${USE_PNG14:-} == yes ]] && source $BUILD_TDE_ROOT/get-source.sh && libpng16_fn || true +[[ $(cat $TMPVARS/Krita_OPTS) == *libpng14* ]] && source $BUILD_TDE_ROOT/get-source.sh && libpng16_fn || true ${EXIT_FAIL:-":"} } } @@ -872,7 +867,7 @@ ${EXIT_FAIL:-":"} [[ $PRE_DOWNLOAD == yes ]] || { ## install packages [[ $INST == 1 ]] && [[ $package != tde-i18n ]] && [[ $package != libpng ]] && upgradepkg --install-new --reinstall $TMP/$TDE_PFX$package-$(eval echo $version)-*-$build*.txz && \ -checkmakepkg +checkmakepkg || ${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 here - test for last language in the I18N list to ensure they've all been built [[ $package == tde-i18n ]] && package=$package-$(cat $TMPVARS/LASTLANG) && \ checkmakepkg diff --git a/Core/tde-i18n/tde-i18n-en_GB-patch b/Core/tde-i18n/tde-i18n-en_GB-patch index 7a8b3d9..25dd2ce 100644 --- a/Core/tde-i18n/tde-i18n-en_GB-patch +++ b/Core/tde-i18n/tde-i18n-en_GB-patch @@ -1,4 +1,4 @@ --- tde-i18n-en_GB/messages/tdebase/libkickermenu_prefmenu.po +++ tde-i18n-en_GB/messages/tdebase/libkickermenu_prefmenu.po -@@ -23 +22,0 @@ +@@ -35 +34,0 @@ -#, fuzzy diff --git a/Core/tde-i18n/tde-i18n.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild index 8d325d3..112c2b1 100755 --- a/Core/tde-i18n/tde-i18n.SlackBuild +++ b/Core/tde-i18n/tde-i18n.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=tde-i18n [[ $PRE_DOWNLOAD != yes ]] && [[ $I18N == "" ]] && echo -e "\033[39;1m\nYou have tried to build $PRGNAM without selecting any language(s)\n\033[0m" && exit -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} source ../../get-source.sh @@ -63,7 +63,7 @@ true # don't go to cgit if extracting fails } || { mkdir -p $PRGNAM # need -p for git builds if more than one lang cd $PRGNAM -echo -e " copying $PRGNAM-$lang source files to build area ... \n" +echo -e "\n copying $PRGNAM-$lang source files to build area ... \n" (cd $BUILD_TDE_ROOT/src/cgit cp -a tdei18n/cgit/tde-i18n/plain/tde-i18n-$lang $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ cp -a --parents {admin,cmake}/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/tde-i18n-$lang/) @@ -78,8 +78,8 @@ mkdir -p $PRGNAM-$lang/build cd $PRGNAM-$lang/build cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ @@ -88,16 +88,14 @@ cmake \ -DBUILD_DOC="ON" \ -DBUILD_DATA="ON" \ -DBUILD_MESSAGES="ON" \ + -Wno-dev \ .. +## install to $PKG/$PRGNAM-$lang so that the build files can be retained +PKG1=$PKG +PKG=$PKG/$PRGNAM-$lang make_fn -#mkdir -p $PKG/$INSTALL_TDE/doc/$PRGNAM-$VERSION -#cp -a $DOCS $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION || true -#cat $SRCDIR/$(basename $0) > $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION/$PRGNAM-$lang.SlackBuild -#chown -R root:root $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION -#find $PKG$INSTALL_TDE/doc -type f -exec chmod 644 {} \; - mkdir_install_fn # extract the name of the language from the source text - a bit messy but there is no standard format @@ -126,7 +124,6 @@ $PRGNAM-$lang: $PRGNAM-$lang: $PRGNAM-$lang: $PRGNAM-$lang: -$PRGNAM-$lang: " > $PKG/install/slack-desc ARCH="noarch" @@ -139,9 +136,15 @@ cat $PKG/install/slack-desc | grep "^$PRGNAM" | grep -v handy > $OUTPUT/$PRGNAM- # Restore the original umask: umask ${_UMASK_} -rm -rf $PKG/* +## Reset the packaging directory base +PKG=$PKG1 + cd $TMP_BUILD/tmp-$PRGNAM -rm -rf $PRGNAM/$PRGNAM-$lang +# remove any previous builds if option chosen +[[ $KEEP_BUILD != "yes" ]] && echo -e " removing tde-i18n-$lang build data ..\n" && { +rm -rf $PKG/* +rm -rf $PRGNAM*/$PRGNAM-$lang +} # Install i18n package(s) here because if more than one language pack is built, # upgradepkg [in BUILD-TDE.sh] can't process them in one command and the build will exit @@ -150,3 +153,5 @@ rm -rf $PRGNAM/$PRGNAM-$lang done echo $lang > $TMPVARS/LASTLANG + +[[ $KEEP_BUILD != "yes" ]] && rm -rf $TMP_BUILD/{package,tmp}-$PRGNAM diff --git a/Core/tdeaccessibility/tdeaccessibility.SlackBuild b/Core/tdeaccessibility/tdeaccessibility.SlackBuild index 1b5d56e..8ea059b 100755 --- a/Core/tdeaccessibility/tdeaccessibility.SlackBuild +++ b/Core/tdeaccessibility/tdeaccessibility.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdeaccessibility -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -41,9 +41,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Core/tdeaddons/tdeaddons.SlackBuild b/Core/tdeaddons/tdeaddons.SlackBuild index 43bb7e9..4dfa329 100755 --- a/Core/tdeaddons/tdeaddons.SlackBuild +++ b/Core/tdeaddons/tdeaddons.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdeaddons -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -61,16 +61,15 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_ARTS="ON" \ -DWITH_SDL="ON" \ -DWITH_BERKELEY_DB="ON" \ diff --git a/Core/tdeadmin/tdeadmin.SlackBuild b/Core/tdeadmin/tdeadmin.SlackBuild index 0c3bf64..1762391 100755 --- a/Core/tdeadmin/tdeadmin.SlackBuild +++ b/Core/tdeadmin/tdeadmin.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdeadmin -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,15 +40,14 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_GCC_VISIBILITY="OFF" \ -DBUILD_DOC="ON" \ -DBUILD_KCRON="ON" \ diff --git a/Core/tdeartwork/tdeartwork.SlackBuild b/Core/tdeartwork/tdeartwork.SlackBuild index fe449a0..cea74bb 100755 --- a/Core/tdeartwork/tdeartwork.SlackBuild +++ b/Core/tdeartwork/tdeartwork.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdeartwork -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,15 +40,14 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_ARTS="ON" \ -DWITH_XSCREENSAVER="OFF" \ -DWITH_LIBART="ON" \ diff --git a/Core/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild index 1d506f2..7486a00 100755 --- a/Core/tdebase/tdebase.SlackBuild +++ b/Core/tdebase/tdebase.SlackBuild @@ -26,7 +26,7 @@ # Thanks to Slackware 12.2 SlackBuild for kdebase PRGNAM=tdebase -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -35,9 +35,6 @@ getsource_fn untar_fn -## allow for configuration files directory != /etc/trinity -sed -i "s|/etc/trinity/|$SYS_CNF_DIR/|" tdm/kfrontend/gentdmconf.c || true - ## make default tdm screen text clearer against dark background and align login button with clickable area ## edit color="#ffff74" and/or color="#ff0000" for your own choice echo $' @@ -104,6 +101,13 @@ do patch -N -p0 done || true +## allow for configuration files directory == /etc/tde +## and plugins in $INSTALL_TDE/lib$LIBDIRSUFFIX/tde +sed -i "s|trinity|$PLUGIN_INSTALL_DIR|g" tdm/config.def || true +sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" tdm/kfrontend/gentdmconf.c || true +sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" kcontrol/hwmanager/devicepropsdlg.cpp || true +sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" tdeioslave/trash/testtrash.cpp || true + listdocs_fn chown_fn @@ -111,16 +115,15 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_ARTS="ON" \ -DWITH_ELFICON="OFF" \ -DWITH_GCC_VISIBILITY="OFF" \ @@ -472,16 +475,15 @@ config .'"$SYS_CNF_DIR"'/tdm/tdmrc.new config .'"$SYS_CNF_DIR"'/tdm/backgroundrc.new # update PATH -# upgradepkg runs installpkg twice, so even though '"$TQTDIR"'/bin will be +# upgradepkg runs installpkg twice, so even though '"$TQTDIR"'/bin might be # a new PATH, it needs to be tested for the second run -if ! grep '"$INSTALL_TDE"'/bin /etc/profile -then -echo "PATH=\$PATH:'"$INSTALL_TDE"'/bin:'"$TQTDIR"'/bin" >> /etc/profile -else if ! grep '"$TQTDIR"'/bin /etc/profile then -echo "PATH=\$PATH:'"$TQTDIR"'/bin" >> /etc/profile +echo "PATH='"$TQTDIR"'/bin:\$PATH" >> /etc/profile fi +if ! grep '"$INSTALL_TDE"'/bin /etc/profile +then +echo "PATH='"$INSTALL_TDE"'/bin:\$PATH" >> /etc/profile fi # update MANPATH diff --git a/Core/tdeedu/tdeedu.SlackBuild b/Core/tdeedu/tdeedu.SlackBuild index b35b383..b923145 100755 --- a/Core/tdeedu/tdeedu.SlackBuild +++ b/Core/tdeedu/tdeedu.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdeedu -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -58,6 +58,9 @@ USE_CMAKE_EDU=${USE_CMAKE_EDU:-no} ## patch for the libboost_python soname as used in Slackware sed -i 's|for bplib in|& "-lboost_python${PYVERSHORT%.*}${PYVERSHORT#*.}"|' kig/configure.in.in +## and for kig python scripting support with cgit build +[[ $TDEVERSION == cgit ]] && \ +sed -i 's|$qt_libraries|$tqt_libraries|' kig/configure.in.in ## include all keyboards for ktouch (cd ktouch/keyboards/ @@ -70,16 +73,21 @@ cat klatin/klatin/data/vocab/pl/Makefile.am | sed 's|pl|sk|g' > klatin/klatin/da ## install kig examples sed -i 's|noinst_DATA|examplesdir = $(kde_datadir)/kig/examples\nexamples_DATA|' kig/examples/Makefile.am +## /usr/bin/ld: cannot find -ltqt-mt/-ltqt - for kstars/indi build +[[ $TDEVERSION == cgit ]] && \ +sed -i 's|(QT_LDFLAGS|(TQT_LDFLAGS|' kstars/kstars/indi/Makefile.am + ltoolupdate_fn chown_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +cd_builddir_fn + +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ -./configure \ +../configure \ --prefix=$INSTALL_TDE \ --disable-rpath \ --enable-closure @@ -96,14 +104,15 @@ cd_builddir_fn OCAML=OFF cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_GCC_VISIBILITY="OFF" \ -DWITH_ARTS="ON" \ -DWITH_OCAML_SOLVER=$OCAML \ @@ -129,6 +138,7 @@ cmake \ -DBUILD_KVOCTRAIN="ON" \ -DBUILD_KWORDQUIZ="ON" \ -DBUILD_DOC="ON" \ + -Wno-dev \ .. } diff --git a/Core/tdegames/tdegames.SlackBuild b/Core/tdegames/tdegames.SlackBuild index 70ef4c3..ce6a40f 100755 --- a/Core/tdegames/tdegames.SlackBuild +++ b/Core/tdegames/tdegames.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdegames -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,12 +40,14 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_ARTS="ON" \ -DBUILD_ATLANTIK="ON" \ -DBUILD_DOC="ON" \ @@ -81,6 +83,7 @@ cmake \ -DBUILD_LIBTDEGAMES="ON" \ -DBUILD_LSKAT="ON" \ -DBUILD_TWIN4="ON" \ + -Wno-dev \ .. # don't package carddecks if they're not needed for chosen games: diff --git a/Core/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild index d1bdf59..945e232 100755 --- a/Core/tdegraphics/tdegraphics.SlackBuild +++ b/Core/tdegraphics/tdegraphics.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdegraphics -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -59,14 +59,14 @@ cd_builddir_fn # If imlib is installed, include Kuickshow: [[ -s /usr/include/Imlib.h ]] && KUICKSHOW=ON cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_T1LIB="OFF" \ -DWITH_PAPER="OFF" \ -DWITH_TIFF="OFF" \ diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild index e1b2112..b0be7c1 100755 --- a/Core/tdelibs/tdelibs.SlackBuild +++ b/Core/tdelibs/tdelibs.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdelibs -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -65,6 +65,26 @@ do patch -N -p0 done || true +## allow for configuration files directory == /etc/tde +## and plugins in $INSTALL_TDE/lib$LIBDIRSUFFIX/tde +for file in \ +tdecore/kstandarddirs.cpp \ +tdecore/kcrash.cpp \ +tdeinit/lnusertemp.c \ +tdeinit/tdeinit.cpp \ +tdeinit/wrapper.c \ +tdelfeditor/tdelfeditor.cpp \ +tdeio/tests/kurifiltertest.cpp \ +tdeio/tests/kmimetypetest.sh.cmake \ +tdeio/tests/jobtest.cpp \ +tdeio/kssl/kopenssl.cc \ +tdeinit/tdestartupconfig.cpp \ +tdecore/tdeconfig_compiler/tests/test9main.cpp +do +sed -i "s|trinity|$PLUGIN_INSTALL_DIR|g" $file || true +done +sed -i "s|\"trinity\"|\"$PLUGIN_INSTALL_DIR\"|" tdecore/tdeapplication.cpp || true + listdocs_fn chown_fn @@ -72,20 +92,21 @@ chown_fn cd_builddir_fn # Check for avahi-tqt -[[ -s $INSTALL_TDE/include/avahi-tqt/qt-watch.h ]] && AVAHI="ON" +[[ -s $INSTALL_TDE/include/avahi-tqt/qt-watch.h ]] && AVAHI="ON" && { +## dnssd/responder.cpp:28:10: fatal error: avahi-tqt/qt-watch.h: No such file or directory +sed -i 's|TQT_INCLUDE_DIRS}|&\n ${AVAHI_TQT_INCLUDE_DIRS}|' ../dnssd/CMakeLists.txt +} cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DCMAKE_SKIP_RPATH="OFF" \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DTDE_MALLOC="OFF" \ -DTDE_MALLOC_DEBUG="OFF" \ -DTDE_MALLOC_FULL="OFF" \ diff --git a/Core/tdemultimedia/tdemultimedia.SlackBuild b/Core/tdemultimedia/tdemultimedia.SlackBuild index 347c968..8a3c696 100755 --- a/Core/tdemultimedia/tdemultimedia.SlackBuild +++ b/Core/tdemultimedia/tdemultimedia.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdemultimedia -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,23 +40,23 @@ USE_CMAKE_MM=${USE_CMAKE_MM:-no} [[ $USE_CMAKE_MM == no ]] && { +## /usr/bin/ld: cannot find -ltqt-mt/-ltqt - for gentable build +[[ $TDEVERSION == cgit ]] && \ +sed -i 's|(QT_LDFLAGS|(TQT_LDFLAGS|' noatun/library/Makefile.am + ltoolupdate_fn chown_fn cd_builddir_fn -# change hard-coded tqt headers directory: -[[ ! -d /usr/include/tqt ]] && sed -i "s|/usr/include/tqt|$INSTALL_TDE/include/tqt|g" ../configure -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ --disable-rpath \ - --disable-debug \ --enable-closure true # don't go to cmake if ./configure fails @@ -73,14 +73,14 @@ AKODE=OFF && [[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && AKODE=ON JUK=OFF && [[ $AKODE == ON ]] && : cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_ALSA="ON" \ -DWITH_ARTS_AKODE="$AKODE" \ -DWITH_ARTS_AUDIOFILE="ON" \ @@ -91,7 +91,7 @@ cmake \ -DWITH_GSTREAMER="ON" \ -DWITH_KSCD_CDDA="ON" \ -DWITH_LAME="ON" \ - -DWITH_MUSICBRAINZ="ON" \ + -DWITH_MUSICBRAINZ="OFF" \ -DWITH_TAGLIB="ON" \ -DWITH_THEORA="ON" \ -DWITH_VORBIS="ON" \ @@ -110,6 +110,7 @@ cmake \ -DBUILD_TDEFILE_PLUGINS="ON" \ -DBUILD_TDEIOSLAVE="ON" \ -DBUILD_TDEMID="ON" \ + -Wno-dev \ .. } diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild index 6d8340d..a920285 100755 --- a/Core/tdenetwork/tdenetwork.SlackBuild +++ b/Core/tdenetwork/tdenetwork.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdenetwork -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -45,12 +45,14 @@ cd_builddir_fn [[ -s /usr/include/speex/speex.h ]] && SPX="ON" cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_ARTS="ON" \ -DWITH_JINGLE="ON" \ -DWITH_SPEEX=${SPX:-"OFF"} \ @@ -108,15 +110,6 @@ cmake \ -Wno-dev \ .. -## CPLUS_INCLUDE_PATH=$TQTDIR/include:${CPLUS_INCLUDE_PATH:-};export CPLUS_INCLUDE_PATH -## set in BUILD-TDE.sh is causing a build error with Slackware current: -## libvncserver/main.h:26:3: error: ‘rfbScreenInfoPtr’ does not name a type; did you mean ‘rfbServerInitMsg’? -## rfbScreenInfoPtr d; -## ^~~~~~~~~~~~~~~~ -## It doesn't have any use here, so unset it -## and $TQT_INCLUDE_PATH has been added to CMAKE_CXX_FLAGS for subsequent ntqglobal.h not found error -export CPLUS_INCLUDE_PATH="" - make_fn installdocs_fn diff --git a/Core/tdepim/tdepim.SlackBuild b/Core/tdepim/tdepim.SlackBuild index 5b4af5c..bf97a40 100755 --- a/Core/tdepim/tdepim.SlackBuild +++ b/Core/tdepim/tdepim.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdepim -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -46,15 +46,14 @@ cd_builddir_fn [[ -s $INSTALL_TDE/include/libcarddav/carddav.h ]] 2>/dev/null && LCARDDAV="ON" cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_ARTS="ON" \ -DWITH_BIRTHDAYS="ON" \ -DWITH_CALDAV=${LCALDAV:-"OFF"} \ diff --git a/Core/tdesdk/tdesdk.SlackBuild b/Core/tdesdk/tdesdk.SlackBuild index 097d835..2e53223 100755 --- a/Core/tdesdk/tdesdk.SlackBuild +++ b/Core/tdesdk/tdesdk.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdesdk -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,16 +40,15 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_DBSEARCHENGINE="ON" \ -DWITH_KCAL="ON" \ -DBUILD_CERVISIA="ON" \ diff --git a/Core/tdetoys/tdetoys.SlackBuild b/Core/tdetoys/tdetoys.SlackBuild index 1049d15..9868976 100755 --- a/Core/tdetoys/tdetoys.SlackBuild +++ b/Core/tdetoys/tdetoys.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdetoys -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,16 +40,15 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DBUILD_AMOR="ON" \ -DBUILD_DOC="ON" \ -DBUILD_EYESAPPLET="ON" \ diff --git a/Core/tdeutils/tdeutils.SlackBuild b/Core/tdeutils/tdeutils.SlackBuild index 1dda784..a6cb322 100755 --- a/Core/tdeutils/tdeutils.SlackBuild +++ b/Core/tdeutils/tdeutils.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdeutils -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -45,15 +45,14 @@ cd_builddir_fn ## TDEFileReplace has been moved from tdewebdev for R14.1.0 [[ $TDEVERSION == cgit ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON" cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_DPMS="ON" \ -DWITH_XSCREENSAVER="OFF" \ -DWITH_SENSORS="ON" \ diff --git a/Core/tdevelop/tdevelop.SlackBuild b/Core/tdevelop/tdevelop.SlackBuild index c31aa5b..6977ff5 100755 --- a/Core/tdevelop/tdevelop.SlackBuild +++ b/Core/tdevelop/tdevelop.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdevelop -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -33,6 +33,10 @@ getsource_fn untar_fn +## error: /usr/bin/ld: cannot find -ltqt-mt +sed -i '18ilink_directories( ${TQT_LIBRARY_DIRS} )' lib/interfaces/external/CMakeLists.txt +sed -i '18ilink_directories( ${TQT_LIBRARY_DIRS} )' src/newui/CMakeLists.txt + listdocs_fn chown_fn @@ -40,15 +44,14 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -L$TQTDIR/lib" \ - -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_BUILDTOOL_ADA="ON" \ -DWITH_BUILDTOOL_ANT="ON" \ -DWITH_BUILDTOOL_AUTOTOOLS="ON" \ diff --git a/Core/tdewebdev/tdewebdev.SlackBuild b/Core/tdewebdev/tdewebdev.SlackBuild index fcb6d5c..c1409ea 100755 --- a/Core/tdewebdev/tdewebdev.SlackBuild +++ b/Core/tdewebdev/tdewebdev.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tdewebdev -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -33,6 +33,9 @@ getsource_fn untar_fn +## /usr/bin/ld: quanta.o: undefined reference to symbol '_ZNK6KParts11PartManager5partsEv' +sed -i 's|-ltdefx|& $(LIB_TDEPARTS)|' quanta/src/Makefile.am + listdocs_fn ltoolupdate_fn @@ -41,9 +44,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ @@ -62,7 +64,7 @@ mkdir_install_fn doinst_sh_fn ## TDEFileReplace has been moved to tdeutils for R14.1.0 -[[ $TDEVERSION == 14.0.7 ]] && TDEFileReplace="* TDEFileReplace: powerful search and replace in multiple files" +[[ $TDEVERSION == 14.0.7 ]] && TDEFileReplace=" * TDEFileReplace: powerful search and replace in multiple files" echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -80,7 +82,7 @@ $PRGNAM: * Kommander: a GUI script builder and executor tool. $PRGNAM: * KXSLDbg: XSL debugger $PRGNAM: * KImageMapEditor: image map editor $PRGNAM: * KLinkStatus: link checker -$PRGNAM: ${TDEFileReplace:-} +$PRGNAM:${TDEFileReplace:-} $PRGNAM: " > $PKG/install/slack-desc diff --git a/Deps/akode/akode.SlackBuild b/Deps/akode/akode.SlackBuild index 7b9db83..2bd6290 100755 --- a/Deps/akode/akode.SlackBuild +++ b/Deps/akode/akode.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=akode -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -47,9 +47,8 @@ cd_builddir_fn ## see README for cmake options cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ @@ -67,6 +66,7 @@ cmake \ -DWITH_MPEG_DECODER="ON" \ -DWITH_SRC_RESAMPLER="OFF" \ -DWITH_XIPH_DECODER="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Deps/arts/arts.SlackBuild b/Deps/arts/arts.SlackBuild index 54699dc..207a5a3 100755 --- a/Deps/arts/arts.SlackBuild +++ b/Deps/arts/arts.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=arts -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,16 +40,13 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DCMAKE_SKIP_RPATH="OFF" \ -DWITH_ALSA="ON" \ -DWITH_AUDIOFILE="ON" \ -DWITH_ESOUND="OFF" \ @@ -58,6 +55,7 @@ cmake \ -DWITH_MAD="ON" \ -DWITH_SNDIO="OFF" \ -DWITH_VORBIS="ON" \ + -Wno-dev \ .. make_fn diff --git a/Deps/avahi-tqt/avahi-tqt.SlackBuild b/Deps/avahi-tqt/avahi-tqt.SlackBuild index 3c02320..8caae43 100755 --- a/Deps/avahi-tqt/avahi-tqt.SlackBuild +++ b/Deps/avahi-tqt/avahi-tqt.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=avahi-tqt -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,15 +40,15 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_GCC_VISIBILITY="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild index 1d34e3b..494259a 100755 --- a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild +++ b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=dbus-1-tqt -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,15 +40,15 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_GCC_VISIBILITY="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Deps/dbus-tqt/dbus-tqt.SlackBuild b/Deps/dbus-tqt/dbus-tqt.SlackBuild index 415544b..4883c98 100755 --- a/Deps/dbus-tqt/dbus-tqt.SlackBuild +++ b/Deps/dbus-tqt/dbus-tqt.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=dbus-tqt -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,14 +40,14 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -Wno-dev \ .. make_fn diff --git a/Deps/libart-lgpl/libart-lgpl.SlackBuild b/Deps/libart-lgpl/libart-lgpl.SlackBuild index 2f91494..c53d19a 100755 --- a/Deps/libart-lgpl/libart-lgpl.SlackBuild +++ b/Deps/libart-lgpl/libart-lgpl.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=libart-lgpl -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,8 +40,8 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ @@ -50,6 +50,7 @@ cmake \ -DMAN_INSTALL_DIR=/usr/man \ -DWITH_GCC_VISIBILITY="OFF" \ -DBUILD_DOC="ON" \ + -Wno-dev \ .. make_fn diff --git a/Deps/libcaldav/libcaldav.SlackBuild b/Deps/libcaldav/libcaldav.SlackBuild index d6a2877..34feb6b 100755 --- a/Deps/libcaldav/libcaldav.SlackBuild +++ b/Deps/libcaldav/libcaldav.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=libcaldav -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,8 +40,8 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ @@ -51,6 +51,7 @@ cmake \ -DBUILD_CALDAV_TEST="OFF" \ -DBUILD_UNITTEST="OFF" \ -DWITH_GCC_VISIBILITY="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Deps/libcarddav/libcarddav.SlackBuild b/Deps/libcarddav/libcarddav.SlackBuild index 901d9e1..750bcad 100755 --- a/Deps/libcarddav/libcarddav.SlackBuild +++ b/Deps/libcarddav/libcarddav.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=libcarddav -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,8 +40,8 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ @@ -49,6 +49,7 @@ cmake \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DBUILD_DOC="OFF" \ -DWITH_GCC_VISIBILITY="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Deps/tqca-tls/tqca-tls.SlackBuild b/Deps/tqca-tls/tqca-tls.SlackBuild index 60bcc40..0d4057a 100755 --- a/Deps/tqca-tls/tqca-tls.SlackBuild +++ b/Deps/tqca-tls/tqca-tls.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tqca-tls -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -39,21 +39,25 @@ chown_fn #cd_builddir_fn - don't use -[[ ! -d /usr/include/tqt ]] && sed -i "s|/usr/include/tqt|$INSTALL_TDE/include/tqt|g" configure || true -LDFLAGS=$SLKLDFLAGS \ -CXXFLAGS=$SLKCFLAGS \ -CFLAGS=$SLKCFLAGS \ -./configure \ ---tqtdir=$TQTDIR-$VERSION +## add TQt headers directory to configure search list +sed -i "s|/usr/include/tqt|$TQTDIR/include/tqt|" configure -## configure uses the installed tqt for it's flags - if this is a re-build of this package only, +## QTDIR is needed for 14.0.7 because configure can't find tqmake +## from its algorithm - ignored for cgit which needs TQTDIR +## which has been set as a shell variable in BUILD-TDE.sh +QTDIR=$TQTDIR \ +CXXFLAGS="$SLKRCFLAGS" \ +./configure + +## configure uses the installed tqt mkspecs for its flags - if this is a re-build of this package only, ## it may pick up the wrong march/mtune flags, or none at all - use SET_march as set up in BUILD-TDE.sh sed -i "s|-march=.*-mtune=[a-z,0-9,-]*||;s|fvisibility-inlines-hidden|& $SET_march|" Makefile -make $NUMJOBS || exit 1 +## set RPATH to ensure tqt libs are prioritized +sed -i "s|LFLAGS .*$|& -Wl,-rpath,'$INST_RPATH'|" Makefile -mkdir -p $PKG$TQTDIR-$VERSION/plugins/crypto/ -install -m 0755 libtqca-tls.so $PKG$TQTDIR-$VERSION/plugins/crypto/ +make ${NUMJOBS:-} || exit 1 +make INSTALL_ROOT=$PKG install || exit 1 installdocs_fn diff --git a/Deps/tqt3/tqt3.SlackBuild b/Deps/tqt3/tqt3.SlackBuild index 12309cb..5b417ea 100755 --- a/Deps/tqt3/tqt3.SlackBuild +++ b/Deps/tqt3/tqt3.SlackBuild @@ -24,10 +24,10 @@ # SUCH DAMAGE. # Much help from the 12.2 SlackBuild script of qt3. And from SBo qt3 script -# Man pages are not installed, so they won't overwrite Qt4's +# Man pages are not installed by 'make install' and have not been manually installed PRGNAM=tqt3 -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -39,9 +39,13 @@ untar_fn ## add -march and -mtune options to CFLAGS where they've been set in BUILD-TDE.sh sed -i "s|^QMAKE_CFLAGS[^_].*$|& $SET_march|" mkspecs/linux-g++/qmake.conf -## $ORIGIN/../lib is to be added to RPATH, so don't need absolute libs directory built in: +## RPATH is set to $ORIGIN/../lib to locate libs during the build +## and added during configure to apply only to tqt3 build sed -i "s|QMAKE_RPATH.*$|QMAKE_RPATH =|" mkspecs/linux-g++/qmake.conf +## tqt libs might be installed in $([T]QTDIR)/lib64 +sed -i "s|QTDIR)/lib|&$LIBDIRSUFFIX|" mkspecs/linux-g++/qmake.conf + ## allow building with clang [[ ! $(grep COMPILER mkspecs/linux-g++/qmake.conf) ]] && { echo $'--- mkspecs/linux-g++/qmake.conf @@ -70,22 +74,38 @@ done sed -i '/translations/d' src/qt_install.pri sed -i '/phrasebooks/d' tools/linguist/linguist/linguist.pro sed -i '/templates/d' tools/designer/designer/designer.pro +} + ## only need linux-g++ +[[ $TQT_OPTS == *mkspecs* ]] && { mv mkspecs/linux-g++ ../ rm -rf mkspecs/* mv ../linux-g++ mkspecs/ } +## install desktop files to applications/tde as for the other TDE desktop files +sed -i 's|desktop.path = $$share.path/applications|&/tde|' tools/assistant/assistant.pro +sed -i 's|desktop.path = $$share.path/applications|&/tde|' tools/qtconfig/qtconfig.pro +sed -i 's|desktop.path = $$share.path/applications|&/tde|' tools/designer/designer/designer.pro +sed -i 's|desktop.path = $$share.path/applications|&/tde|' tools/linguist/linguist/linguist.pro + listdocs_fn chown_fn #cd_builddir_fn - don't use -echo "yes" | CFLAGS=$SLKCFLAGS CXXFLAGS=$SLKCFLAGS \ +## datadir is where mkspecs is installed +echo "yes" | \ ./configure \ -no-exceptions \ - -prefix $TQTDIR-$VERSION \ + -prefix $TQTDIR \ + -libdir $TQTDIR/lib$LIBDIRSUFFIX \ + -bindir $TQTDIR/bin \ + -headerdir $TQTDIR/include/tqt \ + -plugindir $TQTDIR/lib$LIBDIRSUFFIX/tqt/plugins \ + -datadir $TQTDIR/lib$LIBDIRSUFFIX/tqt \ + -translationdir $TQTDIR/share/tqt/translations \ -release \ -verbose \ -I/usr/include/freetype2 \ @@ -114,7 +134,7 @@ echo "yes" | CFLAGS=$SLKCFLAGS CXXFLAGS=$SLKCFLAGS \ -plugin-style-sgi \ -plugin-style-windows \ -fast \ - -R-Wl,-rpath,\'\\\$\$ORIGIN/../lib\' + -R-Wl,-rpath,\'\\\$\$ORIGIN/../lib:$INST_RPATH\' ## don't build tutorial and examples which won't be installed because the release version is being built make -i $NUMJOBS symlinks src-qmake src-moc sub-src sub-tools || exit 1 @@ -122,132 +142,77 @@ make install INSTALL_ROOT=$PKG || exit 1 ## for a minimal build [[ $TQT_OPTS == *minimal* ]] && { -(cd $PKG$TQTDIR-$VERSION/ -rm lib/libtqt[de]* -[[ $TQT_OPTS != *tdevel* ]] && rm lib/libtqas* && { -[[ $TQT_OPTS != *pim_ksq* ]] && rm lib/libtqui* +(cd $PKG$TQTDIR/ +rm lib$LIBDIRSUFFIX/libtqt[de]* +[[ $TQT_OPTS != *tdevel* ]] && rm lib$LIBDIRSUFFIX/libtqas* && { +[[ $TQT_OPTS != *pim_ksq* ]] && rm lib$LIBDIRSUFFIX/libtqui* } rm bin/???????* rm bin/tqm2ts rm -rf plugins/designer -(cd mkspecs -ln -s linux-g++ default -))} - -# Link the shared libraries -( cd $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX - for file in $PRGNAM-$VERSION/lib/*.so* ; do - ln -sf $file . - done -) +)} installdocs_fn mkdir -p $PKG/etc/profile.d # -echo '#!'"/bin/sh -# Environment variables for the tQt package. +[[ $TDEVERSION == cgit ]] && QTDIR_PFX=T # -# It's best to use the generic directory to avoid -# compiling in a version-containing path: -if [ -d $TQTDIR ]; then - QTDIR=$TQTDIR -else - # Find the newest Qt directory and set \$QTDIR to that: - for qtd in $TQTDIR-* ; do - if [ -d \$qtd ]; then - QTDIR=\$qtd - fi - done -fi -export QTDIR +echo '#!'"/bin/sh +# Environment path variable for the tQt package. +export ${QTDIR_PFX:-}QTDIR=$TQTDIR " > $PKG/etc/profile.d/tqt3.sh # echo '#!'"/bin/csh -# Environment path variables for the tQt package: -if ( ! \$?QTDIR ) then - # It's best to use the generic directory to avoid - # compiling in a version-containing path: - if ( -d $TQTDIR ) then - setenv QTDIR $TQTDIR - else - # Find the newest Qt directory and set \$QTDIR to that: - foreach qtd ( $TQTDIR-* ) - if ( -d \$qtd ) then - setenv QTDIR \$qtd - endif - end - endif -endif +# Environment path variable for the tQt package: +setenv ${QTDIR_PFX:-}QTDIR $TQTDIR " > $PKG/etc/profile.d/tqt3.csh # chmod 755 $PKG/etc/profile.d/* strip_fn -# Put a ton of links to more "normal" places. -mkdir -p $PKG$INSTALL_TDE/bin -( cd $PKG$INSTALL_TDE/bin - ln -sf ../lib$LIBDIRSUFFIX/$PRGNAM-$VERSION/bin/* . -) -# -mkdir -p $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig -( cd $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig - ln -sf ../$PRGNAM-$VERSION/lib/pkgconfig/tqt-mt.pc . -) - -[[ $TQT_OPTS != *minimal* ]] && { -## move .desktop files to where the other TDE .desktop files are installed -mkdir -p $PKG$INSTALL_TDE/share/applications/tde -mv $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/$PRGNAM-$TDEVERSION/share/applications/* $PKG$INSTALL_TDE/share/applications/tde/ -} -rm -rf $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/$PRGNAM-$TDEVERSION/share/applications - -# Symlink tqt3 includes to qt3, to provide it for non-tde software as well =] -mkdir -p $PKG$INSTALL_TDE/include -( cd $PKG$INSTALL_TDE/include ; ln -sf $TQTDIR-$VERSION/include qt3 ) - -# Symlink all of it: -( cd $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX ; ln -sf $PRGNAM-$VERSION $PRGNAM) - mkdir_install_fn # Add this to the doinst.sh: -[[ $PREPEND != yes ]] && \ cat <> $PKG/install/doinst.sh -# Add TQt library directories to /etc/ld.so.conf: -if ! grep $INSTALL_TDE/lib$LIBDIRSUFFIX /etc/ld.so.conf 1> /dev/null 2> /dev/null ; then - echo "$INSTALL_TDE/lib$LIBDIRSUFFIX" >> /etc/ld.so.conf -fi -if ! grep $TQTDIR-$VERSION/lib /etc/ld.so.conf 1> /dev/null 2> /dev/null ; then - echo "$TQTDIR-$VERSION/lib" >> /etc/ld.so.conf -fi -if [ -x /sbin/ldconfig ]; then - /sbin/ldconfig 2> /dev/null -fi +# Add TDE library directory: +[[ \$(cat etc/ld.so.conf|head -n1) != $INSTALL_TDE/lib$LIBDIRSUFFIX ]] && \ +sed -i "1i $INSTALL_TDE/lib$LIBDIRSUFFIX" etc/ld.so.conf + +# Add TQt library directory: +[[ \$(cat etc/ld.so.conf|head -n1) != $TQTDIR/lib$LIBDIRSUFFIX ]] && \ +sed -i "1i $TQTDIR/lib$LIBDIRSUFFIX" etc/ld.so.conf + +[[ -x /sbin/ldconfig ]] && /sbin/ldconfig -# Update PKG_CONFIG_PATH: -[[ ! \$( grep $INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig /etc/profile.d/pkgconfig.sh ) ]] && \\ -sed -i "s|pkgconfig$|pkgconfig:$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig|" /etc/profile.d/pkgconfig.{,c}sh EOINS -## Removing any existing TDE libs paths and re-installing prevents duplication - -## upgradepkg runs installpkg, and hence doinst.sh, twice, also generating the double colon. -[[ $PREPEND == yes ]] && \ +[[ $(cat $TMPVARS/PKG_CONFIG_PATH_MOD) != set ]] && PC_HASH="#" cat <> $PKG/install/doinst.sh -# Add TQt library directories to /etc/ld.so.conf: -sed -i "\|$INSTALL_TDE/lib$LIBDIRSUFFIX|d" /etc/ld.so.conf -sed -i "1i $INSTALL_TDE/lib$LIBDIRSUFFIX" /etc/ld.so.conf -sed -i "1i $TQTDIR-$VERSION/lib" /etc/ld.so.conf -if [ -x /sbin/ldconfig ]; then - /sbin/ldconfig 2> /dev/null -fi +## This could be a rebuild or upgradepkg running installpkg twice, +## so delete any previous routine +sed -i '/Update PKG_CONFIG_PATH for TDE/,+11d' etc/profile.d/pkgconfig.sh +echo '# Update PKG_CONFIG_PATH for TDE: +## remove duplicated paths: +${PC_HASH:-}PKG_CONFIG_PATH=\$(echo \$PKG_CONFIG_PATH| tr : \\\\n | awk '"'!seen[\\\$0]++'"' | tr \\\\n :|sed '"'s|:\$||'"') +# +## add path for INSTALL_TDE .. +[[ ! \$PKG_CONFIG_PATH == *$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig* ]] && \\ +PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig +## .. and for TQTDIR if different +[[ ! \$PKG_CONFIG_PATH == *$TQTDIR/lib$LIBDIRSUFFIX/pkgconfig* ]] && \\ +PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:$TQTDIR/lib$LIBDIRSUFFIX/pkgconfig +# +export PKG_CONFIG_PATH' >> etc/profile.d/pkgconfig.sh + +## csh # Update PKG_CONFIG_PATH: -[[ ! \$( grep PKG_CONFIG_PATH=$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig: /etc/profile.d/pkgconfig.sh ) ]] && { -sed -i "s|PKG_CONFIG_PATH=|PKG_CONFIG_PATH=$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig:|" /etc/profile.d/pkgconfig.sh -sed -i "s| PKG_CONFIG_PATH | PKG_CONFIG_PATH $INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig:|" /etc/profile.d/pkgconfig.csh -} +[[ ! \$( grep $INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig etc/profile.d/pkgconfig.csh ) ]] && \\ +sed -i "s|pkgconfig$|pkgconfig:$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig|" etc/profile.d/pkgconfig.csh +[[ ! \$( grep $TQTDIR/lib$LIBDIRSUFFIX/pkgconfig etc/profile.d/pkgconfig.csh ) ]] && \\ +sed -i "s|pkgconfig$|pkgconfig:$TQTDIR/lib$LIBDIRSUFFIX/pkgconfig|" etc/profile.d/pkgconfig.csh EOINS doinst_sh_fn diff --git a/Deps/tqtinterface/tqtinterface.SlackBuild b/Deps/tqtinterface/tqtinterface.SlackBuild index 584e7c5..29e8f0f 100755 --- a/Deps/tqtinterface/tqtinterface.SlackBuild +++ b/Deps/tqtinterface/tqtinterface.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tqtinterface -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -37,27 +37,23 @@ listdocs_fn chown_fn -# Until the cmake migration is fully completed, tqtinterface should be -# built to install with a $PREFIX of /usr rather than $INSTALL_TDE, -# even if everything else is being installed to $INSTALL_TDE. cd_builddir_fn +[[ $TDEVERSION == cgit ]] && QTINC_PFX=T cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_PREFIX=$TQTDIR \ + -DQT_PREFIX_DIR=$TQTDIR \ + -D${QTINC_PFX:-}QT_INCLUDE_DIR=$TQTDIR/include/tqt \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DQT_PREFIX_DIR=$INSTALL_TDE \ - -DQT_INCLUDE_DIR=$TQTDIR/include \ - -DQT_LIBRARY_DIR=$TQTDIR/lib \ - -DQT_BINARY_DIR=$TQTDIR/bin \ -DQT_VERSION=3 \ - -DWITH_QT3="ON" \ + -DWITH_QT3="OFF" \ -DWITH_QT4="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Libs/kipi-plugins/kipi-plugins.SlackBuild b/Libs/kipi-plugins/kipi-plugins.SlackBuild index 64fb626..458f2db 100755 --- a/Libs/kipi-plugins/kipi-plugins.SlackBuild +++ b/Libs/kipi-plugins/kipi-plugins.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=kipi-plugins -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -56,9 +56,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Libs/libkdcraw/libkdcraw.SlackBuild b/Libs/libkdcraw/libkdcraw.SlackBuild index 2f787b3..ad559c4 100755 --- a/Libs/libkdcraw/libkdcraw.SlackBuild +++ b/Libs/libkdcraw/libkdcraw.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=libkdcraw PKGNAM=$TDEPFX$PRGNAM -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -47,9 +47,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Libs/libkexiv2/libkexiv2.SlackBuild b/Libs/libkexiv2/libkexiv2.SlackBuild index 5eb1ffe..ef81ca3 100755 --- a/Libs/libkexiv2/libkexiv2.SlackBuild +++ b/Libs/libkexiv2/libkexiv2.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=libkexiv2 PKGNAM=$TDEPFX$PRGNAM -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -41,15 +41,15 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DCMAKE_SKIP_RPATH="ON" \ -DWITH_GCC_VISIBILITY="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Libs/libkipi/libkipi.SlackBuild b/Libs/libkipi/libkipi.SlackBuild index d5b4b4b..52f7ff7 100755 --- a/Libs/libkipi/libkipi.SlackBuild +++ b/Libs/libkipi/libkipi.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=libkipi PKGNAM=$TDEPFX$PRGNAM -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -48,8 +48,8 @@ chown_fn cd_builddir_fn cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ @@ -57,7 +57,7 @@ cmake \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_GCC_VISIBILITY="OFF" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ - -DCMAKE_SKIP_RPATH="ON" \ + -Wno-dev \ .. make_fn diff --git a/Libs/libksquirrel/libksquirrel.SlackBuild b/Libs/libksquirrel/libksquirrel.SlackBuild index 0268065..831b044 100755 --- a/Libs/libksquirrel/libksquirrel.SlackBuild +++ b/Libs/libksquirrel/libksquirrel.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=libksquirrel -VERSION=${VERSION:-$TDEVERSION} +VERSION=$TDEVERSION BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -44,9 +44,8 @@ chown_fn #cd_builddir_fn - don't use -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKRCFLAGS" \ +CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ./configure \ diff --git a/Misc/GraphicsMagick/GraphicsMagick.SlackBuild b/Misc/GraphicsMagick/GraphicsMagick.SlackBuild index bb6963a..b47c6f2 100755 --- a/Misc/GraphicsMagick/GraphicsMagick.SlackBuild +++ b/Misc/GraphicsMagick/GraphicsMagick.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=GraphicsMagick -VERSION=${VERSION:-1.3.34} +VERSION=1.3.34 BUILD=${BUILD:-1} TAG=${TAG:-} @@ -42,9 +42,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CXXFLAGS=$SLKCFLAGS \ -CFLAGS=$SLKCFLAGS \ +CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Misc/graphviz/graphviz.SlackBuild b/Misc/graphviz/graphviz.SlackBuild index 86ee1fe..434eb4e 100644 --- a/Misc/graphviz/graphviz.SlackBuild +++ b/Misc/graphviz/graphviz.SlackBuild @@ -26,7 +26,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=graphviz -VERSION=${VERSION:-2.42.3} +VERSION=2.42.3 BUILD=${BUILD:-1} TAG=${TAG:-} @@ -76,9 +76,8 @@ chown_fn cd_builddir_fn -CFLAGS=$SLKCFLAGS \ -CXXFLAGS=$SLKCFLAGS \ -LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Misc/imlib/imlib.SlackBuild b/Misc/imlib/imlib.SlackBuild index a157c45..7402f05 100644 --- a/Misc/imlib/imlib.SlackBuild +++ b/Misc/imlib/imlib.SlackBuild @@ -21,7 +21,7 @@ # SUCH DAMAGE. PRGNAM=imlib -VERSION=${VERSION:-1.9.15} +VERSION=1.9.15 BUILD=${BUILD:-1} TAG=${TAG:-} @@ -495,7 +495,7 @@ chown_fn cd_builddir_fn -CFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Misc/inkscape/inkscape.SlackBuild b/Misc/inkscape/inkscape.SlackBuild index 650491c..4165936 100755 --- a/Misc/inkscape/inkscape.SlackBuild +++ b/Misc/inkscape/inkscape.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=inkscape -VERSION=${VERSION:-0.92.4} +VERSION=0.92.4 BUILD=${BUILD:-1} SRCURL="https://media.inkscape.org/dl/resources/file/inkscape-$VERSION.tar.bz2" @@ -114,10 +114,8 @@ cd_builddir_fn ## default options have been pulled from CMakeLists.txt cmake \ - -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ - -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ @@ -141,6 +139,7 @@ cmake \ -DWITH_GTK3_EXPERIMENTAL="OFF" \ -DWITH_GTKSPELL="OFF" \ -DENABLE_BINRELOC="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Misc/libpng/libpng.SlackBuild b/Misc/libpng/libpng.SlackBuild index aaaaf30..c01b6da 100755 --- a/Misc/libpng/libpng.SlackBuild +++ b/Misc/libpng/libpng.SlackBuild @@ -21,7 +21,7 @@ # SUCH DAMAGE. PRGNAM=libpng -VERSION=${VERSION:-1.4.22} +VERSION=1.4.22 BUILD=${BUILD:-1} TAG=${TAG:-} @@ -39,9 +39,8 @@ chown_fn cd_builddir_fn -CFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKCFLAGS" \ CC=$COMPILER \ -CXX=$COMPILER_CXX \ ../configure \ --prefix=/usr \ --libdir=/usr/lib$LIBDIRSUFFIX \ diff --git a/Misc/lxml/lxml.SlackBuild b/Misc/lxml/lxml.SlackBuild index abd7d75..c4119dd 100755 --- a/Misc/lxml/lxml.SlackBuild +++ b/Misc/lxml/lxml.SlackBuild @@ -28,7 +28,7 @@ # All rights reserved. PRGNAM=lxml -VERSION=${VERSION:-4.4.2} +VERSION=4.4.2 BUILD=${BUILD:-1} TAG=${TAG:-} diff --git a/Misc/moodbar/moodbar.SlackBuild b/Misc/moodbar/moodbar.SlackBuild index 2ec998a..f15e5fa 100755 --- a/Misc/moodbar/moodbar.SlackBuild +++ b/Misc/moodbar/moodbar.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=moodbar -VERSION=${VERSION:-0.1.2} +VERSION=0.1.2 BUILD=${BUILD:-1} TAG=${TAG:-} @@ -42,9 +42,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CXXFLAGS=$SLKCFLAGS \ -CFLAGS=$SLKCFLAGS \ +CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Misc/mp4v2/mp4v2.SlackBuild b/Misc/mp4v2/mp4v2.SlackBuild index 9b94afe..59cc4a4 100644 --- a/Misc/mp4v2/mp4v2.SlackBuild +++ b/Misc/mp4v2/mp4v2.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=mp4v2 -VERSION=${VERSION:-2.0.0} +VERSION=2.0.0 BUILD=${BUILD:-1} TAG=${TAG:-} @@ -45,9 +45,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CXXFLAGS=$SLKCFLAGS \ -CFLAGS=$SLKCFLAGS \ +CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Misc/potrace/potrace.SlackBuild b/Misc/potrace/potrace.SlackBuild index 9bc7933..1920238 100755 --- a/Misc/potrace/potrace.SlackBuild +++ b/Misc/potrace/potrace.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=potrace -VERSION=${VERSION:-1.16} +VERSION=1.16 BUILD=${BUILD:-1} TAG=${TAG:-} @@ -42,9 +42,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS=$SLKCFLAGS \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Misc/speex/speex.SlackBuild b/Misc/speex/speex.SlackBuild index d9f02a7..e7c1af8 100755 --- a/Misc/speex/speex.SlackBuild +++ b/Misc/speex/speex.SlackBuild @@ -30,7 +30,7 @@ # All rights reserved. PRGNAM=speex -VERSION=${VERSION:-1.2.0} +VERSION=1.2.0 BUILD=${BUILD:-1} TAG=${TAG:-} @@ -51,9 +51,8 @@ chown_fn cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS=$SLKCFLAGS \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ diff --git a/Misc/tidy-html5/tidy-html5.SlackBuild b/Misc/tidy-html5/tidy-html5.SlackBuild index 4d3c752..5efb462 100755 --- a/Misc/tidy-html5/tidy-html5.SlackBuild +++ b/Misc/tidy-html5/tidy-html5.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tidy-html5 -VERSION=${VERSION:-5.6.0} +VERSION=5.6.0 BUILD=${BUILD:-1} TAG=${TAG:-} @@ -69,6 +69,7 @@ cmake \ -DBUILD_TAB2SPACE="ON" \ -DBUILD_SAMPLE_CODE="OFF" \ -DSUPPORT_LOCALIZATIONS="OFF" \ + -Wno-dev \ .. make_fn diff --git a/Misc/xmedcon/xmedcon.SlackBuild b/Misc/xmedcon/xmedcon.SlackBuild index 1119522..f6e01ae 100755 --- a/Misc/xmedcon/xmedcon.SlackBuild +++ b/Misc/xmedcon/xmedcon.SlackBuild @@ -25,7 +25,7 @@ # # PRGNAM=xmedcon -VERSION=${VERSION:-0.16.2} +VERSION=0.16.2 BUILD=${BUILD:-1} TAG=${TAG:-} @@ -43,8 +43,8 @@ chown_fn #cd_builddir_fn - don't use -CFLAGS=$SLKCFLAGS \ -CXXFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ./configure \ diff --git a/Misc/yauap/yauap.SlackBuild b/Misc/yauap/yauap.SlackBuild index cae4380..8059e1d 100755 --- a/Misc/yauap/yauap.SlackBuild +++ b/Misc/yauap/yauap.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=yauap -VERSION=${VERSION:-0.2.4} +VERSION=0.2.4 BUILD=${BUILD:-1} TAG=${TAG:-} diff --git a/README.md b/README.md index 7cf97cc..fd6c8de 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,11 @@ For a native build, run **./BUILD-TDE.sh** - a dialog based script with a series [](https://ray-v.github.io/TDE-version.png) 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]. -Run **INST=0 ./BUILD-TDE.sh** to build only. + +Run **INST=0 ./BUILD-TDE.sh** to build only. +This is a global option so can't be used where the build list includes packages requiring dependencies that haven't been installed. Any package, or set of packages, can be selected in the 'TDE Packages Selection' screen. -The TDE mandatory packages can be pre-selected. Information about dependencies for some packages has been added at the bottom of the dialog screen. R14.0.7 source archives will be downloaded from a geoIP located mirror site, or the development sources [R14.1.0] cloned or updated from cgit. @@ -25,6 +26,14 @@ If you're curious about what this might involve, [take a look at a sample build --- +There are other command line options that can be used to set some build parameters: +* BUILD= - sets the package build identifier, overriding the SlackBuild default of 1 +* USE_CMAKE_EDU=yes - to build tdeedu with cmake - see Core/tdeedu/README. +* USE_CMAKE_MM=yes - to build tdemultimedia with cmake - see Core/tdemultimedia/README. +* VERBOSE=1 - show command lines during cmake builds + +--- + ***The directory structure*** for the SlackBuild scripts is in line with the Trinity release source repositories: ``` Deps [dependencies/] @@ -112,6 +121,4 @@ See https://wiki.trinitydesktop.org/How_to_Build_TDE_Core_Modules for more infor [2] The i18n downloads with wget can't be updated because cgit produces 'current time' 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 updates are infrequent, 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. -[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/bin. - -[4] The Misc directory contains SlackBuilds for software that might already be installed from other sources. Please check because any misc builds selected here could overwrite them. +[3] The Misc directory contains SlackBuilds for software that might already be installed from other sources. Please check because any misc builds selected here could overwrite them. diff --git a/get-source.sh b/get-source.sh index fa2d8ec..0b7b063 100755 --- a/get-source.sh +++ b/get-source.sh @@ -53,7 +53,7 @@ PKG=$TMP_BUILD/package-$PRGNAM OUTPUT=/tmp # remove any previous builds if option chosen -[[ $KEEP_BUILD != "yes" ]] && [[ $PRE_DOWNLOAD != yes ]] && echo -e "\n removing previous build data ..\n" && rm -rf $TMP_BUILD/{tmp,package}* +[[ $KEEP_BUILD != "yes" ]] && [[ $PRE_DOWNLOAD != yes ]] && echo -e "\n removing previous build data .." && rm -rf $TMP_BUILD/{tmp,package}* # Only create working directories if building packages: [[ $PRE_DOWNLOAD != yes ]] && { mkdir -p $OUTPUT @@ -134,7 +134,7 @@ fi ## if not creating/updating git, nothing to do in this function for git builds ## otherwise, now not R14.0.? or misc, and we are creating/updating git, ## so [1] start with admin/cmake: -[[ $(cat $TMPVARS/CGIT) == yes ]] && { +[[ $(cat $TMPVARS/DL_CGIT) == yes ]] && { cd $BUILD_TDE_ROOT/src/cgit [[ ! -e $TMPVARS/admin-cmake-done ]] && { @@ -218,11 +218,20 @@ done } } -# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: - { [[ $ARCH == x86_64 ]] && SLKCFLAGS="-O2 -fPIC ${SET_march:-}" \ - SLKLDFLAGS="-L$INSTALL_TDE/lib$LIBDIRSUFFIX -L/usr/lib64"; } \ -|| { SLKCFLAGS="-O2 ${SET_march:-}" \ - SLKLDFLAGS="-L$INSTALL_TDE/lib$LIBDIRSUFFIX"; } +## Installation RPATH: +## Set this to ensure TDE libs have priority when installed +## For tqt3, the configure -R option is used +## Add -Wl,-rpath for gcc/g++ - +## - use --disable-rpath in autotools builds to avoid paths set by configure +## - double quote $SLK[R]CFLAGS with cmake in the SBs for it to recognize the whole string +INST_RPATH="$TQTDIR/lib$LIBDIRSUFFIX" +[[ $TQTDIR != $INSTALL_TDE ]] && INST_RPATH="$INST_RPATH:$INSTALL_TDE/lib$LIBDIRSUFFIX" +SLKCFLAGS="-O2 ${SET_march:-}" # for Misc and libart-lgpl +SLKRCFLAGS="$SLKCFLAGS -Wl,-rpath,'$INST_RPATH'" # for TQt/TDE +[[ $ARCH == x86_64 ]] && \ +SLKCFLAGS="$SLKCFLAGS -fPIC" && \ +SLKRCFLAGS="$SLKRCFLAGS -fPIC" + # Exit the script on errors: set -e trap 'echo "$0 FAILED at line $LINENO" | tee $OUTPUT/error-$PRGNAM.log' ERR @@ -301,6 +310,12 @@ chmod -R u+w,go+r-w,a+rX-st . ltoolupdate_fn () { +## edit hard coded tqt directory for tqt3/tqtinterface installed to TQTDIR [!= /usr] +sed -i "s|/usr/include/tqt\"|$TQTDIR/include/tqt\"|" admin/acinclude.m4.in +sed -i "s|/usr/include/tqt3|$TQTDIR/include/tqt|" admin/acinclude.m4.in +## edit hard coded plugins installation directories - could be 'tde' +sed -i "s|trinity|$PLUGIN_INSTALL_DIR|g" admin/acinclude.m4.in + cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/ cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in cp /$(grep -h missing /var/log/packages/libtool*) admin/