From df5d6df30825170b302fe7281ee18a7602ce22e0 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 17 Sep 2019 22:44:17 +0200 Subject: [PATCH] scribus: update to 1.5.5. --- srcpkgs/scribus/patches/fix-musl.patch | 31 +++++++++++++++++--------- srcpkgs/scribus/template | 20 +++++++---------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/srcpkgs/scribus/patches/fix-musl.patch b/srcpkgs/scribus/patches/fix-musl.patch index 6df9a2da2b4..36bb71e62a9 100644 --- a/srcpkgs/scribus/patches/fix-musl.patch +++ b/srcpkgs/scribus/patches/fix-musl.patch @@ -1,20 +1,31 @@ ---- scribus/util.cpp.orig 2016-01-11 15:35:18.171968184 +0100 -+++ scribus/util.cpp 2016-01-11 15:35:53.600967308 +0100 -@@ -37,7 +37,7 @@ for which a new license (GPL+exception) +--- scribus/util.cpp 2019-07-31 00:35:04.000000000 +0200 ++++ - 2019-09-17 22:29:18.301884583 +0200 +@@ -40,7 +40,7 @@ - #include + #include --#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU) -+#ifdef __GLIBC__ +-#if !defined(_WIN32) && !defined(Q_OS_MAC) ++#if defined(__GLIBC__) #include #include #endif -@@ -947,7 +947,7 @@ void getDashArray(int dashtype, double l +--- scribus/util_debug.cpp 2019-07-31 00:35:07.000000000 +0200 ++++ - 2019-09-17 22:30:10.159216480 +0200 +@@ -24,7 +24,7 @@ + #include + #include + +-#if !defined(_WIN32) && !defined(Q_OS_MAC) ++#if defined(__GLIBC__) + #include + #include + #endif +@@ -54,7 +54,7 @@ */ void printBacktrace ( int nFrames ) { --#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_FREEBSD) && !defined(Q_OS_HAIKU) -+#ifdef __GLIBC__ +-#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_FREEBSD) ++#if defined(__GLIBC__) void ** trace = new void*[nFrames + 1]; - char **messages = ( char ** ) NULL; + char **messages = ( char ** ) nullptr; int i, trace_size = 0; diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template index c96ce332eb3..cca1bfeaee0 100644 --- a/srcpkgs/scribus/template +++ b/srcpkgs/scribus/template @@ -1,26 +1,22 @@ # Template file for 'scribus' pkgname=scribus -version=1.4.8 +version=1.5.6.1 revision=1 build_style=cmake -hostmakedepends="pkg-config qt-devel" -makedepends="qt-devel zlib-devel cairo-devel lcms2-devel cups-devel libxml2-devel - hyphen-devel ghostscript-devel boost-devel python-devel" +configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr" +hostmakedepends="pkg-config qt5-qmake qt5-host-tools" +makedepends="qt5-devel qt5-tools-devel zlib-devel cairo-devel lcms2-devel + cups-devel libxml2-devel hyphen-devel ghostscript-devel boost-devel + hunspell-devel poppler-cpp-devel python-devel harfbuzz-devel" depends="ghostscript" short_desc="Open Source DTP (Desktop Publishing) application" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://scribus.net" -distfiles="$SOURCEFORGE_SITE/scribus/scribus/${version}/scribus-${version}.tar.xz" -checksum=22253bb5994023f39608b37c57c7cd0280059fd97d2a4d71d4011aeeeb18042f +distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz" +checksum=d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab python_version=2 #unverified -nocross="https://travis-ci.org/void-linux/void-packages/jobs/504239118" - -pre_configure() { - sed -i 's#^Icon=scribus#^Icon=/usr/share/scribus/icons/scribus.png#' scribus.desktop -} post_install() { - vinstall scribus.desktop 644 usr/share/applications rm -rf ${DESTDIR}/usr/include }