1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00

print/scribus-devel: update to 1.5.8

Changelog:	https://w.scribus.net/wiki/index.php/1.5.8_Release
This commit is contained in:
Piotr Kubaj 2022-01-24 11:46:51 +00:00
parent 3f727f6603
commit a13185d956
5 changed files with 5 additions and 75 deletions

View File

@ -1,8 +1,5 @@
# Created by: Piotr Kubaj <pkubaj@anongoth.pl>
PORTNAME= scribus
PORTVERSION= 1.5.7
PORTREVISION= 11
PORTVERSION= 1.5.8
CATEGORIES= print editors
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \
http://www.scribus.net/downloads/${PORTVERSION}/

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1619438970
SHA256 (scribus-1.5.7.tar.xz) = 318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce
SIZE (scribus-1.5.7.tar.xz) = 74490040
TIMESTAMP = 1643023155
SHA256 (scribus-1.5.8.tar.xz) = 47816e8fcf6d05788ff16aa4499f97ff22431c777a7789149b0a88b451e16b74
SIZE (scribus-1.5.8.tar.xz) = 74543476

View File

@ -1,38 +0,0 @@
From 34dee8142844a7ee70ddff95253d0299896bcc16 Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Wed, 4 Aug 2021 21:18:11 +0000
Subject: [PATCH] #16605: Compilation error in lib2geom/path.h
git-svn-id: svn://scribus.net/trunk/Scribus@24687 11d20701-8431-0410-a711-e3c959e3b870
---
scribus/third_party/lib2geom/path.h | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/scribus/third_party/lib2geom/path.h b/scribus/third_party/lib2geom/path.h
index fab674ed3b..e923b5de8b 100644
--- scribus/third_party/lib2geom/path.h
+++ scribus/third_party/lib2geom/path.h
@@ -251,14 +251,15 @@ class BezierCurve : public Curve {
D2<SBasis> toSBasis() const {return inner.toSBasis(); }
-protected:
- BezierCurve(Point c[]) {
- Coord x[order+1], y[order+1];
- for(unsigned i = 0; i <= order; i++) {
- x[i] = c[i][X]; y[i] = c[i][Y];
- }
- inner = Bezier(x, y);
- }
+// #16605: does not seem used at triggers build error with clang 12.0.1
+//protected:
+// BezierCurve(Point c[]) {
+// Coord x[order+1], y[order+1];
+// for(unsigned i = 0; i <= order; i++) {
+// x[i] = c[i][X]; y[i] = c[i][Y];
+// }
+// inner = Bezier(x, y);
+// }
};
// BezierCurve<0> is meaningless; specialize it out

View File

@ -1,30 +0,0 @@
https://github.com/scribusproject/scribus/commit/1b546978bc4e
https://bugs.scribus.net/view.php?id=16635
--- scribus/fonts/sfnt.cpp.orig 2021-04-25 20:24:48 UTC
+++ scribus/fonts/sfnt.cpp
@@ -1256,14 +1256,22 @@ namespace sfnt {
for (int i = 0; i < cids.count(); ++i)
hb_set_add(glyphSet, cids.at(i));
-
+
+#if HB_VERSION_ATLEAST(2, 9, 0)
+ uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get());
+ subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS;
+ subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING;
+ subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY;
+ hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags);
+#else
hb_subset_input_set_retain_gids(hbSubsetInput.get(), true);
hb_subset_input_set_drop_hints(hbSubsetInput.get(), false);
#if HB_VERSION_ATLEAST(2, 6, 5)
hb_subset_input_set_name_legacy(hbSubsetInput.get(), true);
#endif
+#endif
- QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
+ QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get()));
if (hbSubsetFace.isNull())
return QByteArray();

View File

@ -1828,6 +1828,7 @@ share/pixmaps/scribus.png
%%DATADIR%%/translations/scribus.ms_MY.qm
%%DATADIR%%/translations/scribus.nb_NO.qm
%%DATADIR%%/translations/scribus.nl.qm
%%DATADIR%%/translations/scribus.nn_NO.qm
%%DATADIR%%/translations/scribus.oc.qm
%%DATADIR%%/translations/scribus.pl_PL.qm
%%DATADIR%%/translations/scribus.pms.qm