scribus: bump for rebuild (#5919)

it seems the build finds or uses python3 instead of python3.9, leading to start problem like #5892
2026-04-09 05:10:05 +02:00 · 2021-05-17 06:32:13 -07:00
parent 19b492fe15
commit 2661d2000f
2 changed files with 4 additions and 154 deletions
--- a/app-office/scribus/scribus-1.5.6.1.recipe
+++ b/app-office/scribus/scribus-1.5.6.1.recipe
@@ -1,150 +0,0 @@
-SUMMARY="A powerful desktop publishing application"
-DESCRIPTION="Scribus is an Open Source program that brings professional page \
-layout to Linux, BSD UNIX, Solaris, OpenIndiana, GNU/Hurd, Mac OS X, OS/2 \
-Warp 4, eComStation, Haiku and Windows desktops with a combination of \
-press-ready output and new approaches to page design. Underneath a modern and \
-user-friendly interface, Scribus supports professional publishing features, \
-such as color separations, CMYK and spot colors, ICC color management, and \
-versatile PDF creation."
-HOMEPAGE="https://www.scribus.net"
-COPYRIGHT="2014-2020 Scribus Team"
-LICENSE="GNU GPL v2"
-REVISION="5"
-SOURCE_URI="https://sourceforge.net/projects/scribus/files/scribus-devel/$portVersion/scribus-$portVersion.tar.xz"
-CHECKSUM_SHA256="d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab"
-PATCHES="scribus-$portVersion.patchset"
-ADDITIONAL_FILES="scribus.rdef.in"
-
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	scribus$secondaryArchSuffix = $portVersion
-	app:Scribus
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libcairo$secondaryArchSuffix
-	lib:libcdr_0.1$secondaryArchSuffix
-	lib:libcrypto$secondaryArchSuffix
-	lib:libexecinfo$secondaryArchSuffix
-	lib:libfontconfig$secondaryArchSuffix
-	lib:libfreehand_0.1$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
-	lib:libharfbuzz_icu$secondaryArchSuffix
-	lib:libhunspell_1.7$secondaryArchSuffix
-	lib:libhyphen$secondaryArchSuffix
-	lib:libicudata$secondaryArchSuffix >= 66
-	lib:libicuuc$secondaryArchSuffix >= 66
-	lib:libjpeg$secondaryArchSuffix
-	lib:liblcms2$secondaryArchSuffix
-	lib:libmspub_0.1$secondaryArchSuffix
-	lib:libpagemaker_0.0${secondaryArchSuffix}
-	lib:libpng16$secondaryArchSuffix
-	lib:libpodofo$secondaryArchSuffix
-	lib:libpoppler$secondaryArchSuffix
-	lib:libpython3.9$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
-	lib:libQt5OpenGL$secondaryArchSuffix
-	lib:libQt5PrintSupport$secondaryArchSuffix
-	lib:libQt5Qml$secondaryArchSuffix
-	lib:libQt5Quick$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libQt5Xml$secondaryArchSuffix
-	lib:libqxp_0.0$secondaryArchSuffix
-	lib:librevenge_0.0${secondaryArchSuffix}
-	lib:librevenge_generators_0.0${secondaryArchSuffix}
-	lib:librevenge_stream_0.0${secondaryArchSuffix}
-	lib:libssl$secondaryArchSuffix
-	lib:libtiff$secondaryArchSuffix
-	lib:libvisio_0.1$secondaryArchSuffix
-	lib:libxml2$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	lib:libzmf_0.0$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libboost_system${secondaryArchSuffix} >= 1.69.0
-	devel:libcairo$secondaryArchSuffix
-	devel:libcdr_0.1$secondaryArchSuffix
-	devel:libcrypto$secondaryArchSuffix
-	devel:libexecinfo$secondaryArchSuffix
-	devel:libfontconfig$secondaryArchSuffix
-	devel:libfreehand_0.1$secondaryArchSuffix
-	devel:libfreetype$secondaryArchSuffix
-	devel:libGL$secondaryArchSuffix
-	devel:libharfbuzz_icu$secondaryArchSuffix
-	devel:libhunspell_1.7$secondaryArchSuffix
-	devel:libhyphen$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-	devel:liblcms2$secondaryArchSuffix
-	devel:libmspub_0.1$secondaryArchSuffix
-	devel:libpagemaker_0.0$secondaryArchSuffix
-	devel:libpng16$secondaryArchSuffix
-	devel:libpodofo$secondaryArchSuffix
-	devel:libpoppler$secondaryArchSuffix >= 104
-	devel:libpython3.9$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libqxp_0.0$secondaryArchSuffix
-	devel:librevenge_0.0$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
-	devel:libtiff$secondaryArchSuffix
-	devel:libvisio_0.1$secondaryArchSuffix
-	devel:libxml2$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	devel:libzmf_0.0$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:lrelease$secondaryArchSuffix >= 5
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:python3.9
-	"
-
-BUILD()
-{
-	cmake . -DCMAKE_INSTALL_PREFIX=$appsDir/Scribus \
-		-DEXECUTABLE_OUTPUT_PATH=$appsDir/Scribus \
-		-DPLUGINDIR=$appsDir/Scribus/plugins \
-		-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
-		-DSHAREDIR=$dataDir \
-		-DFONTCONFIG_INCLUDE_DIRS=/system/$relativeIncludeDir \
-		-DFONTCONFIG_LIBRARY_DIRS=/system/$relativeDevelopLibDir \
-		-DCAIRO_INCLUDE_DIRS=/system/$relativeIncludeDir/cairo \
-		-DCAIRO_LIBRARY_DIRS=/system/$relativeDevelopLibDir \
-		-DAPPLICATION_DATA_DIR="config/settings/Scribus" \
-		-DWANT_DISTROBUILD=1 \
-		-DWANT_CPP11=1 \
-		-DLIB_SUFFIX="$secondaryArchSuffix"
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	mv $appsDir/Scribus/scribus $appsDir/Scribus/Scribus
-	rm -rf $appsDir/Scribus/bin
-
-	local APP_SIGNATURE="application/x-vnd.scribus"
-	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
-	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3`"
-	local LONG_INFO="$SUMMARY"
-	sed \
-		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
-		-e "s|@MAJOR@|$MAJOR|" \
-		-e "s|@MIDDLE@|$MIDDLE|" \
-		-e "s|@MINOR@|$MINOR|" \
-		-e "s|@LONG_INFO@|$LONG_INFO|" \
-		$portDir/additional-files/scribus.rdef.in > $sourceDir/scribus.rdef
-
-	addResourcesToBinaries $sourceDir/scribus.rdef $appsDir/Scribus/Scribus
-	addAppDeskbarSymlink $appsDir/Scribus/Scribus Scribus
-}
--- a/app-office/scribus/scribus-1.5.7.recipe
+++ b/app-office/scribus/scribus-1.5.7.recipe
@@ -9,7 +9,7 @@ versatile PDF creation."
 HOMEPAGE="https://www.scribus.net"
 COPYRIGHT="2014-2021 Scribus Team"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://sourceforge.net/projects/scribus/files/scribus-devel/$portVersion/scribus-$portVersion.tar.xz"
 CHECKSUM_SHA256="318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce"
 PATCHES="scribus-$portVersion.patchset"
@@ -43,7 +43,7 @@ REQUIRES="
 	lib:libpng16$secondaryArchSuffix
 	lib:libpodofo$secondaryArchSuffix
 	lib:libpoppler$secondaryArchSuffix
-	lib:libpython3.9$secondaryArchSuffix
+	lib:libpython3.7m$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Network$secondaryArchSuffix
@@ -86,7 +86,7 @@ BUILD_REQUIRES="
 	devel:libpng16$secondaryArchSuffix
 	devel:libpodofo$secondaryArchSuffix
 	devel:libpoppler$secondaryArchSuffix >= 104
-	devel:libpython3.9$secondaryArchSuffix
+	devel:libpython3.7m$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libqxp_0.0$secondaryArchSuffix
 	devel:librevenge_0.0$secondaryArchSuffix
@@ -104,7 +104,7 @@ BUILD_PREREQUIRES="
 	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:python3.9
+	cmd:python3
 	"

 BUILD()