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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A8AEA158451 for ; Sun, 14 Jan 2024 10:24:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED129E29CE; Sun, 14 Jan 2024 10:24:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A3DDEE29CE for ; Sun, 14 Jan 2024 10:24:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E674034322D for ; Sun, 14 Jan 2024 10:24:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8089011A0 for ; Sun, 14 Jan 2024 10:24:20 +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: <1705227848.73525eaa3d3b87962d64d606a883fc84569b6f8e.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/files/scribus-1.6.1-findhyphen.patch app-office/scribus/scribus-1.6.1-r1.ebuild app-office/scribus/scribus-1.6.1.ebuild X-VCS-Directories: app-office/scribus/ app-office/scribus/files/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 73525eaa3d3b87962d64d606a883fc84569b6f8e X-VCS-Branch: master Date: Sun, 14 Jan 2024 10:24:20 +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: a1bf50d1-f075-4fee-8e83-e45967a46c04 X-Archives-Hash: d5b3fc19981013b737b5522af9fa9d2d commit: 73525eaa3d3b87962d64d606a883fc84569b6f8e Author: Miroslav Šulc gentoo org> AuthorDate: Sun Jan 14 10:22:34 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sun Jan 14 10:24:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73525eaa app-office/scribus: in 1.6.1 squashed findhyphen patches and backported some patches from live Signed-off-by: Miroslav Šulc gentoo.org> .../scribus/files/scribus-1.6.1-findhyphen.patch | 69 ++++++++++++++++++++++ ...cribus-1.6.1.ebuild => scribus-1.6.1-r1.ebuild} | 21 ++----- 2 files changed, 73 insertions(+), 17 deletions(-) diff --git a/app-office/scribus/files/scribus-1.6.1-findhyphen.patch b/app-office/scribus/files/scribus-1.6.1-findhyphen.patch new file mode 100644 index 000000000000..cc6e5db58a24 --- /dev/null +++ b/app-office/scribus/files/scribus-1.6.1-findhyphen.patch @@ -0,0 +1,69 @@ +--- a/CMakeLists_Dependencies.cmake ++++ b/CMakeLists_Dependencies.cmake +@@ -1,6 +1,16 @@ + ############################################################################################################## + ########## Find Dependencies ########## + ++#<>HYPHEN for Hyphenation support ++ + #< + + #include "scribusapi.h" +-#include "third_party/hyphen/hyphen.h" ++#include + + class ScribusDoc; + class ScribusMainWindow; diff --git a/app-office/scribus/scribus-1.6.1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild similarity index 88% rename from app-office/scribus/scribus-1.6.1.ebuild rename to app-office/scribus/scribus-1.6.1-r1.ebuild index 23dca9517e2f..6a80b0653e02 100644 --- a/app-office/scribus/scribus-1.6.1.ebuild +++ b/app-office/scribus/scribus-1.6.1-r1.ebuild @@ -72,31 +72,18 @@ BDEPEND=" " PATCHES=( - # non(?)-upstreamable "${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251 "${FILESDIR}"/${PN}-1.5.3-fpic.patch - "${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch - "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch + "${FILESDIR}"/${PN}-1.6.1-findhyphen.patch + "${FILESDIR}"/${PN}-1.7.0-remove-hello-world-test.patch + "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch ) src_prepare() { cmake_src_prepare + # for safety remove files that we patched out rm -r scribus/third_party/hyphen || die - - sed \ - -e "/^\s*unzip\.[ch]/d" \ - -e "/^\s*ioapi\.[ch]/d" \ - -i scribus/CMakeLists.txt Scribus.pro || die - rm scribus/ioapi.[ch] || die - - sed \ - -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ - -i resources/templates/CMakeLists.txt || die - - sed \ - -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \ - -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test } src_configure() {