From 938a604f184a76f28e593c3836febcaa925c8d5f Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 11 Jan 2016 15:40:15 +0100 Subject: [PATCH] scribus: update to 1.4.6; fix musl. --- srcpkgs/scribus/patches/fix-musl.patch | 20 ++++++++++++++++++++ srcpkgs/scribus/template | 8 ++++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/scribus/patches/fix-musl.patch diff --git a/srcpkgs/scribus/patches/fix-musl.patch b/srcpkgs/scribus/patches/fix-musl.patch new file mode 100644 index 00000000000..6df9a2da2b4 --- /dev/null +++ b/srcpkgs/scribus/patches/fix-musl.patch @@ -0,0 +1,20 @@ +--- 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) + + #include + +-#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU) ++#ifdef __GLIBC__ + #include + #include + #endif +@@ -947,7 +947,7 @@ void getDashArray(int dashtype, double l + */ + 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__ + void ** trace = new void*[nFrames + 1]; + char **messages = ( char ** ) NULL; + int i, trace_size = 0; diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template index 099ed46f0d0..d0960b766e7 100644 --- a/srcpkgs/scribus/template +++ b/srcpkgs/scribus/template @@ -1,7 +1,7 @@ # Template file for 'scribus' pkgname=scribus -version=1.4.5 -revision=2 +version=1.4.6 +revision=1 build_style=cmake hostmakedepends="cmake pkg-config" makedepends="qt-devel zlib-devel cairo-devel lcms2-devel cups-devel libxml2-devel @@ -11,8 +11,8 @@ short_desc="Open Source DTP (Desktop Publishing) application" maintainer="Enno Boland " license="GPL-2" homepage="http://scribus.net" -distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname/$version/$pkgname-$version.tar.bz2" -checksum=9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 +distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname/$version/$pkgname-$version.tar.xz" +checksum=21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a pre_configure() { sed -i 's#^Icon=scribus#^Icon=/usr/share/scribus/icons/scribus.png#' scribus.desktop