From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1156260-garchives=archives.gentoo.org@lists.gentoo.org>
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 75984138350
for <garchives@archives.gentoo.org>; Fri, 27 Mar 2020 10:08:46 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 63EC0E0E6A;
Fri, 27 Mar 2020 10:08:24 +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 4A40CE0E6A
for <gentoo-commits@lists.gentoo.org>; Fri, 27 Mar 2020 10:08:24 +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 ED24934F9C4
for <gentoo-commits@lists.gentoo.org>; Fri, 27 Mar 2020 10:08:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 75814186
for <gentoo-commits@lists.gentoo.org>; Fri, 27 Mar 2020 10:08:21 +0000 (UTC)
From: "Miroslav Šulc" <fordfrog@gentoo.org>
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" <fordfrog@gentoo.org>
Message-ID: <1585303684.624ba2504e489972a8d5c511628352bcc8748803.fordfrog@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/scribus/scribus-9999.ebuild
X-VCS-Directories: app-office/scribus/
X-VCS-Committer: fordfrog
X-VCS-Committer-Name: Miroslav Šulc
X-VCS-Revision: 624ba2504e489972a8d5c511628352bcc8748803
X-VCS-Branch: master
Date: Fri, 27 Mar 2020 10:08:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 079d6065-926d-4a57-8898-3b1e217c62fc
X-Archives-Hash: 31e070cf08a31efc8a142d6335cfb342
commit: 624ba2504e489972a8d5c511628352bcc8748803
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Tue Mar 24 18:53:16 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 27 10:08:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624ba250
app-office/scribus: fix startup crash
The patch fixes the crash on startup, as well as a zlib package
finding related issue in src_configure. It also solves an issue
whith selecting the correct python implementation.
Bug: https://bugs.gentoo.rog/691684
Package-Manager: Portage-2.3.95, Repoman-2.3.21
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://bugs.gentoo.org/691684
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
app-office/scribus/scribus-9999.ebuild | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 97d62f8d370..9d0977e8bd7 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -80,18 +80,13 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
)
+CMAKE_BUILD_TYPE="Release"
+
src_prepare() {
cmake_src_prepare
rm -r codegen/cheetah scribus/third_party/hyphen || die
- cat > cmake/modules/FindZLIB.cmake <<- EOF || die
- find_package(PkgConfig)
- pkg_check_modules(ZLIB minizip zlib)
- SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
- SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
- MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
- EOF
sed \
-e "/^\s*unzip\.[ch]/d" \
-e "/^\s*ioapi\.[ch]/d" \
@@ -115,6 +110,7 @@ src_configure() {
-DHAVE_PYTHON=ON
-DWANT_DISTROBUILD=ON
-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+ -DPython3_EXECUTABLE="${PYTHON}"
-DWITH_BOOST=$(usex boost)
-DWANT_DEBUG=$(usex debug)
-DWANT_NOEXAMPLES=$(usex !examples)