From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] scribus: update to 1.5.5.
Date: Sat, 30 Jan 2021 21:14:29 +0100 [thread overview]
Message-ID: <20210130201429.HFrOxpV39yVSVBUaWktuaFhRTCydCy50jp_lVeyo_mI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14536@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages scribus
https://github.com/void-linux/void-packages/pull/14536
[WIP] scribus: update to 1.5.5.
updae to a devel version to not depend on qt-4 anymore
A patch file from https://github.com/void-linux/void-packages/pull/14536.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scribus-14536.patch --]
[-- Type: text/x-diff, Size: 3677 bytes --]
From df5d6df30825170b302fe7281ee18a7602ce22e0 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
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 <signal.h>
+ #include <csignal>
--#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU)
-+#ifdef __GLIBC__
+-#if !defined(_WIN32) && !defined(Q_OS_MAC)
++#if defined(__GLIBC__)
#include <execinfo.h>
#include <cxxabi.h>
#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 )
{
--#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 <gottox@voidlinux.org>"
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
}
next prev parent reply other threads:[~2021-01-30 20:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-17 20:44 [PR PATCH] " voidlinux-github
2019-09-18 8:57 ` [PR PATCH] [Updated] [WIP] " voidlinux-github
2019-09-18 8:57 ` voidlinux-github
2019-09-22 13:55 ` voidlinux-github
2019-09-22 13:56 ` voidlinux-github
2020-11-01 2:08 ` ericonr
2020-11-03 9:20 ` Piraty
2021-01-30 20:14 ` Johnnynator [this message]
2021-01-30 20:25 ` [PR PATCH] [Updated] " Johnnynator
2021-01-31 2:00 ` [PR PATCH] [Merged]: " Johnnynator
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210130201429.HFrOxpV39yVSVBUaWktuaFhRTCydCy50jp_lVeyo_mI@z \
--to=johnnynator@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).