diff --git a/kde-base/marble/marble-22.04.0.recipe b/kde-base/marble/marble-23.08.5.recipe similarity index 78% rename from kde-base/marble/marble-22.04.0.recipe rename to kde-base/marble/marble-23.08.5.recipe index f042e7a7f..a3881ed2b 100644 --- a/kde-base/marble/marble-22.04.0.recipe +++ b/kde-base/marble/marble-23.08.5.recipe @@ -8,11 +8,11 @@ that you have just heard about in the news or on the Internet. The user interface is clean, simple and easy to use." HOMEPAGE="https://marble.kde.org/" -COPYRIGHT="2007-2022 Marble Virtual Globe authors" +COPYRIGHT="2007-2024 Marble Virtual Globe authors" LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/marble-$portVersion.tar.xz" -CHECKSUM_SHA256="eb39219936b387dae4743638fe8ac5cf7f5654f4b4aff06a7c7b67e177799962" +CHECKSUM_SHA256="856cff312725f9644b05cc92d3e437712311d96927e6aa008a44df1c0f4a0b88" ADDITIONAL_FILES="marble.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -21,6 +21,9 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" marble$secondaryArchSuffix = $portVersion app:Marble$secondaryArchSuffix = $portVersion + lib:libastro$secondaryArchSuffix = $portVersion + lib:libmarbledeclarative$secondaryArchSuffix = $portVersion + lib:libmarblewidget_qt5$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -58,12 +61,13 @@ REQUIRES=" lib:libKF5WindowSystem$secondaryArchSuffix lib:libKF5XmlGui$secondaryArchSuffix lib:libphonon4qt5$secondaryArchSuffix + lib:libprotobuf$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Network$secondaryArchSuffix lib:libQt5PrintSupport$secondaryArchSuffix - lib:libQt5WebKit$secondaryArchSuffix - lib:libQt5WebKitWidgets$secondaryArchSuffix + lib:libQt5WebEngineCore$secondaryArchSuffix + lib:libQt5WebEngineWidgets$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix lib:libQt5Xml$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -71,7 +75,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.93 + extra_cmake_modules$secondaryArchSuffix devel:libkdeinit5_kded5$secondaryArchSuffix devel:libkdeinit5_klauncher$secondaryArchSuffix devel:libKF5Archive$secondaryArchSuffix @@ -106,12 +110,13 @@ BUILD_REQUIRES=" devel:libKF5WindowSystem$secondaryArchSuffix devel:libKF5XmlGui$secondaryArchSuffix devel:libphonon4qt5$secondaryArchSuffix + devel:libprotobuf$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix devel:libQt5Network$secondaryArchSuffix devel:libQt5PrintSupport$secondaryArchSuffix - devel:libQt5WebKit$secondaryArchSuffix - devel:libQt5WebKitWidgets$secondaryArchSuffix + devel:libQt5WebEngineCore$secondaryArchSuffix + devel:libQt5WebEngineWidgets$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix devel:libQt5Xml$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -139,10 +144,20 @@ BUILD() cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$appsDir/Marble \ - -DMARBLE_DATA_PATH=$appsDir/Marble/data \ - -DWITH_DESIGNER_PLUGIN=TRUE \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DCMAKE_INSTALL_PREFIX=$appsDir \ + -DCMAKE_INSTALL_DATADIR=$dataDir \ + -DCMAKE_INSTALL_DATAROOTDIR=$dataDir \ + -DCMAKE_INSTALL_FULL_DATAROOTDIR=$dataDir \ + -DSHARE_INSTALL_PREFIX=$dataDir \ + -DKDE_INSTALL_BINDIR=$appsDir \ + -DKDE_INSTALL_LIBDIR=$libDir \ + -DKDE_INSTALL_INCLUDEDIR=$includeDir \ + -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ + -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt5 \ + -DMARBLE_DATA_PATH=$dataDir/marble \ + -DMARBLE_PLUGIN_PATH=$addOnsDir/marble \ + -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake make $jobArgs } @@ -152,13 +167,10 @@ INSTALL() cd build make install - mkdir -p $dataDir - mv $appsDir/Marble/share/* $dataDir - mv $appsDir/Marble/bin/marble $appsDir/Marble/Marble - - rm -rf $appsDir/Marble/bin \ - $appsDir/Marble/include \ - $appsDir/Marble/share + mv $appsDir/marble $appsDir/Marble + rm -rf $appsDir/{bin,mkspecs,include,lib,share} + rm -rf $dataDir/{mime,metainfo} + rm -rf $libDir/cmake local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" @@ -170,7 +182,7 @@ INSTALL() -e "s|@MINOR@|$MINOR|" \ $portDir/additional-files/marble.rdef.in > marble.rdef - addResourcesToBinaries marble.rdef $appsDir/Marble/Marble + addResourcesToBinaries marble.rdef $appsDir/Marble - addAppDeskbarSymlink $appsDir/Marble/Marble + addAppDeskbarSymlink $appsDir/Marble }