diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:19:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 23:22:23 +0100 |
commit | 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch) | |
tree | 76e74807bc479502e13866b581b6bf86734ec634 /app-office/scribus/files/scribus-1.5.5-findhyphen.patch | |
parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) |
gentoo resync : 13.10.2019
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, 70 insertions, 0 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 new file mode 100644 index 000000000000..13c168c51f50 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.5-findhyphen.patch @@ -0,0 +1,70 @@ +--- 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; |