forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
app-office/scribus: in 1.6.1 squashed findhyphen patches and backport…
…ed some patches from live Signed-off-by: Miroslav Šulc <[email protected]>
- Loading branch information
Showing
2 changed files
with
73 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
--- a/CMakeLists_Dependencies.cmake | ||
+++ b/CMakeLists_Dependencies.cmake | ||
@@ -1,6 +1,16 @@ | ||
############################################################################################################## | ||
########## Find Dependencies ########## | ||
|
||
+#<<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 | ||
+++ b/scribus/CMakeLists.txt | ||
@@ -585,7 +585,9 @@ set(SCRIBUS_SOURCES | ||
${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} | ||
@@ -676,12 +678,6 @@ if(HAVE_PODOFO) | ||
|
||
endif() | ||
|
||
-if(HAVE_HYPHEN) | ||
- target_link_libraries(${EXE_NAME} PRIVATE | ||
- ${HYPHEN_LIBRARY} | ||
- ) | ||
-endif() | ||
- | ||
|
||
if(GESTURE_FRAME_PREVIEW) | ||
message(STATUS "Enable gesture frame preview [experimental]") | ||
@@ -741,6 +737,12 @@ if(WANT_PCH) | ||
target_precompile_headers(${EXE_NAME} PRIVATE scribus_pch.h) | ||
endif() | ||
|
||
+if(HAVE_HYPHEN) | ||
+ target_link_libraries(${EXE_NAME} PRIVATE | ||
+ ${HYPHEN_LIBRARY} | ||
+ ) | ||
+endif() | ||
+ | ||
if(WIN32) | ||
set_target_properties(${EXE_NAME} | ||
PROPERTIES | ||
--- a/scribus/hyphenator.h | ||
+++ b/scribus/hyphenator.h | ||
@@ -13,7 +13,7 @@ for which a new license (GPL+exception) is in place. | ||
#include <QSet> | ||
|
||
#include "scribusapi.h" | ||
-#include "third_party/hyphen/hyphen.h" | ||
+#include <hyphen.h> | ||
|
||
class ScribusDoc; | ||
class ScribusMainWindow; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters