Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 635072 Details for
Bug 719938
app-office/scribus-1.5.5-r1: Fix building with USE=-scripts without python (and thereby python 2)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to upstream cmake files to truly make python optional
scribus-1.5.5-optionalpython.patch (text/plain), 1.05 KB, created by
Jesper Saxtorph
on 2020-04-28 14:56:38 UTC
(
hide
)
Description:
Patch to upstream cmake files to truly make python optional
Filename:
MIME Type:
Creator:
Jesper Saxtorph
Created:
2020-04-28 14:56:38 UTC
Size:
1.05 KB
patch
obsolete
>--- a/CMakeLists.txt 2020-04-28 15:29:38.730561529 +0200 >+++ b/CMakeLists.txt 2020-04-28 15:44:21.899330662 +0200 >@@ -848,13 +848,17 @@ > #<< JPEG, TIFF > > #<< PYTHON >-#set(PythonLibs_FIND_VERSION 2) >-find_package(PythonInterp 2) >-find_package(PythonLibs 2 REQUIRED) >-if (PYTHON_LIBRARY) >- message("Python Library Found OK") >- set(HAVE_PYTHON ON) >- set(COMPILE_PYTHON ON) >+if (HAVE_PYTHON OR NOT DEFINED HAVE_PYTHON) >+ #set(PythonLibs_FIND_VERSION 2) >+ find_package(PythonInterp 2) >+ find_package(PythonLibs 2 REQUIRED) >+ if (PYTHON_LIBRARY) >+ message("Python Library Found OK") >+ set(HAVE_PYTHON ON) >+ set(COMPILE_PYTHON ON) >+ endif() >+else() >+ set(COMPILE_PYTHON OFF) > endif() > #>> PYTHON > >--- a/scribus/plugins/CMakeLists.txt 2020-04-28 15:52:25.959316216 +0200 >+++ b/scribus/plugins/CMakeLists.txt 2020-04-28 16:10:26.680722442 +0200 >@@ -9,7 +9,7 @@ > add_subdirectory(saveastemplateplugin) > if(NOT WANT_SCRIPTER2) > #scripter1 >- if(NOT WIN32) >+ if(HAVE_PYTHON AND NOT WIN32) > message(STATUS "Building with Scripter 1") > add_subdirectory(scriptplugin) > endif()
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 719938
: 635072 |
635074