From 38f0d9fe0c8256521722f7520e235f71b9df1e4c Mon Sep 17 00:00:00 2001 From: Ray-V Date: Sun, 29 May 2022 19:38:44 +0100 Subject: [PATCH] Revised cmake-trinty usage - stage 1 - enable compatibility with existing build tree --- Apps/abakus/abakus.SlackBuild | 2 +- Apps/amarok/amarok.SlackBuild | 2 +- Apps/codeine/codeine.SlackBuild | 2 +- Apps/dolphin/dolphin.SlackBuild | 2 +- Apps/filelight/filelight.SlackBuild | 2 +- Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild | 2 +- Apps/gwenview-i18n/gwenview-i18n.SlackBuild | 2 +- Apps/k3b-i18n/k3b-i18n.SlackBuild | 2 +- Apps/k3b/k3b.SlackBuild | 2 +- Apps/kaffeine/kaffeine.SlackBuild | 2 +- Apps/kbfx/kbfx.SlackBuild | 2 +- Apps/kbookreader/kbookreader.SlackBuild | 2 +- Apps/kdbg/kdbg.SlackBuild | 2 +- .../kdbusnotification.SlackBuild | 2 +- Apps/kile/kile.SlackBuild | 2 +- Apps/kkbswitch/kkbswitch.SlackBuild | 2 +- Apps/klamav/klamav.SlackBuild | 2 +- Apps/knemo/knemo.SlackBuild | 2 +- Apps/knetstats/knetstats.SlackBuild | 2 +- Apps/knights/knights.SlackBuild | 2 +- Apps/knmap/knmap.SlackBuild | 2 +- Apps/kompose/kompose.SlackBuild | 2 +- Apps/kplayer/kplayer.SlackBuild | 2 +- Apps/kscope/kscope.SlackBuild | 2 +- Apps/ksensors/ksensors.SlackBuild | 2 +- Apps/kshutdown/kshutdown.SlackBuild | 2 +- Apps/kvkbd/kvkbd.SlackBuild | 2 +- Apps/kvpnc/kvpnc.SlackBuild | 2 +- Apps/potracegui/potracegui.SlackBuild | 2 +- Apps/rosegarden/rosegarden.SlackBuild | 2 +- .../tde-style-lipstik.SlackBuild | 2 +- .../tde-style-qtcurve.SlackBuild | 2 +- Apps/tdeio-locate/tdeio-locate.SlackBuild | 2 +- Apps/tdepowersave/tdepowersave.SlackBuild | 2 +- Apps/tdesudo/tdesudo.SlackBuild | 2 +- Apps/tdmtheme/tdmtheme.SlackBuild | 2 +- .../twin-style-crystal.SlackBuild | 2 +- .../twin-style-suse2.SlackBuild | 2 +- Apps/yakuake/yakuake.SlackBuild | 2 +- BUILD-TDE.sh | 4 ++-- Core/tde-i18n/langcodes.xz | Bin 1276 -> 1236 bytes Core/tde-i18n/tde-i18n.SlackBuild | 13 +++++++------ .../tdeaccessibility.SlackBuild | 2 +- Core/tdeaddons/tdeaddons.SlackBuild | 2 +- Core/tdeadmin/tdeadmin.SlackBuild | 2 +- Core/tdeartwork/tdeartwork.SlackBuild | 2 +- Core/tdebase/tdebase.SlackBuild | 8 +++++++- Core/tdeedu/tdeedu.SlackBuild | 2 +- Core/tdegames/tdegames.SlackBuild | 2 +- Core/tdegraphics/tdegraphics.SlackBuild | 2 +- Core/tdelibs/tdelibs.SlackBuild | 2 +- Core/tdemultimedia/tdemultimedia.SlackBuild | 2 +- Core/tdenetwork/tdenetwork.SlackBuild | 2 +- Core/tdepim/tdepim.SlackBuild | 2 +- Core/tdesdk/tdesdk.SlackBuild | 2 +- Core/tdetoys/tdetoys.SlackBuild | 2 +- Core/tdeutils/tdeutils.SlackBuild | 2 +- Core/tdevelop/tdevelop.SlackBuild | 2 +- Core/tdewebdev/tdewebdev.SlackBuild | 2 +- Deps/akode/akode.SlackBuild | 2 +- Deps/arts/arts.SlackBuild | 2 +- Deps/avahi-tqt/avahi-tqt.SlackBuild | 2 +- Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild | 2 +- Deps/dbus-tqt/dbus-tqt.SlackBuild | 2 +- Deps/libart-lgpl/libart-lgpl.SlackBuild | 2 +- Deps/libcaldav/libcaldav.SlackBuild | 2 +- Deps/libcarddav/libcarddav.SlackBuild | 2 +- Deps/tqca/tqca.SlackBuild | 2 +- Deps/tqtinterface/tqtinterface.SlackBuild | 2 +- Libs/libkdcraw/libkdcraw.SlackBuild | 2 +- Libs/libkexiv2/libkexiv2.SlackBuild | 2 +- Libs/libkipi/libkipi.SlackBuild | 2 +- get-source.sh | 4 ++++ 73 files changed, 88 insertions(+), 77 deletions(-) diff --git a/Apps/abakus/abakus.SlackBuild b/Apps/abakus/abakus.SlackBuild index 361da77..2e8146e 100755 --- a/Apps/abakus/abakus.SlackBuild +++ b/Apps/abakus/abakus.SlackBuild @@ -42,7 +42,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/amarok/amarok.SlackBuild b/Apps/amarok/amarok.SlackBuild index d404583..dc2f765 100755 --- a/Apps/amarok/amarok.SlackBuild +++ b/Apps/amarok/amarok.SlackBuild @@ -69,7 +69,7 @@ cd_builddir_fn ## Build aKode-engine? [[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && AKODE="ON" -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/codeine/codeine.SlackBuild b/Apps/codeine/codeine.SlackBuild index 2dba566..dc56805 100644 --- a/Apps/codeine/codeine.SlackBuild +++ b/Apps/codeine/codeine.SlackBuild @@ -43,7 +43,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/dolphin/dolphin.SlackBuild b/Apps/dolphin/dolphin.SlackBuild index eace192..e772006 100755 --- a/Apps/dolphin/dolphin.SlackBuild +++ b/Apps/dolphin/dolphin.SlackBuild @@ -42,7 +42,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/filelight/filelight.SlackBuild b/Apps/filelight/filelight.SlackBuild index 06efa61..3caa980 100755 --- a/Apps/filelight/filelight.SlackBuild +++ b/Apps/filelight/filelight.SlackBuild @@ -44,7 +44,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild index 71b892f..d9f8709 100755 --- a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild +++ b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild @@ -48,7 +48,7 @@ chown_fn cd_builddir_fn ## BONOBO will be included in the build if installed -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/gwenview-i18n/gwenview-i18n.SlackBuild b/Apps/gwenview-i18n/gwenview-i18n.SlackBuild index 0d3ac31..4e554df 100755 --- a/Apps/gwenview-i18n/gwenview-i18n.SlackBuild +++ b/Apps/gwenview-i18n/gwenview-i18n.SlackBuild @@ -78,7 +78,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/k3b-i18n/k3b-i18n.SlackBuild b/Apps/k3b-i18n/k3b-i18n.SlackBuild index 59528a2..0b28178 100755 --- a/Apps/k3b-i18n/k3b-i18n.SlackBuild +++ b/Apps/k3b-i18n/k3b-i18n.SlackBuild @@ -66,7 +66,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/Apps/k3b/k3b.SlackBuild b/Apps/k3b/k3b.SlackBuild index c7dc904..6a50307 100755 --- a/Apps/k3b/k3b.SlackBuild +++ b/Apps/k3b/k3b.SlackBuild @@ -347,7 +347,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/kaffeine/kaffeine.SlackBuild b/Apps/kaffeine/kaffeine.SlackBuild index 77ebac6..b8030a9 100755 --- a/Apps/kaffeine/kaffeine.SlackBuild +++ b/Apps/kaffeine/kaffeine.SlackBuild @@ -46,7 +46,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/kbfx/kbfx.SlackBuild b/Apps/kbfx/kbfx.SlackBuild index 1932c5a..7b6aa3e 100755 --- a/Apps/kbfx/kbfx.SlackBuild +++ b/Apps/kbfx/kbfx.SlackBuild @@ -49,7 +49,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/kbookreader/kbookreader.SlackBuild b/Apps/kbookreader/kbookreader.SlackBuild index e6c7d60..7d5e0ff 100755 --- a/Apps/kbookreader/kbookreader.SlackBuild +++ b/Apps/kbookreader/kbookreader.SlackBuild @@ -42,7 +42,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/kdbg/kdbg.SlackBuild b/Apps/kdbg/kdbg.SlackBuild index 657c071..3f94628 100755 --- a/Apps/kdbg/kdbg.SlackBuild +++ b/Apps/kdbg/kdbg.SlackBuild @@ -104,7 +104,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/kdbusnotification/kdbusnotification.SlackBuild b/Apps/kdbusnotification/kdbusnotification.SlackBuild index 8107fad..11461d2 100755 --- a/Apps/kdbusnotification/kdbusnotification.SlackBuild +++ b/Apps/kdbusnotification/kdbusnotification.SlackBuild @@ -42,7 +42,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/kile/kile.SlackBuild b/Apps/kile/kile.SlackBuild index f5fc7a9..96f30a7 100755 --- a/Apps/kile/kile.SlackBuild +++ b/Apps/kile/kile.SlackBuild @@ -46,7 +46,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/kkbswitch/kkbswitch.SlackBuild b/Apps/kkbswitch/kkbswitch.SlackBuild index 4170959..e59a058 100755 --- a/Apps/kkbswitch/kkbswitch.SlackBuild +++ b/Apps/kkbswitch/kkbswitch.SlackBuild @@ -47,7 +47,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/klamav/klamav.SlackBuild b/Apps/klamav/klamav.SlackBuild index 8d00e6f..055610e 100644 --- a/Apps/klamav/klamav.SlackBuild +++ b/Apps/klamav/klamav.SlackBuild @@ -127,7 +127,7 @@ cd_builddir_fn ! pkg-config sqlite3 && EMB_SQL="ON" -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/knemo/knemo.SlackBuild b/Apps/knemo/knemo.SlackBuild index 6cda251..f39f1d2 100755 --- a/Apps/knemo/knemo.SlackBuild +++ b/Apps/knemo/knemo.SlackBuild @@ -51,7 +51,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/knetstats/knetstats.SlackBuild b/Apps/knetstats/knetstats.SlackBuild index a7eca32..1fe6848 100755 --- a/Apps/knetstats/knetstats.SlackBuild +++ b/Apps/knetstats/knetstats.SlackBuild @@ -42,7 +42,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/knights/knights.SlackBuild b/Apps/knights/knights.SlackBuild index 2bfa961..2f01a65 100755 --- a/Apps/knights/knights.SlackBuild +++ b/Apps/knights/knights.SlackBuild @@ -64,7 +64,7 @@ chown_fn cd_builddir_fn ## BUILD_EXTRA_THEME is a 14.1.0 option and will be ignored for 14.0.n builds -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/knmap/knmap.SlackBuild b/Apps/knmap/knmap.SlackBuild index e95b117..0d29fba 100755 --- a/Apps/knmap/knmap.SlackBuild +++ b/Apps/knmap/knmap.SlackBuild @@ -42,7 +42,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/kompose/kompose.SlackBuild b/Apps/kompose/kompose.SlackBuild index 43d6734..1642849 100644 --- a/Apps/kompose/kompose.SlackBuild +++ b/Apps/kompose/kompose.SlackBuild @@ -44,7 +44,7 @@ chown_fn cd_builddir_fn pkg-config xdamage && pkg-config xcomposite && XCOMP="ON" -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/kplayer/kplayer.SlackBuild b/Apps/kplayer/kplayer.SlackBuild index 81ae40a..d6b32d2 100644 --- a/Apps/kplayer/kplayer.SlackBuild +++ b/Apps/kplayer/kplayer.SlackBuild @@ -59,7 +59,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/kscope/kscope.SlackBuild b/Apps/kscope/kscope.SlackBuild index 1061bcc..c207fb1 100755 --- a/Apps/kscope/kscope.SlackBuild +++ b/Apps/kscope/kscope.SlackBuild @@ -42,7 +42,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/ksensors/ksensors.SlackBuild b/Apps/ksensors/ksensors.SlackBuild index 77b64cf..147ca71 100755 --- a/Apps/ksensors/ksensors.SlackBuild +++ b/Apps/ksensors/ksensors.SlackBuild @@ -42,7 +42,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/kshutdown/kshutdown.SlackBuild b/Apps/kshutdown/kshutdown.SlackBuild index 81a66cc..cfe10c7 100755 --- a/Apps/kshutdown/kshutdown.SlackBuild +++ b/Apps/kshutdown/kshutdown.SlackBuild @@ -43,7 +43,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/kvkbd/kvkbd.SlackBuild b/Apps/kvkbd/kvkbd.SlackBuild index 439e433..eb30b27 100755 --- a/Apps/kvkbd/kvkbd.SlackBuild +++ b/Apps/kvkbd/kvkbd.SlackBuild @@ -216,7 +216,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/kvpnc/kvpnc.SlackBuild b/Apps/kvpnc/kvpnc.SlackBuild index 13ec0ab..185fee3 100755 --- a/Apps/kvpnc/kvpnc.SlackBuild +++ b/Apps/kvpnc/kvpnc.SlackBuild @@ -43,7 +43,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/potracegui/potracegui.SlackBuild b/Apps/potracegui/potracegui.SlackBuild index d094ff8..3c30820 100755 --- a/Apps/potracegui/potracegui.SlackBuild +++ b/Apps/potracegui/potracegui.SlackBuild @@ -45,7 +45,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/rosegarden/rosegarden.SlackBuild b/Apps/rosegarden/rosegarden.SlackBuild index a9a4618..528fe9d 100755 --- a/Apps/rosegarden/rosegarden.SlackBuild +++ b/Apps/rosegarden/rosegarden.SlackBuild @@ -73,7 +73,7 @@ pkg-config jack && JACK="ON" # Check for DSSI aka "Dizzy" pkg-config dssi && DSSI="ON" -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild index d871667..220eadd 100755 --- a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild +++ b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild @@ -42,7 +42,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild index 31ed41a..42cec89 100755 --- a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild +++ b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild @@ -47,7 +47,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/tdeio-locate/tdeio-locate.SlackBuild b/Apps/tdeio-locate/tdeio-locate.SlackBuild index 234e5b2..a45f832 100755 --- a/Apps/tdeio-locate/tdeio-locate.SlackBuild +++ b/Apps/tdeio-locate/tdeio-locate.SlackBuild @@ -46,7 +46,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/tdepowersave/tdepowersave.SlackBuild b/Apps/tdepowersave/tdepowersave.SlackBuild index be92a80..b6820f6 100755 --- a/Apps/tdepowersave/tdepowersave.SlackBuild +++ b/Apps/tdepowersave/tdepowersave.SlackBuild @@ -67,7 +67,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/tdesudo/tdesudo.SlackBuild b/Apps/tdesudo/tdesudo.SlackBuild index f70bbbc..40d5a81 100755 --- a/Apps/tdesudo/tdesudo.SlackBuild +++ b/Apps/tdesudo/tdesudo.SlackBuild @@ -42,7 +42,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/tdmtheme/tdmtheme.SlackBuild b/Apps/tdmtheme/tdmtheme.SlackBuild index 849e8fb..75105d1 100755 --- a/Apps/tdmtheme/tdmtheme.SlackBuild +++ b/Apps/tdmtheme/tdmtheme.SlackBuild @@ -42,7 +42,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild index 130b636..c389595 100755 --- a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild +++ b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild @@ -42,7 +42,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/twin-style-suse2/twin-style-suse2.SlackBuild b/Apps/twin-style-suse2/twin-style-suse2.SlackBuild index 6ac8c9e..493820d 100644 --- a/Apps/twin-style-suse2/twin-style-suse2.SlackBuild +++ b/Apps/twin-style-suse2/twin-style-suse2.SlackBuild @@ -42,7 +42,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Apps/yakuake/yakuake.SlackBuild b/Apps/yakuake/yakuake.SlackBuild index 1432421..ba022ef 100755 --- a/Apps/yakuake/yakuake.SlackBuild +++ b/Apps/yakuake/yakuake.SlackBuild @@ -42,7 +42,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index ba17830..132cd9c 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -273,14 +273,14 @@ EXVAL=$? " \Zb\Z2PgDn/PgUp to scroll\Zn -$(xzless Core/tde-i18n/langcodes.xz | tr "\n" X | sed 's|X|\\n|g;s|Latn\t|Latn|g') +$(xzless Core/tde-i18n/langcodes.xz | sed 's| \t|\t|') " \ 26 75 [[ $EXVAL == 0 ]] && dialog --cr-wrap --no-shadow --colors --no-collapse --ok-label "Return" --msgbox \ " \Zb\Z2PgDn/PgUp to scroll\Zn -$(xzless Core/tde-i18n/langcodes.xz |sed 's|\t\+|\t|g'|cut -f 1,3-| tr "\n" X | sed 's|X|\\n|g;s|\t|\t\t|g;s|cyrillic\t|cyrillic|g;s|Latn\t|Latn|g') +$(xzless Core/tde-i18n/langcodes.xz | sed 's| \t|\t|' | colrm 17 40 ) " \ 26 75 done diff --git a/Core/tde-i18n/langcodes.xz b/Core/tde-i18n/langcodes.xz index 007277fd641d47eaeabeee8cd32e1ea8686120f9..6d5f659c0087fd78abdf722c766c2d5e88d5c114 100755 GIT binary patch delta 1204 zcmV;l1WWt;3DgOY8Uy(Rl93%6e=$OMPo0_Jl)1MgCFY;<-ThQ2L|r)kw<{W@!4=Y= zfd$&HDfYQ`CqS=)P)$e|L8(-pC#s!$8KyuVlW82yU!UvDwebTZ^y|m(j3bn?py(X6 zloZGL1QBB9xZL40$y)2q`#2i5k2#I@IMB(9m6MroYKsqrlwGHuu$Zrdf8Bjij_D^- zSzR?WF)5ws3woCdhLf$)%AQO<(w#~@f@NM&2j#;JWJHMfe1nJ!btVG27Xx)u+R)yD zQ9ON_$HFsU4;nBvx zq4((62PFnD1Y!i33buk5rE6TK$;dWGG2YCjD}AieLU;_8prT;-a^mEZdk=O%c$mkF zLH-CXTNq}0?!c=acaD^UZy8S-_g9;8O=k6j@{93AJ}v&=m3tKGDeFri+_Au3%>GBc z&c+<1uV3755*nWoe`M!LNXmvX!&o$;PB-ls45;?*SN0O%wH=G96~((N-k>bZtRz%lU5T^&Gs zRA}7C&aND_^fB916zyd@0k;Ezxq_S~|81;zTFz^qBzg#ee_lDN$r14+W&L(j61iec zPAJt8Ek@kWhnEI-}Ap=+=GvUuR2_+1Ow2 z@ZqIeN``&wLvbsg)d)?ute{Is$rm7RN<{`jtR3hTMj4WD5|!%<4*x26)_faWNRf5jc5^5 ziXXIMDJsdO;S;T5TluKDFaX&(wLaVU9Pf;K(U)>bsvpy)BXRXElFa0h$zVJcg1A^r zdxN7pbu9_;u!-}b99-o+h#gRa%~&!8Osb1>ub6clf07D8Sx$Z)E%H)@Sb9m{jT+78 zC@`w)Vlu*Oc#a*!UP`Q7SZSt(uz6aZi^r#8s@^4cLZ3O>1LmOAe>accXn^OqB!x4v zR!NSJ4Bx0DjBU4c|N zW?5>&!+^T~i^xmbr@>;30AwO7n{|13#0wF587xBzIwGH-DGwGJoSoT6N}EZ{=fvYC zfGvHo$>=ts+n7?okkSAEJ5@fE$q}6%J4?PKCc&l_0002mFLmaKHb?^i0j>%94*&qn SchnED#Ao{g000001X)^hqeNW* delta 1244 zcmV<21S9*@3H%9=8Ux1!ypbIme+{cxk)#G^51Cyvta@pRS$*J8p)198=cc{26Tswo z3P4s3lVmb&^qJiBV*=NWB(M{neNx*T5QjuTos%g_dds`LjguGGa=hcZv zz>z8a6y&Kv7>F>>YqRg_ya}Q6bR~74V)O{(1Qh|1(2^@MY{QR)8GZ~v+w-c9yH-%Q z-P({20{7eqB)%N#k+re&O(N4}F|iWL z4ncUt+=G@1Vh8SDLYm^1WO;NakhQZ?B-s*cjH?6cclUQZBK8J7e^Ui}7wZ*79Z;hQ z1W3#S-%FtAbQ2p{;(p2<1II!wsRG(L!bGi-2n@7 z(8go(8VDkgBdP5kM=&rGz5#kaq8mTYkJ^RGkG%{YBe*v~mWugurKkMau2*G^d*tJB zjDM|=L822H$*n;ze;SHeQU44YS)n7k?(#ylW5vqM{SNX|@kgi_x8yK?MDZciEvj8a z-JjWrk>e?N1v3m33EN>p(hhm+o@>kVvatc-r{7)vI{{Y*!%`F%?KY1MoC73|&qhXe zl{;@SUnmQA^0~zpQ~OJ#ucm65q4ydo)g9hJ=mR?-e5}MLe}&KLZ-I#C$g7aN?}jh+ zuarNMl#wr#Y#q4Ma6fv_O0fj_+on82o%G2OG$(pyWuAbT&z}=rGkl}$W-c=xxZ26JZLDh^ z?#|>kEG0m93>C-Kmk*YOn#%TBJJ_jL7{O?EwhVa8e=i>7kqZf-J+ zJIQKmj1{IlPyc2CG#h$Ty*CuBuL6lQ5P(j8W2541$Qd~aww1+U3 zc!7T`jk8moc7l2QHXpj&nO0fqJ)g|4J9Pjm`J!l;e~v~x87VV_#^ld)(;_LX?0PEe znZC;Pcn%8LpgLcR;_p~q3MDX!kuZIg-K#1K>E}V2Xo>YZUtLk3&%lk00S?!4()yDC+o`}Dl~ydsK@S`j#sZXk>ij_=QX_XFMUt~;ab)2`4@G~hgFbkEKtyb8 z9RHNOe?~nL)Q^H(01e>@Qy#ymx+1a3?j^h9>Y)ZTK(HR1@)Jmuup8Z4uQqwSP`i^6 zpXvU3qrCfuA&^fapWAdPZ%@86t|SQYYRJ+T}60#8{czkfa=Mivm&c7%FsTH;0n zYn?+>VjKmNt|$wcNwEXCzmfDm-48crm*~%;PLJ*Sn;O5LVsN_>Ks^WZ>G&vpZcp(A zNlI#%vc36g3F1Y@awdZ)9cch3_;>)1Ok`5KoN/dev/null && LCARDDAV="ON" -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Core/tdesdk/tdesdk.SlackBuild b/Core/tdesdk/tdesdk.SlackBuild index fdb4c96..2de8122 100755 --- a/Core/tdesdk/tdesdk.SlackBuild +++ b/Core/tdesdk/tdesdk.SlackBuild @@ -39,7 +39,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Core/tdetoys/tdetoys.SlackBuild b/Core/tdetoys/tdetoys.SlackBuild index 0e33e53..3f7162a 100755 --- a/Core/tdetoys/tdetoys.SlackBuild +++ b/Core/tdetoys/tdetoys.SlackBuild @@ -39,7 +39,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Core/tdeutils/tdeutils.SlackBuild b/Core/tdeutils/tdeutils.SlackBuild index 040d5c7..dddd136 100755 --- a/Core/tdeutils/tdeutils.SlackBuild +++ b/Core/tdeutils/tdeutils.SlackBuild @@ -55,7 +55,7 @@ cd_builddir_fn ## TDEFileReplace has been moved from tdewebdev for R14.1.0 [[ $TDEVERSION == 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON" -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Core/tdevelop/tdevelop.SlackBuild b/Core/tdevelop/tdevelop.SlackBuild index 643e154..00fd003 100755 --- a/Core/tdevelop/tdevelop.SlackBuild +++ b/Core/tdevelop/tdevelop.SlackBuild @@ -43,7 +43,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Core/tdewebdev/tdewebdev.SlackBuild b/Core/tdewebdev/tdewebdev.SlackBuild index 2fa1c69..4654224 100755 --- a/Core/tdewebdev/tdewebdev.SlackBuild +++ b/Core/tdewebdev/tdewebdev.SlackBuild @@ -52,7 +52,7 @@ sed -i "s|/opt/trinity|$INSTALL_TDE|" ../doc/man/*/*.1 ## which defaults to $INSTALL_TDE/lib ## TDEFileReplace has been moved to tdeutils for R14.1.0 [[ $TDEVERSION != 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON" -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Deps/akode/akode.SlackBuild b/Deps/akode/akode.SlackBuild index 33877b1..5292be4 100755 --- a/Deps/akode/akode.SlackBuild +++ b/Deps/akode/akode.SlackBuild @@ -213,7 +213,7 @@ chown_fn cd_builddir_fn ## see README for cmake options -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Deps/arts/arts.SlackBuild b/Deps/arts/arts.SlackBuild index 4008195..d0044fd 100755 --- a/Deps/arts/arts.SlackBuild +++ b/Deps/arts/arts.SlackBuild @@ -39,7 +39,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Deps/avahi-tqt/avahi-tqt.SlackBuild b/Deps/avahi-tqt/avahi-tqt.SlackBuild index 2019695..fc7082d 100755 --- a/Deps/avahi-tqt/avahi-tqt.SlackBuild +++ b/Deps/avahi-tqt/avahi-tqt.SlackBuild @@ -39,7 +39,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild index 0fc163c..2e4524a 100755 --- a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild +++ b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild @@ -39,7 +39,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Deps/dbus-tqt/dbus-tqt.SlackBuild b/Deps/dbus-tqt/dbus-tqt.SlackBuild index 222f07d..4f8d507 100755 --- a/Deps/dbus-tqt/dbus-tqt.SlackBuild +++ b/Deps/dbus-tqt/dbus-tqt.SlackBuild @@ -39,7 +39,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/Deps/libart-lgpl/libart-lgpl.SlackBuild b/Deps/libart-lgpl/libart-lgpl.SlackBuild index 29749cb..aca07ef 100755 --- a/Deps/libart-lgpl/libart-lgpl.SlackBuild +++ b/Deps/libart-lgpl/libart-lgpl.SlackBuild @@ -39,7 +39,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Deps/libcaldav/libcaldav.SlackBuild b/Deps/libcaldav/libcaldav.SlackBuild index 19a8602..0184c79 100755 --- a/Deps/libcaldav/libcaldav.SlackBuild +++ b/Deps/libcaldav/libcaldav.SlackBuild @@ -40,7 +40,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Deps/libcarddav/libcarddav.SlackBuild b/Deps/libcarddav/libcarddav.SlackBuild index c890777..0a7018a 100755 --- a/Deps/libcarddav/libcarddav.SlackBuild +++ b/Deps/libcarddav/libcarddav.SlackBuild @@ -39,7 +39,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Deps/tqca/tqca.SlackBuild b/Deps/tqca/tqca.SlackBuild index ee596be..931d949 100644 --- a/Deps/tqca/tqca.SlackBuild +++ b/Deps/tqca/tqca.SlackBuild @@ -39,7 +39,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Deps/tqtinterface/tqtinterface.SlackBuild b/Deps/tqtinterface/tqtinterface.SlackBuild index 417392c..c554961 100755 --- a/Deps/tqtinterface/tqtinterface.SlackBuild +++ b/Deps/tqtinterface/tqtinterface.SlackBuild @@ -40,7 +40,7 @@ chown_fn cd_builddir_fn [[ $TDEVERSION == 14.1.0 ]] && QTINC_PFX=T -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Libs/libkdcraw/libkdcraw.SlackBuild b/Libs/libkdcraw/libkdcraw.SlackBuild index 1040d9f..4010b23 100755 --- a/Libs/libkdcraw/libkdcraw.SlackBuild +++ b/Libs/libkdcraw/libkdcraw.SlackBuild @@ -132,7 +132,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Libs/libkexiv2/libkexiv2.SlackBuild b/Libs/libkexiv2/libkexiv2.SlackBuild index af40532..66b9634 100755 --- a/Libs/libkexiv2/libkexiv2.SlackBuild +++ b/Libs/libkexiv2/libkexiv2.SlackBuild @@ -40,7 +40,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Libs/libkipi/libkipi.SlackBuild b/Libs/libkipi/libkipi.SlackBuild index 8f31a73..0eb2816 100755 --- a/Libs/libkipi/libkipi.SlackBuild +++ b/Libs/libkipi/libkipi.SlackBuild @@ -43,7 +43,7 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/get-source.sh b/get-source.sh index 441c2a6..a7ea592 100755 --- a/get-source.sh +++ b/get-source.sh @@ -307,6 +307,10 @@ echo # if this fails, SlackBuild will fail from [3] ## [3] finally, cd into source directory # cd $PRGNAM* + +## For cmake builds - the path to the TDE cmake modules +## Added for 14.0.x[aka 14.0.13+] & 14.1.0 which assume a cmake-trinity package is installed to the CMake system directories +export CMAKE_OPTS=-DCMAKE_MODULE_PATH=$PWD/cmake/modules } listdocs_fn ()