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 007277f..6d5f659 100755 Binary files a/Core/tde-i18n/langcodes.xz and b/Core/tde-i18n/langcodes.xz differ diff --git a/Core/tde-i18n/tde-i18n.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild index 1539e7e..1434689 100755 --- a/Core/tde-i18n/tde-i18n.SlackBuild +++ b/Core/tde-i18n/tde-i18n.SlackBuild @@ -99,7 +99,10 @@ chown_fn mkdir -p $PRGNAM-$lang/build cd $PRGNAM-$lang/build -cmake ${G_NINJA:-} \ +## The path to the TDE cmake modules is 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 +CMAKE_OPTS=-DCMAKE_MODULE_PATH=$PWD/../cmake/modules + +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ @@ -120,10 +123,8 @@ make_fn mkdir_install_fn -# extract the name of the language from the source text - a bit messy but there is no standard format -Lang=$(grep Language-Team: $TMP_BUILD/tmp-$PRGNAM/$PRGNAM*/tde-i18n-$lang/messages/tdebase/*.po|sort -k2 | sed -e 's|Team: |\n|' -e 's| <|\n|' -e 's|akh\\n"|akh|' -e 's|an S|#|' | grep "[A-Z][a-z][a-z]*$"|head -n 1) -[[ "$lang" == "pt" ]] && Lang="Portuguese" -[[ "$lang" == "fy" ]] && Lang="Frisian" +Lang=$(xzgrep ^"$lang " $SB_SRCDIR/langcodes.xz |colrm 1 16|cut -f1) +Lang_en=$(xzgrep ^"$lang " $SB_SRCDIR/langcodes.xz |colrm 1 40) doinst_sh_fn @@ -137,7 +138,7 @@ echo " |-----handy-ruler------------------------------------------------------| $PRGNAM-$lang: tde-i18n-$lang $PRGNAM-$lang: -$PRGNAM-$lang: Language support for TDE: $Lang +$PRGNAM-$lang: Language support for TDE: $Lang [$Lang_en] $PRGNAM-$lang: $PRGNAM-$lang: $PRGNAM-$lang: diff --git a/Core/tdeaccessibility/tdeaccessibility.SlackBuild b/Core/tdeaccessibility/tdeaccessibility.SlackBuild index 5d55892..907f2b0 100755 --- a/Core/tdeaccessibility/tdeaccessibility.SlackBuild +++ b/Core/tdeaccessibility/tdeaccessibility.SlackBuild @@ -42,7 +42,7 @@ cd_builddir_fn AKODE=OFF && [[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && AKODE=ON FREEVERB=OFF && [[ -s $INSTALL_TDE/include/arts/artsmodules.h ]] && FREEVERB=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/tdeaddons/tdeaddons.SlackBuild b/Core/tdeaddons/tdeaddons.SlackBuild index 742ba79..1178707 100755 --- a/Core/tdeaddons/tdeaddons.SlackBuild +++ b/Core/tdeaddons/tdeaddons.SlackBuild @@ -60,7 +60,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/tdeadmin/tdeadmin.SlackBuild b/Core/tdeadmin/tdeadmin.SlackBuild index 156fc88..4e30a02 100755 --- a/Core/tdeadmin/tdeadmin.SlackBuild +++ b/Core/tdeadmin/tdeadmin.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/tdeartwork/tdeartwork.SlackBuild b/Core/tdeartwork/tdeartwork.SlackBuild index 14b948b..14be3b8 100755 --- a/Core/tdeartwork/tdeartwork.SlackBuild +++ b/Core/tdeartwork/tdeartwork.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/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild index 024b89f..fedc1d7 100755 --- a/Core/tdebase/tdebase.SlackBuild +++ b/Core/tdebase/tdebase.SlackBuild @@ -132,7 +132,10 @@ chown_fn cd_builddir_fn -cmake ${G_NINJA:-} \ +## Add man pages for development builds +[[ $TDEVERSION != 14.0.12 ]] && MAN_PAGES=-DMAN_INSTALL_DIR=$INSTALL_TDE/man + +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ @@ -142,6 +145,7 @@ cmake ${G_NINJA:-} \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ + ${MAN_PAGES:-} \ -DWITH_ARTS="ON" \ -DWITH_ELFICON="OFF" \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ @@ -232,6 +236,8 @@ make_fn installdocs_fn +[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn + strip_fn ############################################################################## diff --git a/Core/tdeedu/tdeedu.SlackBuild b/Core/tdeedu/tdeedu.SlackBuild index 81820bf..d9bdfd7 100755 --- a/Core/tdeedu/tdeedu.SlackBuild +++ b/Core/tdeedu/tdeedu.SlackBuild @@ -249,7 +249,7 @@ cd_builddir_fn ## kig python scripting support [[ $(ls -1 /usr/lib$LIBDIRSUFFIX/libboost_python*.so) ]] && KIG_PS="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/tdegames/tdegames.SlackBuild b/Core/tdegames/tdegames.SlackBuild index 593586d..7a1e9fc 100755 --- a/Core/tdegames/tdegames.SlackBuild +++ b/Core/tdegames/tdegames.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/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild index 2486f84..88bbe69 100755 --- a/Core/tdegraphics/tdegraphics.SlackBuild +++ b/Core/tdegraphics/tdegraphics.SlackBuild @@ -97,7 +97,7 @@ cd_builddir_fn # If imlib is installed, include Kuickshow: pkg-config imlib && KUICKSHOW=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/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild index c1371e0..9ab1905 100755 --- a/Core/tdelibs/tdelibs.SlackBuild +++ b/Core/tdelibs/tdelibs.SlackBuild @@ -165,7 +165,7 @@ sed -i 's|tde_message_fatal( "Spell checker|message( "Spell checker|' ../CMakeLi are 14.1.0 options and will be ignored by 14.0.n builds comment -cmake ${G_NINJA:-} \ +cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \ diff --git a/Core/tdemultimedia/tdemultimedia.SlackBuild b/Core/tdemultimedia/tdemultimedia.SlackBuild index 9a77e14..f75c8b3 100755 --- a/Core/tdemultimedia/tdemultimedia.SlackBuild +++ b/Core/tdemultimedia/tdemultimedia.SlackBuild @@ -42,7 +42,7 @@ cd_builddir_fn ## akode is required for ARTS_AKODE plugin & JUK [[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && aRts_AKODE=ON && JUK=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/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild index 9e81166..7d96157 100755 --- a/Core/tdenetwork/tdenetwork.SlackBuild +++ b/Core/tdenetwork/tdenetwork.SlackBuild @@ -61,7 +61,7 @@ cd_builddir_fn # If speex is installed, include it in the build for jingle [[ -s /usr/include/speex/speex.h ]] && SPX="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/tdepim/tdepim.SlackBuild b/Core/tdepim/tdepim.SlackBuild index 92e6bc3..87e9226 100755 --- a/Core/tdepim/tdepim.SlackBuild +++ b/Core/tdepim/tdepim.SlackBuild @@ -45,7 +45,7 @@ cd_builddir_fn # If libcarddav is installed, include it in the build for korganizer [[ -s $INSTALL_TDE/include/libcarddav/carddav.h ]] 2>/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 ()