* [PR PATCH] scribus: update to 1.5.5.
@ 2019-09-17 20:44 voidlinux-github
2019-09-18 8:57 ` [PR PATCH] [Updated] [WIP] " voidlinux-github
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: voidlinux-github @ 2019-09-17 20:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 372 bytes --]
There is a new 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
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: 3565 bytes --]
From 92e37cb1e76c99cc392e2fe4f39087bf3d345c52 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 | 17 ++++++--------
2 files changed, 28 insertions(+), 20 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 d52bf3abe63..9ed116bc83f 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,25 +1,22 @@
# Template file for 'scribus'
pkgname=scribus
-version=1.4.8
+version=1.5.5
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"
+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=7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71
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
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] scribus: update to 1.5.5.
2019-09-17 20:44 [PR PATCH] scribus: update to 1.5.5 voidlinux-github
@ 2019-09-18 8:57 ` voidlinux-github
2019-09-18 8:57 ` voidlinux-github
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2019-09-18 8:57 UTC (permalink / raw)
To: ml
[-- 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: 3645 bytes --]
From ab494970e225c9cecf11eb06ce9c20598da0be3a 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 d52bf3abe63..5e5d0edefaf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,25 +1,21 @@
# Template file for 'scribus'
pkgname=scribus
-version=1.4.8
+version=1.5.5
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=7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71
-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
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] scribus: update to 1.5.5.
2019-09-17 20:44 [PR PATCH] scribus: update to 1.5.5 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
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2019-09-18 8:57 UTC (permalink / raw)
To: ml
[-- 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: 3645 bytes --]
From ab494970e225c9cecf11eb06ce9c20598da0be3a 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 d52bf3abe63..5e5d0edefaf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,25 +1,21 @@
# Template file for 'scribus'
pkgname=scribus
-version=1.4.8
+version=1.5.5
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=7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71
-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
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [WIP] scribus: update to 1.5.5.
2019-09-17 20:44 [PR PATCH] scribus: update to 1.5.5 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
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2019-09-22 13:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/14536#issuecomment-533884015
Comment:
"1.5.3 has a new text engine and scribus will not be able to ensure that the text flow will not change when opening files created with older version."
I can confirm that most of my projects break in that regard with this PR's update, but I was told by a dev we just have to live with it, because the changes bring much more benefits than this drawbackk.
+1 on this
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [WIP] scribus: update to 1.5.5.
2019-09-17 20:44 [PR PATCH] scribus: update to 1.5.5 voidlinux-github
` (2 preceding siblings ...)
2019-09-22 13:55 ` voidlinux-github
@ 2019-09-22 13:56 ` voidlinux-github
2020-11-01 2:08 ` ericonr
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2019-09-22 13:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/14536#issuecomment-533884122
Comment:
On the other hand, it should be possible to install multiple version in parallel...
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [WIP] scribus: update to 1.5.5.
2019-09-17 20:44 [PR PATCH] scribus: update to 1.5.5 voidlinux-github
` (3 preceding siblings ...)
2019-09-22 13:56 ` voidlinux-github
@ 2020-11-01 2:08 ` ericonr
2020-11-03 9:20 ` Piraty
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2020-11-01 2:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 146 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/14536#issuecomment-720015259
Comment:
ping?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [WIP] scribus: update to 1.5.5.
2019-09-17 20:44 [PR PATCH] scribus: update to 1.5.5 voidlinux-github
` (4 preceding siblings ...)
2020-11-01 2:08 ` ericonr
@ 2020-11-03 9:20 ` Piraty
2021-01-30 20:14 ` [PR PATCH] [Updated] " Johnnynator
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Piraty @ 2020-11-03 9:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/14536#issuecomment-720997842
Comment:
i won't block this
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] scribus: update to 1.5.5.
2019-09-17 20:44 [PR PATCH] scribus: update to 1.5.5 voidlinux-github
` (5 preceding siblings ...)
2020-11-03 9:20 ` Piraty
@ 2021-01-30 20:14 ` Johnnynator
2021-01-30 20:25 ` Johnnynator
2021-01-31 2:00 ` [PR PATCH] [Merged]: " Johnnynator
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2021-01-30 20:14 UTC (permalink / raw)
To: ml
[-- 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
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] scribus: update to 1.5.5.
2019-09-17 20:44 [PR PATCH] scribus: update to 1.5.5 voidlinux-github
` (6 preceding siblings ...)
2021-01-30 20:14 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-01-30 20:25 ` Johnnynator
2021-01-31 2:00 ` [PR PATCH] [Merged]: " Johnnynator
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2021-01-30 20:25 UTC (permalink / raw)
To: ml
[-- 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: 3705 bytes --]
From 73574c112165ecc3b7eb05817e1e8f94cb3098a3 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 | 22 ++++++++----------
2 files changed, 30 insertions(+), 23 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..868ec55590f 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 python3"
+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"
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
-python_version=2 #unverified
+distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz"
+checksum=d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab
+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() {
- vinstall scribus.desktop 644 usr/share/applications
rm -rf ${DESTDIR}/usr/include
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Merged]: [WIP] scribus: update to 1.5.5.
2019-09-17 20:44 [PR PATCH] scribus: update to 1.5.5 voidlinux-github
` (7 preceding siblings ...)
2021-01-30 20:25 ` Johnnynator
@ 2021-01-31 2:00 ` Johnnynator
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2021-01-31 2:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
There's a merged pull request on the void-packages repository
[WIP] scribus: update to 1.5.5.
https://github.com/void-linux/void-packages/pull/14536
Description:
updae to a devel version to not depend on qt-4 anymore
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-01-31 2:00 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-17 20:44 [PR PATCH] scribus: update to 1.5.5 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 ` [PR PATCH] [Updated] " Johnnynator
2021-01-30 20:25 ` Johnnynator
2021-01-31 2:00 ` [PR PATCH] [Merged]: " Johnnynator
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).