diff --git a/project/bundles/3rdparty/ext_kde_frameworks/CMakeLists.txt b/project/bundles/3rdparty/ext_kde_frameworks/CMakeLists.txt index 9bd60f3a9c..c47c532b05 100755 --- a/project/bundles/3rdparty/ext_kde_frameworks/CMakeLists.txt +++ b/project/bundles/3rdparty/ext_kde_frameworks/CMakeLists.txt @@ -107,7 +107,7 @@ function(InstallKDEComponent CONFIGURE_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports /. && sed -i '' -e "s/DBUILD_TESTING=ON/DBUILD_TESTING=OFF/g" /bootstrap.macports && - /bootstrap.macports ${EXTPREFIX_frameworks} debug x86_64 "${argoptions}" + /bootstrap.macports ${EXTPREFIX_frameworks} debug arm64 "${argoptions}" BUILD_COMMAND cd /build && $(MAKE) @@ -172,7 +172,7 @@ endfunction() if(APPLE) set(MacosThreadWeaverPatch threadweaver-macports.patch) set(MacosKauthBackend -DKAUTH_BACKEND_NAME=Apple) - set(MacosCoreAddonsPatch kcoreaddons-macports.patch) + #set(MacosCoreAddonsPatch kcoreaddons-macports.patch) else() set(KCalendarCorePatch kcalendarcore-libical.patch) endif() diff --git a/project/bundles/macports/01-build-macports.sh b/project/bundles/macports/01-build-macports.sh index 6dc443387d..68ccbfcfd4 100755 --- a/project/bundles/macports/01-build-macports.sh +++ b/project/bundles/macports/01-build-macports.sh @@ -210,7 +210,7 @@ EOF # No need to build with both architectures embeded (x86 and ARM) for Apple Silicon target cat << EOF >> "$INSTALL_PREFIX/etc/macports/variants.conf" -+universal ++arm64 EOF fi @@ -275,25 +275,11 @@ port install \ libpng \ jpeg \ tiff \ - boost \ - eigen3 \ gettext \ libusb \ - libgphoto2 \ - jasper \ - lcms2 \ - expat \ libxml2 \ libxslt \ libical \ - lensfun \ - bison \ - py38-lxml \ - x265 \ - libde265 \ - libheif \ - aom \ - ffmpeg \ wget +ssl \ qt5-qtbase \ qt5-qtdeclarative \ @@ -305,22 +291,12 @@ port install \ qt5-qttranslations \ qt5-qtimageformats \ qt5-qtnetworkauth \ - qt5-sqlite-plugin \ - qt5-mysql-plugin $MP_MARIADB_VARIANT + qt5-sqlite-plugin -port deactivate boost +#port deactivate boost -if [[ $DK_QTWEBENGINE = 1 ]] ; then - port install qt5-qtwebengine - -else - - port install qt5-qtwebkit - -fi - -port activate boost +#port activate boost # port broken since a while. check later # sane-backends \ @@ -361,17 +337,8 @@ cmake $ORIG_WD/../3rdparty \ -DKP_VERSION=$DK_KP_VERSION \ -DKDE_VERSION=$DK_KDE_VERSION \ -DENABLE_QTVERSION=$DK_QTVERSION \ - -DENABLE_QTWEBENGINE=$DK_QTWEBENGINE \ -Wno-dev -if [[ $DK_QTWEBENGINE = 0 ]] ; then - cmake --build . --config RelWithDebInfo --target ext_qtwebkit -- -j$CPU_CORES -fi - -cmake --build . --config RelWithDebInfo --target ext_opencv -- -j$CPU_CORES -cmake --build . --config RelWithDebInfo --target ext_imagemagick -- -j$CPU_CORES -cmake --build . --config RelWithDebInfo --target ext_libjxl -- -j$CPU_CORES -cmake --build . --config RelWithDebInfo --target ext_libavif -- -j$CPU_CORES ################################################################################################# diff --git a/project/bundles/macports/02-build-extralibs.sh b/project/bundles/macports/02-build-extralibs.sh index b5100b0c1c..1b251622e3 100755 --- a/project/bundles/macports/02-build-extralibs.sh +++ b/project/bundles/macports/02-build-extralibs.sh @@ -77,7 +77,7 @@ cmake $ORIG_WD/../3rdparty \ # core KF5 frameworks dependencies cmake --build . --config RelWithDebInfo --target ext_extra-cmake-modules -- -j$CPU_CORES cmake --build . --config RelWithDebInfo --target ext_kconfig -- -j$CPU_CORES -cmake --build . --config RelWithDebInfo --target ext_breeze-icons -- -j$CPU_CORES +#cmake --build . --config RelWithDebInfo --target ext_breeze-icons -- -j$CPU_CORES cmake --build . --config RelWithDebInfo --target ext_kcoreaddons -- -j$CPU_CORES cmake --build . --config RelWithDebInfo --target ext_kwindowsystem -- -j$CPU_CORES cmake --build . --config RelWithDebInfo --target ext_solid -- -j$CPU_CORES @@ -106,17 +106,17 @@ cmake --build . --config RelWithDebInfo --target ext_kimageformats -- -j$C #cmake --build . --config RelWithDebInfo --target ext_libksane -- -j$CPU_CORES # Geolocation support -cmake --build . --config RelWithDebInfo --target ext_marble -- -j$CPU_CORES +#cmake --build . --config RelWithDebInfo --target ext_marble -- -j$CPU_CORES # Marble install shared lib at wrong place. -mv $INSTALL_PREFIX/Marble.app/Contents/MacOS/lib/libastro* $INSTALL_PREFIX/lib -mv $INSTALL_PREFIX/Marble.app/Contents/MacOS/lib/libmarble* $INSTALL_PREFIX/lib +#mv $INSTALL_PREFIX/Marble.app/Contents/MacOS/lib/libastro* $INSTALL_PREFIX/lib +#mv $INSTALL_PREFIX/Marble.app/Contents/MacOS/lib/libmarble* $INSTALL_PREFIX/lib # Calendar support -cmake --build . --config RelWithDebInfo --target ext_kcalendarcore -- -j$CPU_CORES +#cmake --build . --config RelWithDebInfo --target ext_kcalendarcore -- -j$CPU_CORES # Breeze style support -cmake --build . --config RelWithDebInfo --target ext_breeze -- -j$CPU_CORES +#cmake --build . --config RelWithDebInfo --target ext_breeze -- -j$CPU_CORES ################################################################################################# diff --git a/project/bundles/macports/config.sh b/project/bundles/macports/config.sh index d45e151c88..ff6836c2db 100644 --- a/project/bundles/macports/config.sh +++ b/project/bundles/macports/config.sh @@ -16,7 +16,7 @@ BUILDING_DIR="`pwd`/temp.build" ######################################################################## # Target macOS architecture: "x86_64" for Intel 64 bits, or "arm64" for Apple Silicon 64 bits. -ARCH_TARGET="x86_64" +ARCH_TARGET="arm64" if [[ $ARCH_TARGET = "x86_64" ]] ; then @@ -50,7 +50,7 @@ if [[ $ARCH_TARGET = "x86_64" ]] ; then elif [[ $ARCH_TARGET = "arm64" ]] ; then # Apple Silicon is supported since macOS BigSur - OSX_MIN_TARGET="11.0" + OSX_MIN_TARGET="14.0" else @@ -98,7 +98,7 @@ DK_KA_VERSION="22.12.3" # KDE KF5 frameworks version. # See official release here: https://download.kde.org/stable/frameworks/ -DK_KDE_VERSION="5.106" +DK_KDE_VERSION="5.110" # Qt version to use in bundle and provided by Macports. DK_QTVERSION="5.15" @@ -128,7 +128,7 @@ DK_VERSION=master DK_DEBUG=0 # Option to use QtWebEngine instead QtWebkit -DK_QTWEBENGINE=1 +DK_QTWEBENGINE=0 # Sign bundles with GPG. Passphrase must be hosted in ~/.gnupg/dkorg-gpg-pwd.txt DK_SIGN=0 (END)