| 1 |
commit: 7b8c6af798cc7d82e658888be5e6699558016dd3 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 10 00:54:34 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 10 00:54:34 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b8c6af7 |
| 7 |
|
| 8 |
app-office/scribus: fix with Harfbuzz 3 (again) |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/813711 |
| 11 |
Closes: https://bugs.gentoo.org/817281 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../scribus/files/scribus-1.5.8-harfbuzz-3.patch | 41 +++++++++++++++++++++- |
| 15 |
1 file changed, 40 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch |
| 18 |
index 11e251866f0..f1645e516fa 100644 |
| 19 |
--- a/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch |
| 20 |
+++ b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch |
| 21 |
@@ -1,7 +1,46 @@ |
| 22 |
+https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch |
| 23 |
https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch |
| 24 |
https://bugs.scribus.net/view.php?id=16635 |
| 25 |
+https://bugs.gentoo.org/817281 |
| 26 |
https://bugs.gentoo.org/813711 |
| 27 |
|
| 28 |
+From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001 |
| 29 |
+From: Jean Ghali <jghali@×××××××××××.fr> |
| 30 |
+Date: Sat, 21 Aug 2021 20:05:43 +0000 |
| 31 |
+Subject: [PATCH] Use new hb-subset api with harfbuzz >= 2.9.0 in order to |
| 32 |
+ prepeare for removal of legacy API in 3.0 |
| 33 |
+ |
| 34 |
+git-svn-id: svn://scribus.net/trunk/Scribus@24696 11d20701-8431-0410-a711-e3c959e3b870 |
| 35 |
+--- |
| 36 |
+ scribus/fonts/sfnt.cpp | 10 +++++++++- |
| 37 |
+ 1 file changed, 9 insertions(+), 1 deletion(-) |
| 38 |
+ |
| 39 |
+diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp |
| 40 |
+index 50777f66e3..fca8b39158 100644 |
| 41 |
+--- a/scribus/fonts/sfnt.cpp |
| 42 |
++++ b/scribus/fonts/sfnt.cpp |
| 43 |
+@@ -1256,11 +1256,19 @@ namespace sfnt { |
| 44 |
+ |
| 45 |
+ for (int i = 0; i < cids.count(); ++i) |
| 46 |
+ hb_set_add(glyphSet, cids.at(i)); |
| 47 |
+- |
| 48 |
++ |
| 49 |
++#if HB_VERSION_ATLEAST(2, 9, 0) |
| 50 |
++ uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get()); |
| 51 |
++ subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS; |
| 52 |
++ subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING; |
| 53 |
++ subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY; |
| 54 |
++ hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags); |
| 55 |
++#else |
| 56 |
+ hb_subset_input_set_retain_gids(hbSubsetInput.get(), true); |
| 57 |
+ hb_subset_input_set_drop_hints(hbSubsetInput.get(), false); |
| 58 |
+ #if HB_VERSION_ATLEAST(2, 6, 5) |
| 59 |
+ hb_subset_input_set_name_legacy(hbSubsetInput.get(), true); |
| 60 |
++#endif |
| 61 |
+ #endif |
| 62 |
+ |
| 63 |
+ QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get())); |
| 64 |
+ |
| 65 |
From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001 |
| 66 |
From: Jean Ghali <jghali@×××××××××××.fr> |
| 67 |
Date: Sun, 19 Sep 2021 11:59:50 +0000 |
| 68 |
@@ -26,4 +65,4 @@ git-svn-id: svn://scribus.net/trunk/Scribus@24707 11d20701-8431-0410-a711-e3c959 |
| 69 |
+#endif |
| 70 |
|
| 71 |
QScopedPointer<hb_blob_t, HbBlobDeleter> hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get())); |
| 72 |
- if (hbSubsetBlob.isNull()) |
| 73 |
+ if (hbSubsetBlob.isNull()) |
| 74 |
\ No newline at end of file |
Archives