scribus ver. bump

2026-02-21 21:12:11 +03:00
parent 81a5152500
commit 2afacbd1b5
19 changed files with 126 additions and 945 deletions
@@ -1,19 +0,0 @@
--- a/CMakeLists_Dependencies.cmake	2019-07-31 00:34:43.000000000 +0200
-+++ b/CMakeLists_Dependencies.cmake	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)
@@ -1,54 +0,0 @@
-diff --git a/scribus/CMakeLists.txt b/scribus/CMakeLists.txt
-index aec69d3..9451404 100644
--- a/scribus/CMakeLists.txt
-+++ b/scribus/CMakeLists.txt
-@@ -587,7 +587,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}
-@@ -678,12 +680,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]")
-@@ -743,6 +739,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
-diff --git a/scribus/hyphenator.h b/scribus/hyphenator.h
-index 7fa4abd..2863c70 100644
--- 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;