scribus: use libpython3.so

the static python library cannot find the python root directory.
This commit is contained in:
Jerome Duval
2021-11-22 21:02:26 +01:00
parent 72c1b5431b
commit 11af3b61a0
2 changed files with 27 additions and 9 deletions

View File

@@ -1,4 +1,4 @@
From 77e723de9ed4ada3df11e6e7eea4964bb844b630 Mon Sep 17 00:00:00 2001
From 8c5ce2814d6ac6889dba5d11b041bc530736765e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 16 Nov 2020 21:51:24 +1000
Subject: Fix build
@@ -106,7 +106,7 @@ index 5adfab7..ebf0bdb 100644
2.30.2
From f3e7d20b9428a20afadbcb324419b15858dcfbcb Mon Sep 17 00:00:00 2001
From 62b59b80636fc7a3cab25ac5a3b79672ae5457db Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 8 Jan 2021 22:00:46 +1000
Subject: Fix for app font
@@ -165,3 +165,25 @@ index 7deca71..e6e16a6 100644
--
2.30.2
From 7e43f0330e65ebb944f859a6c6152da53fc35c25 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 22 Nov 2021 20:40:09 +0100
Subject: Prefer the shared libpython3
diff --git a/CMakeLists_Dependencies.cmake b/CMakeLists_Dependencies.cmake
index 4006cba..7b940a6 100644
--- a/CMakeLists_Dependencies.cmake
+++ b/CMakeLists_Dependencies.cmake
@@ -150,6 +150,7 @@ endif()
#<< PYTHON
if (NOT WANT_PYTHON_2X)
message("Python 3.x Selected")
+ set (Python3_USE_STATIC_LIBS FALSE)
find_package (Python3 REQUIRED COMPONENTS Interpreter Development)
if (Python3_Development_FOUND)
message("Python 3.x Library Found OK (Version ${Python3_VERSION})")
--
2.30.2

View File

@@ -9,7 +9,7 @@ versatile PDF creation."
HOMEPAGE="https://www.scribus.net"
COPYRIGHT="2014-2021 Scribus Team"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="3"
SOURCE_URI="https://sourceforge.net/projects/scribus/files/scribus-devel/$portVersion/scribus-$portVersion.tar.xz"
CHECKSUM_SHA256="318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce"
PATCHES="scribus-$portVersion.patchset"
@@ -109,18 +109,14 @@ BUILD_PREREQUIRES="
BUILD()
{
cmake . -DCMAKE_INSTALL_PREFIX=$appsDir/Scribus \
cmake . -DCMAKE_BUILD_TYPE=Release \
-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
}