[arch-commits] Commit in scribus/trunk (3 files)

[Evangelos Foutras]

    Date: Tuesday, September 21, 2021 @ 16:14:07
  Author: foutrelis
Revision: 1020581

upgpkg: scribus 1.5.7-5: extend upstream patch for harfbuzz 3.0.0

Modified:
  scribus/trunk/PKGBUILD
  scribus/trunk/harfbuzz-3.0.0.patch
Deleted:
  scribus/trunk/harfbuzz-3.0.0-kludge.patch

-----------------------------+
 PKGBUILD                    |    9 ++-------
 harfbuzz-3.0.0-kludge.patch |   12 ------------
 harfbuzz-3.0.0.patch        |   32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-21 16:13:25 UTC (rev 1020580)
+++ PKGBUILD	2021-09-21 16:14:07 UTC (rev 1020581)
@@ -7,7 +7,7 @@
 
 pkgname=scribus
 pkgver=1.5.7
-pkgrel=4
+pkgrel=5
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/"
@@ -20,12 +20,10 @@
 optdepends=('tk: scripts based on tkinter'
             'hyphen-lang: hyphenation patterns for desired languages')
 source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc}
-        harfbuzz-3.0.0-kludge.patch
         harfbuzz-3.0.0.patch)
 sha256sums=('318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce'
             'SKIP'
-            '617d5912fb0cda6b93c18d139a870204fe1941c9fd603b5f23d0aa9f2a56a381'
-            'bc9fbdada576bd769e07cb6848a39e48d462e6f893dbfedcc4f86229ca27812b')
+            '38f7ee8a3dafac3e677451a98a09e2c8a5e850ad20769ed58e896fa67e661024')
 validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA  # Peter Linnell <plinnell at scribus.net>
               757F5E9B13DD648887AD50092D47C099E782504E  # The Scribus Team (www.scribus.net) <the_scribus_team at scribus.net>
               6558BE84D27273A438A151198BEA48118AEBEE64) # Craig Bradney <cbradney at zipworld.com.au>
@@ -33,9 +31,6 @@
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -Np1 -i ../harfbuzz-3.0.0.patch
-
-  # https://bugs.scribus.net/view.php?id=16635
-  patch -Np1 -i ../harfbuzz-3.0.0-kludge.patch
 }
 
 build() {

Deleted: harfbuzz-3.0.0-kludge.patch
===================================================================
--- harfbuzz-3.0.0-kludge.patch	2021-09-21 16:13:25 UTC (rev 1020580)
+++ harfbuzz-3.0.0-kludge.patch	2021-09-21 16:14:07 UTC (rev 1020581)
@@ -1,12 +0,0 @@
-diff -upr scribus-1.5.7.orig/scribus/fonts/sfnt.cpp scribus-1.5.7/scribus/fonts/sfnt.cpp
---- scribus-1.5.7.orig/scribus/fonts/sfnt.cpp	2021-09-18 23:22:51.537708802 +0300
-+++ scribus-1.5.7/scribus/fonts/sfnt.cpp	2021-09-18 23:23:53.602675236 +0300
-@@ -1271,7 +1271,7 @@ namespace sfnt {
- #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();
- 

Modified: harfbuzz-3.0.0.patch
===================================================================
--- harfbuzz-3.0.0.patch	2021-09-21 16:13:25 UTC (rev 1020580)
+++ harfbuzz-3.0.0.patch	2021-09-21 16:14:07 UTC (rev 1020581)
@@ -34,3 +34,35 @@
  #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 at 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())