summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2021-08-25 12:54:06 +0200
committerMiroslav Šulc <fordfrog@gentoo.org>2021-08-25 12:54:23 +0200
commit1550f728b6232a6698a4a63eed49070ee3a2ec4a (patch)
treebee3a9d9bdbe22af205a8d648f58ce068e80ae9e /app-office/scribus
parentkde-misc/tellico: 3.4.1 version bump (diff)
downloadgentoo-1550f728b6232a6698a4a63eed49070ee3a2ec4a.tar.gz
gentoo-1550f728b6232a6698a4a63eed49070ee3a2ec4a.tar.bz2
gentoo-1550f728b6232a6698a4a63eed49070ee3a2ec4a.zip
app-office/scribus: updated a patch for live
Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'app-office/scribus')
-rw-r--r--app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch54
-rw-r--r--app-office/scribus/scribus-9999.ebuild2
2 files changed, 55 insertions, 1 deletions
diff --git a/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch b/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch
new file mode 100644
index 00000000000..39a11b0ee4a
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch
@@ -0,0 +1,54 @@
+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;
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index d3fee462bba..9ee1a1dcf52 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -76,7 +76,7 @@ PATCHES=(
# non(?)-upstreamable
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
"${FILESDIR}"/${PN}-1.5.6-docdir.patch
- "${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch
+ "${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
)