Marble: bump version

2026-04-22 11:40:06 +02:00 · 2018-05-06 00:23:46 +10:00
parent e0ee05caf6
commit d0aeb7787a
2 changed files with 172 additions and 100 deletions
--- a/kde-base/marble/marble-17.07.80.recipe
+++ b/kde-base/marble/marble-17.07.80.recipe
@@ -1,100 +0,0 @@
-SUMMARY="A virtual globe and world atlas"
-DESCRIPTION="Marble is a geographical atlas and a virtual globe which lets you \
-quickly explore places on our home planet.
-
-You can use Marble to look up addresses, to easily create maps, \
-measure distances and to retrieve detail information about locations \
-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-2017 by the authors of Marble Virtual Globe"
-LICENSE="GNU LGPL v2.1"
-REVISION="1"
-SOURCE_URI="https://github.com/KDE/marble/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="ba439e99b9d6ec3d66295be49e55e6592d29e380e072d45d5fa0d08f829a6f8b"
-ADDITIONAL_FILES="marble.rdef.in"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	marble$secondaryArchSuffix = $portVersion
-	app:Marble$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku${secondaryArchSuffix}
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5DBus$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
-	lib:libQt5PrintSupport$secondaryArchSuffix
-	lib:libQt5WebKit$secondaryArchSuffix
-	lib:libQt5WebKitWidgets$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libQt5Xml$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5DBus$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
-	devel:libQt5Network$secondaryArchSuffix
-	devel:libQt5PrintSupport$secondaryArchSuffix
-	devel:libQt5WebKit$secondaryArchSuffix
-	devel:libQt5WebKitWidgets$secondaryArchSuffix
-	devel:libQt5Widgets$secondaryArchSuffix
-	devel:libQt5Xml$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:qmake$secondaryArchSuffix
-	cmd:make
-	cmd:g++$secondaryArchSuffix
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:cmake
-	"
-
-BUILD()
-{
-	mkdir -p build
-	cd build
-
-	cmake -DCMAKE_BUILD_TYPE=Release \
-		-DQTONLY=TRUE \
-		-DWITH_DESIGNER_PLUGIN=FALSE \
-		-DCMAKE_INSTALL_PREFIX=$appsDir/Marble \
-		-DMARBLE_DATA_PATH=$appsDir/Marble/data \
-		..
-	# Disable Phonon
-	echo "#undef HAVE_PHONON" > src/lib/marble/config-phonon.h
-	make $jobArgs
-}
-
-INSTALL()
-{
-	cd build
-	make install
-
-	mv $appsDir/Marble/bin/marble-qt $appsDir/Marble/Marble
-
-	rm -rf $appsDir/Marble/bin
-	rm -rf $appsDir/Marble/include
-	rm -rf $appsDir/Marble/share
-
-	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
-	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3`"
-	sed \
-		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
-		-e "s|@MAJOR@|$MAJOR|" \
-		-e "s|@MIDDLE@|$MIDDLE|" \
-		-e "s|@MINOR@|$MINOR|" \
-		$portDir/additional-files/marble.rdef.in > marble.rdef
-
-
-	addResourcesToBinaries marble.rdef $appsDir/Marble/Marble
-	addAppDeskbarSymlink $appsDir/Marble/Marble
-}
--- a/kde-base/marble/marble-18.04.0.recipe
+++ b/kde-base/marble/marble-18.04.0.recipe
@@ -0,0 +1,172 @@
+SUMMARY="A virtual globe and world atlas"
+DESCRIPTION="Marble is a geographical atlas and a virtual globe which lets you \
+quickly explore places on our home planet.
+
+You can use Marble to look up addresses, to easily create maps, \
+measure distances and to retrieve detail information about locations \
+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-2018 by the authors of Marble Virtual Globe"
+LICENSE="GNU LGPL v2.1"
+REVISION="1"
+SOURCE_URI="https://github.com/KDE/marble/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="5e9b354dbdbde81445abbb64206a38b0d2339872af882ce4f7dcb27c29365304"
+ADDITIONAL_FILES="marble.rdef.in"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	marble$secondaryArchSuffix = $portVersion
+	app:Marble$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku${secondaryArchSuffix}
+	lib:libphonon4qt5$secondaryArchSuffix
+	lib:libKF5Attica$secondaryArchSuffix
+	lib:libKF5Auth$secondaryArchSuffix
+	lib:libKF5Archive$secondaryArchSuffix
+	lib:libKF5Bookmarks$secondaryArchSuffix
+	lib:libKF5Codecs$secondaryArchSuffix
+	lib:libKF5Completion$secondaryArchSuffix
+	lib:libKF5ConfigCore$secondaryArchSuffix
+	lib:libKF5ConfigGui$secondaryArchSuffix
+	lib:libKF5ConfigWidgets$secondaryArchSuffix
+	lib:libKF5CoreAddons$secondaryArchSuffix
+	lib:libKF5Crash$secondaryArchSuffix
+	lib:libKF5DocTools$secondaryArchSuffix
+	lib:libKF5GuiAddons$secondaryArchSuffix
+	lib:libKF5I18n$secondaryArchSuffix
+	lib:libKF5IconThemes$secondaryArchSuffix
+	lib:libKF5ItemViews$secondaryArchSuffix
+	lib:libKF5ItemModels$secondaryArchSuffix
+	lib:libKF5JobWidgets$secondaryArchSuffix
+	lib:libKF5KDELibs4Support$secondaryArchSuffix
+	lib:libKF5KIOCore$secondaryArchSuffix
+	lib:libKF5KIOFileWidgets$secondaryArchSuffix
+	lib:libKF5KIOWidgets$secondaryArchSuffix
+	lib:libKF5NewStuff$secondaryArchSuffix
+	lib:libKF5Parts$secondaryArchSuffix
+	lib:libKF5Service$secondaryArchSuffix
+	lib:libKF5Solid$secondaryArchSuffix
+	lib:libKF5SonnetUi$secondaryArchSuffix
+	lib:libKF5TextWidgets$secondaryArchSuffix
+	lib:libKF5WidgetsAddons$secondaryArchSuffix
+	lib:libKF5WindowSystem$secondaryArchSuffix
+	lib:libKF5XmlGui$secondaryArchSuffix
+	lib:libkdeinit5_klauncher$secondaryArchSuffix
+	lib:libkdeinit5_kded5$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Network$secondaryArchSuffix
+	lib:libQt5PrintSupport$secondaryArchSuffix
+	lib:libQt5WebKit$secondaryArchSuffix
+	lib:libQt5WebKitWidgets$secondaryArchSuffix
+	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libQt5Xml$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	extra_cmake_modules >= 5.45
+	haiku${secondaryArchSuffix}_devel
+	devel:libphonon4qt5$secondaryArchSuffix
+	devel:libKF5Auth$secondaryArchSuffix
+	devel:libKF5Archive$secondaryArchSuffix
+	devel:libKF5Attica$secondaryArchSuffix
+	devel:libKF5Bookmarks$secondaryArchSuffix
+	devel:libKF5Codecs$secondaryArchSuffix
+	devel:libKF5Completion$secondaryArchSuffix
+	devel:libKF5ConfigCore$secondaryArchSuffix
+	devel:libKF5ConfigGui$secondaryArchSuffix
+	devel:libKF5ConfigWidgets$secondaryArchSuffix
+	devel:libKF5CoreAddons$secondaryArchSuffix
+	devel:libKF5Crash$secondaryArchSuffix
+	devel:libKF5DocTools$secondaryArchSuffix
+	devel:libKF5GuiAddons$secondaryArchSuffix
+	devel:libKF5I18n$secondaryArchSuffix
+	devel:libKF5IconThemes$secondaryArchSuffix
+	devel:libKF5ItemViews$secondaryArchSuffix
+	devel:libKF5ItemModels$secondaryArchSuffix
+	devel:libKF5JobWidgets$secondaryArchSuffix
+	devel:libKF5KDELibs4Support$secondaryArchSuffix
+	devel:libKF5KIOCore$secondaryArchSuffix
+	devel:libKF5KIOFileWidgets$secondaryArchSuffix
+	devel:libKF5KIOWidgets$secondaryArchSuffix
+	devel:libKF5NewStuff$secondaryArchSuffix
+	devel:libKF5Parts$secondaryArchSuffix
+	devel:libKF5Service$secondaryArchSuffix
+	devel:libKF5Solid$secondaryArchSuffix
+	devel:libKF5SonnetUi$secondaryArchSuffix
+	devel:libKF5TextWidgets$secondaryArchSuffix
+	devel:libKF5WidgetsAddons$secondaryArchSuffix
+	devel:libKF5WindowSystem$secondaryArchSuffix
+	devel:libKF5XmlGui$secondaryArchSuffix
+	devel:libkdeinit5_klauncher$secondaryArchSuffix
+	devel:libkdeinit5_kded5$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Network$secondaryArchSuffix
+	devel:libQt5PrintSupport$secondaryArchSuffix
+	devel:libQt5WebKit$secondaryArchSuffix
+	devel:libQt5WebKitWidgets$secondaryArchSuffix
+	devel:libQt5Widgets$secondaryArchSuffix
+	devel:libQt5Xml$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:qmake$secondaryArchSuffix
+	cmd:make
+	cmd:g++$secondaryArchSuffix
+	cmd:perl
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:cmake
+	"
+
+BUILD()
+{
+	# disable docs generation
+	sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
+
+	mkdir -p build
+	cd build
+
+	cmake -DCMAKE_BUILD_TYPE=Release \
+		-DWITH_DESIGNER_PLUGIN=TRUE \
+		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DCMAKE_INSTALL_PREFIX=$appsDir/Marble \
+		-DMARBLE_DATA_PATH=$appsDir/Marble/data \
+		..
+	
+	make $jobArgs
+}
+
+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
+
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		$portDir/additional-files/marble.rdef.in > marble.rdef
+
+	addResourcesToBinaries marble.rdef $appsDir/Marble/Marble
+
+	addAppDeskbarSymlink $appsDir/Marble/Marble
+}