scribus: update to 1.5.8.
This commit is contained in:
parent
75f67f5814
commit
9d0569c6be
|
@ -27,6 +27,3 @@ Index: CMakeLists.txt
|
||||||
-if(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
|
-if(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
|
||||||
- set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set Release Build Type" FORCE)
|
- set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set Release Build Type" FORCE)
|
||||||
-endif()
|
-endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- a/scribus/CMakeLists.txt 2021-04-25 22:24:52.000000000 +0200
|
|
||||||
+++ b/scribus/CMakeLists.txt 2021-06-12 16:23:22.884229251 +0200
|
|
||||||
@@ -757,7 +757,7 @@
|
|
||||||
# Should fix bug 6897 .
|
|
||||||
set_target_properties(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
|
|
||||||
endif ()
|
|
||||||
-if (GCC AND NOT WIN32)
|
|
||||||
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT WIN32)
|
|
||||||
# Use the -E / --export-dynamic flag to ensure that symbols in the Scribus
|
|
||||||
# binary are in the public symbol table for plugins. The symbols must also
|
|
||||||
# be set as SCRIBUS_API if we're building with -fvisibility=hidden .
|
|
|
@ -1,68 +0,0 @@
|
||||||
From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jean Ghali <jghali@libertysurf.fr>
|
|
||||||
Date: Sat, 21 Aug 2021 20:05:43 +0000
|
|
||||||
Subject: [PATCH] Use new hb-subset api with harfbuzz >= 2.9.0 in order to
|
|
||||||
prepeare for removal of legacy API in 3.0
|
|
||||||
|
|
||||||
git-svn-id: svn://scribus.net/trunk/Scribus@24696 11d20701-8431-0410-a711-e3c959e3b870
|
|
||||||
---
|
|
||||||
scribus/fonts/sfnt.cpp | 10 +++++++++-
|
|
||||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp
|
|
||||||
index 50777f66e3..fca8b39158 100644
|
|
||||||
--- a/scribus/fonts/sfnt.cpp
|
|
||||||
+++ b/scribus/fonts/sfnt.cpp
|
|
||||||
@@ -1256,11 +1256,19 @@ 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()));
|
|
||||||
|
|
||||||
From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jean Ghali <jghali@libertysurf.fr>
|
|
||||||
Date: Sun, 19 Sep 2021 11:59:50 +0000
|
|
||||||
Subject: [PATCH] #16635: Replace hb_subset, removed in harfbuzz 3.0, by
|
|
||||||
hb_subset_or_fail
|
|
||||||
|
|
||||||
git-svn-id: svn://scribus.net/trunk/Scribus@24707 11d20701-8431-0410-a711-e3c959e3b870
|
|
||||||
---
|
|
||||||
scribus/fonts/sfnt.cpp | 6 ++++++
|
|
||||||
1 file changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp
|
|
||||||
index fca8b39158..b3dfa50dc6 100644
|
|
||||||
--- a/scribus/fonts/sfnt.cpp
|
|
||||||
+++ b/scribus/fonts/sfnt.cpp
|
|
||||||
@@ -1271,9 +1271,15 @@ namespace sfnt {
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if HB_VERSION_ATLEAST(2, 9, 0)
|
|
||||||
+ QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get()));
|
|
||||||
+ if (hbSubsetFace.isNull())
|
|
||||||
+ return QByteArray();
|
|
||||||
+#else
|
|
||||||
QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
|
|
||||||
if (hbSubsetFace.isNull())
|
|
||||||
return QByteArray();
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
QScopedPointer<hb_blob_t, HbBlobDeleter> hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get()));
|
|
||||||
if (hbSubsetBlob.isNull())
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'scribus'
|
# Template file for 'scribus'
|
||||||
pkgname=scribus
|
pkgname=scribus
|
||||||
version=1.5.7
|
version=1.5.8
|
||||||
revision=7
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
|
configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
|
||||||
-DWANT_GRAPHICSMAGICK=1"
|
-DWANT_GRAPHICSMAGICK=1"
|
||||||
|
@ -17,5 +17,5 @@ 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-devel/${version}/scribus-${version}.tar.xz"
|
distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz"
|
||||||
checksum=318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce
|
checksum=47816e8fcf6d05788ff16aa4499f97ff22431c777a7789149b0a88b451e16b74
|
||||||
python_version=3
|
python_version=3
|
||||||
|
|
Loading…
Reference in a new issue