moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

scribus: update to 1.5.5.

Browse source
This commit is contained in:
John 2019-09-17 22:44:17 +02:00 • committed by John Zimmermann
parent e48983e43d
commit fb720c4b79
2 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
srcpkgs/scribus/patches/fix-musl.patch
View file

@ -1,20 +1,31 @@
--- scribus/util.cpp.orig 2016-01-11 15:35:18.171968184 +0100 --- scribus/util.cpp 2019-07-31 00:35:04.000000000 +0200
+++ scribus/util.cpp 2016-01-11 15:35:53.600967308 +0100 +++ - 2019-09-17 22:29:18.301884583 +0200
@@ -37,7 +37,7 @@ for which a new license (GPL+exception) @@ -40,7 +40,7 @@
#include <signal.h> #include <csignal>
-#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU) -#if !defined(_WIN32) && !defined(Q_OS_MAC)
+#ifdef __GLIBC__ +#if defined(__GLIBC__)
#include <execinfo.h> #include <execinfo.h>
#include <cxxabi.h> #include <cxxabi.h>
#endif #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 <QDateTime>
#include <QtGlobal>
-#if !defined(_WIN32) && !defined(Q_OS_MAC)
+#if defined(__GLIBC__)
#include <execinfo.h>
#include <cxxabi.h>
#endif
@@ -54,7 +54,7 @@
*/ */
void printBacktrace ( int nFrames ) void printBacktrace ( int nFrames )
{ {
-#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_FREEBSD) && !defined(Q_OS_HAIKU) -#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_FREEBSD)
+#ifdef __GLIBC__ +#if defined(__GLIBC__)
void ** trace = new void*[nFrames + 1]; void ** trace = new void*[nFrames + 1];
char **messages = ( char ** ) NULL; char **messages = ( char ** ) nullptr;
int i, trace_size = 0; int i, trace_size = 0;

22
srcpkgs/scribus/template
View file

@ -1,26 +1,22 @@
# Template file for 'scribus' # Template file for 'scribus'
pkgname=scribus pkgname=scribus
version=1.4.8 version=1.5.6.1
revision=1 revision=1
build_style=cmake build_style=cmake
hostmakedepends="pkg-config qt-devel" configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr"
makedepends="qt-devel zlib-devel cairo-devel lcms2-devel cups-devel libxml2-devel hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3"
hyphen-devel ghostscript-devel boost-devel python-devel" 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 python3-devel harfbuzz-devel"
depends="ghostscript" depends="ghostscript"
short_desc="Open Source DTP (Desktop Publishing) application" short_desc="Open Source DTP (Desktop Publishing) application"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="https://scribus.net" homepage="https://scribus.net"
distfiles="$SOURCEFORGE_SITE/scribus/scribus/${version}/scribus-${version}.tar.xz" distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz"
checksum=22253bb5994023f39608b37c57c7cd0280059fd97d2a4d71d4011aeeeb18042f checksum=d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab
python_version=2 #unverified python_version=3
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() { post_install() {
vinstall scribus.desktop 644 usr/share/applications
rm -rf ${DESTDIR}/usr/include rm -rf ${DESTDIR}/usr/include
} }