From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CCE011580B9 for ; Wed, 25 Aug 2021 10:54:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3C1FE0872; Wed, 25 Aug 2021 10:54:28 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C821EE0872 for ; Wed, 25 Aug 2021 10:54:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9FD1A335D8B for ; Wed, 25 Aug 2021 10:54:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A16557B4 for ; Wed, 25 Aug 2021 10:54:25 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1629888863.1550f728b6232a6698a4a63eed49070ee3a2ec4a.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch app-office/scribus/scribus-9999.ebuild X-VCS-Directories: app-office/scribus/files/ app-office/scribus/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 1550f728b6232a6698a4a63eed49070ee3a2ec4a X-VCS-Branch: master Date: Wed, 25 Aug 2021 10:54:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1e3360ac-43f8-4b21-969e-7593e18fe143 X-Archives-Hash: e372a748502f52704466a5d557eb2c05 commit: 1550f728b6232a6698a4a63eed49070ee3a2ec4a Author: Miroslav Šulc gentoo org> AuthorDate: Wed Aug 25 10:54:06 2021 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Aug 25 10:54:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1550f728 app-office/scribus: updated a patch for live Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> .../scribus/files/scribus-1.5.8-findhyphen-1.patch | 54 ++++++++++++++++++++++ app-office/scribus/scribus-9999.ebuild | 2 +- 2 files changed, 55 insertions(+), 1 deletion(-) 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 + + #include "scribusapi.h" +-#include "third_party/hyphen/hyphen.h" ++#include + + 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 )