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)
