From 59aba7dda3bf9ed893605a856e75718aeef00a82 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 22 Jan 2021 11:23:29 +0100 Subject: [PATCH] Framework: sync with upstream Taken from: HardenedBSD --- MOVED | 3 +- Mk/Uses/compiler.mk | 104 ++++---------------------------------------- Mk/Uses/kde.mk | 26 +++++------ 3 files changed, 23 insertions(+), 110 deletions(-) diff --git a/MOVED b/MOVED index 97daa7eb11d..5638f0eecd4 100644 --- a/MOVED +++ b/MOVED @@ -13724,7 +13724,6 @@ biology/pycogent||2020-01-27|Has expired: Unmaintained, uses EOLed python27 biology/unanimity||2020-01-27|Has expired: Unmaintained, uses EOLed python27 cad/pythoncad||2020-01-27|Has expired: Unmaintained, uses EOLed python27 chinese/bg5pdf||2020-01-27|Has expired: Unmaintained, uses EOLed python27 -comms/py-libimobiledevice||2020-01-27|Has expired: Unmaintained, uses EOLed python27 converters/py-bcode||2020-01-27|Has expired: Unmaintained, uses EOLed python27 converters/py-iconv||2020-01-27|Has expired: Unmaintained, uses EOLed python27 databases/gadfly||2020-01-27|Has expired: Unmaintained, uses EOLed python27 @@ -14441,7 +14440,6 @@ textproc/py-ltxml||2020-03-20|Has expired: Unmaintained, uses EOLed python27 x11-toolkits/flowcanvas||2020-03-20|Has expired: Unmaintained, uses EOLed python27 audio/py-vorbis||2020-03-20|Has expired: Unmaintained, uses EOLed python27 databases/py-cdb||2020-03-20|Has expired: Unmaintained, uses EOLed python27 -devel/py-libplist||2020-03-20|Has expired: Unmaintained, uses EOLed python27 devel/py-mwlib||2020-03-20|Has expired: Unmaintained, uses EOLed python27 graphics/py-soya3d||2020-03-20|Has expired: Unmaintained, uses EOLed python27 irc/py-supybot||2020-03-20|Has expired: Unmaintained, uses EOLed python27 @@ -16021,3 +16019,4 @@ science/dlpoly-classic||2021-01-17|Has expired: MASTERSITE gone; possibly replac security/py-gtts-token|audio/py-gtts|2021-01-17|Has expired: Obsolete, please use audio/py-gtts instead graphics/qt-avif-image-plugin|graphics/kf5-kimageformats|2021-01-18|Part of kimageformats since KDE Frameworks 5.78.0 archivers/libunrar5|archivers/libunrar6|2021-01-19|Renamed to match current major version of libunrar +devel/electron7|devel/electron9|2021-01-21|EOLed upstream, switch to newer major version diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index fc1dbe8cfdd..cfbc35da328 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -171,8 +171,11 @@ CHOSEN_COMPILER_TYPE= gcc .endif .endif -.if ${_COMPILER_ARGS:Mc++17-lang} -.if !${COMPILER_FEATURES:Mc++17} +.if (${_COMPILER_ARGS:Mc++17-lang} && !${COMPILER_FEATURES:Mc++17}) || \ +(${_COMPILER_ARGS:Mc++14-lang} && !${COMPILER_FEATURES:Mc++14}) || \ +(${_COMPILER_ARGS:Mc++11-lang} && !${COMPILER_FEATURES:Mc++11}) || \ +(${_COMPILER_ARGS:Mc++0x} && !${COMPILER_FEATURES:Mc++0x}) || \ +(${_COMPILER_ARGS:Mc11} && !${COMPILER_FEATURES:Mc11}) .if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 USE_GCC= yes CHOSEN_COMPILER_TYPE= gcc @@ -183,103 +186,14 @@ CC= clang CXX= clang++ CHOSEN_COMPILER_TYPE= clang .else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60 -CPP= ${LOCALBASE}/bin/clang-cpp60 -CC= ${LOCALBASE}/bin/clang60 -CXX= ${LOCALBASE}/bin/clang++60 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang10:devel/llvm10 +CPP= ${LOCALBASE}/bin/clang-cpp10 +CC= ${LOCALBASE}/bin/clang10 +CXX= ${LOCALBASE}/bin/clang++10 CHOSEN_COMPILER_TYPE= clang .endif .endif .endif -.endif - -.if ${_COMPILER_ARGS:Mc++14-lang} -.if !${COMPILER_FEATURES:Mc++14} -.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 -USE_GCC= yes -CHOSEN_COMPILER_TYPE= gcc -.elif ${COMPILER_TYPE} == gcc -.if ${ALT_COMPILER_TYPE} == clang -CPP= clang-cpp -CC= clang -CXX= clang++ -CHOSEN_COMPILER_TYPE= clang -.else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60 -CPP= ${LOCALBASE}/bin/clang-cpp60 -CC= ${LOCALBASE}/bin/clang60 -CXX= ${LOCALBASE}/bin/clang++60 -CHOSEN_COMPILER_TYPE= clang -.endif -.endif -.endif -.endif - -.if ${_COMPILER_ARGS:Mc++11-lang} -.if !${COMPILER_FEATURES:Mc++11} -.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 -USE_GCC= yes -CHOSEN_COMPILER_TYPE= gcc -.elif ${COMPILER_TYPE} == gcc -.if ${ALT_COMPILER_TYPE} == clang -CPP= clang-cpp -CC= clang -CXX= clang++ -CHOSEN_COMPILER_TYPE= clang -.else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60 -CPP= ${LOCALBASE}/bin/clang-cpp60 -CC= ${LOCALBASE}/bin/clang60 -CXX= ${LOCALBASE}/bin/clang++60 -CHOSEN_COMPILER_TYPE= clang -.endif -.endif -.endif -.endif - -.if ${_COMPILER_ARGS:Mc++0x} -.if !${COMPILER_FEATURES:Mc++0x} -.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 -USE_GCC= yes -CHOSEN_COMPILER_TYPE= gcc -.elif ${COMPILER_TYPE} == gcc -.if ${ALT_COMPILER_TYPE} == clang -CPP= clang-cpp -CC= clang -CXX= clang++ -CHOSEN_COMPILER_TYPE= clang -.else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60 -CHOSEN_COMPILER_TYPE= clang -CPP= ${LOCALBASE}/bin/clang-cpp60 -CC= ${LOCALBASE}/bin/clang60 -CXX= ${LOCALBASE}/bin/clang++60 -.endif -.endif -.endif -.endif - -.if ${_COMPILER_ARGS:Mc11} -.if !${COMPILER_FEATURES:Mc11} -.if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 -USE_GCC= yes -CHOSEN_COMPILER_TYPE= gcc -.elif ${COMPILER_TYPE} == gcc -.if ${ALT_COMPILER_TYPE} == clang -CPP= clang-cpp -CC= clang -CXX= clang++ -CHOSEN_COMPILER_TYPE= clang -.else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang60:devel/llvm60 -CHOSEN_COMPILER_TYPE= clang -CPP= ${LOCALBASE}/bin/clang-cpp60 -CC= ${LOCALBASE}/bin/clang60 -CXX= ${LOCALBASE}/bin/clang++60 -.endif -.endif -.endif -.endif .if ${_COMPILER_ARGS:Mgcc-c++11-lib} USE_GCC= yes diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index 83af7032567..15598d60e64 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -144,33 +144,33 @@ IGNORE?= unknown CATEGORY value '${_KDE_CATEGORY}' #' # ============================================================================== -# ==== SETUP CMAKE ENVIRONMENT ================================================= +# === SET UP CMAKE ENVIRONMENT ================================================= # Help cmake to find files when testing ports with non-default PREFIX. CMAKE_ARGS+= -DCMAKE_PREFIX_PATH="${LOCALBASE}" -. if ${_KDE_VERSION:M*5*} # We set KDE_INSTALL_USE_QT_SYS_PATHS to install mkspecs files, plugins and # imports to the Qt 5 install directory. -CMAKE_ARGS+= -DBUILD_TESTING:BOOL=OFF \ - -DCMAKE_MODULE_PATH="${LOCALBASE};${KDE_PREFIX}" \ - -DCMAKE_INSTALL_PREFIX="${KDE_PREFIX}" \ - -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=TRUE -. endif +CMAKE_ARGS+= -DCMAKE_MODULE_PATH="${LOCALBASE};${KDE_PREFIX}" \ + -DCMAKE_INSTALL_PREFIX="${KDE_PREFIX}" \ + -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=true # Set man-page installation prefix. CMAKE_ARGS+= -DKDE_INSTALL_MANDIR:PATH="${KDE_PREFIX}/man" \ -DMAN_INSTALL_DIR:PATH="${KDE_PREFIX}/man" + +# Disable autotests unless TEST_TARGET is defined. +. if !defined(TEST_TARGET) +CMAKE_ARGS+= -DBUILD_TESTING:BOOL=false +. endif # ============================================================================== -# === SET-UP PLIST_SUB ========================================================= +# === SET UP PLIST_SUB ========================================================= # Prefix and include directory. PLIST_SUB+= KDE_PREFIX="${KDE_PREFIX}" # KDE Applications version. -PLIST_SUB+= KDE_APPLICATIONS_VERSION="${KDE_APPLICATIONS_VERSION}" -. if ${_KDE_VERSION:M*5*} -PLIST_SUB+= KDE_PLASMA_VERSION="${KDE_PLASMA_VERSION}" \ - KDE_FRAMEWORKS_VERSION="${KDE_FRAMEWORKS_VERSION}" -. endif +PLIST_SUB+= KDE_APPLICATIONS_VERSION="${KDE_APPLICATIONS_VERSION}" \ + KDE_FRAMEWORKS_VERSION="${KDE_FRAMEWORKS_VERSION}" \ + KDE_PLASMA_VERSION="${KDE_PLASMA_VERSION}" # ============================================================================== _USE_KDE_BOTH= akonadi attica libkcddb libkcompactdisc libkdcraw libkdegames \