diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-11-08 21:11:10 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-11-08 21:13:10 +0100 |
commit | f720773f7aa3c2da8bf8b28b5080e84857c7525f (patch) | |
tree | ace2918b5b372fb0a6dd0710cc0f09669fcef45e /app-office/scribus/files/scribus-1.5.5-findhyphen.patch | |
parent | www-client/vivaldi-snapshot: Old (diff) | |
download | gentoo-f720773f7aa3c2da8bf8b28b5080e84857c7525f.tar.gz gentoo-f720773f7aa3c2da8bf8b28b5080e84857c7525f.tar.bz2 gentoo-f720773f7aa3c2da8bf8b28b5080e84857c7525f.zip |
app-office/scribus: Sync 9999 with most recent 1.5.5 changes
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office/scribus/files/scribus-1.5.5-findhyphen.patch')
-rw-r--r-- | app-office/scribus/files/scribus-1.5.5-findhyphen.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen.patch b/app-office/scribus/files/scribus-1.5.5-findhyphen.patch deleted file mode 100644 index 13c168c51f50..000000000000 --- a/app-office/scribus/files/scribus-1.5.5-findhyphen.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- a/CMakeLists.txt 2019-07-31 00:34:43.000000000 +0200 -+++ b/CMakeLists.txt 2019-10-02 00:17:34.968355656 +0200 -@@ -954,6 +954,16 @@ - endif() - #>>HUNSPELL for Speelling support - -+#<<HYPHEN for Hyphenation support -+find_package(HYPHEN) -+if(HYPHEN_FOUND) -+ message("System Hyphen Found OK") -+ set(HAVE_HYPHEN ON) -+else() -+ message("Hyphen or its developer libraries NOT found - using bundled Hyphen instead") -+endif() -+#>>HYPHEN for Hyphenation support -+ - #<<PoDoFo for AI PDF import - option(WITH_PODOFO "Enable support for PDF embedded in AI" ON) - if (WITH_PODOFO) ---- a/scribus/CMakeLists.txt 2019-10-02 00:25:01.194386515 +0200 -+++ b/scribus/CMakeLists.txt 2019-10-02 00:26:23.584392213 +0200 -@@ -1069,7 +1069,9 @@ - ${SCRIBUS_GMAGICK_SRC} - ) - --if(NOT HAVE_HYPHEN) -+if(HAVE_HYPHEN) -+ include_directories(${HYPHEN_INCLUDE_DIR}) -+else() - include_directories(third_party/hyphen) - set(SCRIBUS_SOURCES - ${SCRIBUS_SOURCES} -@@ -1180,13 +1182,6 @@ - - endif() - --if(HAVE_HYPHEN) -- target_link_libraries(${EXE_NAME} -- ${HYPHEN_LIBRARY} -- ) --endif() -- -- - if(GESTURE_FRAME_PREVIEW) - message(STATUS "Enable gesture frame preview [experimental]") - set(GESTURE_FRAME_PREVIEW_SOURCES pageitempreview.cpp) -@@ -1234,6 +1229,12 @@ - ) - endif () - -+if(HAVE_HYPHEN) -+ target_link_libraries(${EXE_NAME} -+ ${HYPHEN_LIBRARY} -+ ) -+endif() -+ - if(WIN32) - set_target_properties(${EXE_NAME} - PROPERTIES ---- a/scribus/hyphenator.h 2019-07-31 00:35:05.000000000 +0200 -+++ b/scribus/hyphenator.h 2019-10-02 00:00:42.497285638 +0200 -@@ -13,7 +13,7 @@ - #include <QSet> - - #include "scribusapi.h" --#include "third_party/hyphen/hyphen.h" -+#include <hyphen.h> - - class ScribusDoc; - class ScribusMainWindow; |