scribus: update to 1.4.6; fix musl.

This commit is contained in:
Enno Boland 2016-01-11 15:40:15 +01:00
parent 628202458d
commit 938a604f18
2 changed files with 24 additions and 4 deletions

View file

@ -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 <signal.h>
-#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU)
+#ifdef __GLIBC__
#include <execinfo.h>
#include <cxxabi.h>
#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;

View file

@ -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 <gottox@voidlinux.eu>"
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