haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Scribus: Disable python scripting plugin

Browse Source 
* For scripting plugin required python 2.7 but it missing for x86_gcc2
arch
This commit is contained in:
Gerasim Troeglazov
2018-05-10 21:18:00 +10:00
parent 4e612ce2f6
commit 4af6138b77
2 changed files with 61 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
app-office/scribus/patches/scribus-1.5.2_python_disable.patchset Normal file
View File

@@ -0,0 +1,54 @@
From 365ad3f760d1a00c9bd02215de122b32099c16ef Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 8 May 2018 23:50:45 +1000
Subject: Disable python scripting plugin
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ef8100..a361806 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -710,7 +710,7 @@ ENDIF(TIFF_FOUND)
#<< PYTHON
#SET(PythonLibs_FIND_VERSION 2)
-FIND_PACKAGE(PythonLibs 2 REQUIRED)
+FIND_PACKAGE(PythonLibs 2)
IF (PYTHON_LIBRARY)
MESSAGE("Python Library Found OK")
SET(HAVE_PYTHON 1)
diff --git a/scribus/CMakeLists.txt b/scribus/CMakeLists.txt
index 718b6ee..64e10b3 100644
--- a/scribus/CMakeLists.txt
+++ b/scribus/CMakeLists.txt
@@ -1216,7 +1216,7 @@ TARGET_LINK_LIBRARIES(${EXE_NAME}
${FREETYPE_LIBRARIES}
${FONTCONFIG_LIBRARIES}
${LIBXML2_LIBRARIES}
- ${PYTHON_LIBRARIES}
+# ${PYTHON_LIBRARIES}
${TIFF_LIBRARIES}
${JPEG_LIBRARIES}
${ZLIB_LIBRARIES}
diff --git a/scribus/plugins/CMakeLists.txt b/scribus/plugins/CMakeLists.txt
index 733acc1..3e3d444 100644
--- a/scribus/plugins/CMakeLists.txt
+++ b/scribus/plugins/CMakeLists.txt
@@ -11,12 +11,12 @@ IF(NOT WANT_SCRIPTER2)
#scripter1
IF(NOT WIN32)
MESSAGE(STATUS "Building with Scripter 1")
- ADD_SUBDIRECTORY(scriptplugin)
+# ADD_SUBDIRECTORY(scriptplugin)
ENDIF(NOT WIN32)
ELSE(NOT WANT_SCRIPTER2)
#scripter2
MESSAGE(STATUS "Building with Scripter 2")
- ADD_SUBDIRECTORY(scripter)
+# ADD_SUBDIRECTORY(scripter)
ENDIF(NOT WANT_SCRIPTER2)
ADD_SUBDIRECTORY(short-words)
ADD_SUBDIRECTORY(tools)
--
2.16.2

13
app-office/scribus/scribus-1.5.2.recipe
View File

@@ -9,10 +9,13 @@ versatile PDF creation."
HOMEPAGE="http://www.scribus.net"
COPYRIGHT="2014-2017 Scribus Team"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="http://downloads.sourceforge.net/project/scribus/scribus-devel/$portVersion/scribus-$portVersion.tar.xz"
CHECKSUM_SHA256="ec5eec23aeda655d3a761cffb85853dcd2ede3973b9e62a1b3c28bd1093c74f5"
PATCHES="scribus-$portVersion.patchset"
PATCHES="scribus-$portVersion.patchset
scribus-$portVersion_python_disable.patchset
"
ADDITIONAL_FILES="scribus.rdef.in"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
@@ -23,7 +26,7 @@ PROVIDES="
app:Scribus
"
REQUIRES="
haiku$secondaryArchSuffix
haiku$secondaryArchSuffix
lib:libcairo$secondaryArchSuffix
lib:libcdr_0.1$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
@@ -41,7 +44,6 @@ REQUIRES="
lib:libpagemaker_0.0${secondaryArchSuffix}
lib:libpodofo$secondaryArchSuffix
lib:libpoppler$secondaryArchSuffix
lib:libpython2.7$secondaryArchSuffix
lib:librevenge_0.0${secondaryArchSuffix}
lib:librevenge_generators_0.0${secondaryArchSuffix}
lib:librevenge_stream_0.0${secondaryArchSuffix}
@@ -63,7 +65,7 @@ REQUIRES="
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
haiku${secondaryArchSuffix}_devel
devel:libboost_system${secondaryArchSuffix}
devel:libcairo$secondaryArchSuffix >= 2.11400
devel:libcrypto$secondaryArchSuffix
@@ -80,7 +82,6 @@ BUILD_REQUIRES="
devel:libpagemaker_0.0$secondaryArchSuffix
devel:libpodofo$secondaryArchSuffix
devel:libpoppler$secondaryArchSuffix
devel:libpython2.7$secondaryArchSuffix
devel:libmspub_0.1$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5Gui$secondaryArchSuffix