diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
| commit | 46eedbedafdb0040c37884982d4c775ce277fb7b (patch) | |
| tree | db33a91259730be84999e13a8d8168c799f50ac0 /app-office/scribus | |
| parent | e23a08d0c97a0cc415aaa165da840b056f93c997 (diff) | |
gentoo resync : 20.10.2021
Diffstat (limited to 'app-office/scribus')
| -rw-r--r-- | app-office/scribus/Manifest | 3 | ||||
| -rw-r--r-- | app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch | 68 | ||||
| -rw-r--r-- | app-office/scribus/scribus-1.5.7.ebuild | 2 |
3 files changed, 72 insertions, 1 deletions
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index bf81c7f0f153..b5bc4b3688bb 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -3,7 +3,8 @@ AUX scribus-1.5.5-findhyphen-1.patch 1118 BLAKE2B c542a292601b43f12ee2b682225064 AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9 AUX scribus-1.5.8-findhyphen-1.patch 1264 BLAKE2B e35c561c275ef945aca9a7cc34e9ac9732450d7a2d15f5766c2a637f296d026fbc1d777266634b98cc5e8ad09364019f8eeeffd63f634e0836144cb6dacd3f5d SHA512 c0db1a12698b2e9770049b20c73b33e3cd5f56d8a69486a42955949f37216c0347df32e6acbdd7567075f98450dd59e9ef2f6a42f82ce38699fa704d77fbc60d +AUX scribus-1.5.8-harfbuzz-3.patch 2703 BLAKE2B c870a6be1a9e2921ff3336852782bb1fbeb51c0fd797de1a59605723810279e4c48ac65bc8abce5a71cdad16a9c62c7d2f0759fa7593bc3ddc70f5f22a6e0d5b SHA512 589e87973d316d8a96d731e649becfe63b24f26bab9e81da57cf8d049b9a0da78a659c089ab71439232fa56019c0cfaea6fbdce3081eb90c2cd07c6c995d740e DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01 -EBUILD scribus-1.5.7.ebuild 3981 BLAKE2B a1e9e67d0c942109d2270ffd4bda424176f695ed6ccc01b3b64aca1bf68ad5f08faa1f2ca2b6a079dd61263af860f8dac63678e8831705804e83a6fa685dc55d SHA512 97e876421064b7e3669e30af46f335a0e6755e196de579e0b062441819720c3edc7ec77039ce83a951c6de34689e1168be3ab66f53415a18732a801278b14bfa +EBUILD scribus-1.5.7.ebuild 4037 BLAKE2B 3adc052c369208604d04014c2cbe462c2fb2b6043f429b2d63bada56140de9c2753ca292888877c16c9fed65a3b39045ce0207e3239cf6837ed799292d65fa71 SHA512 17a5db410e675ac01e30eea960f41da3429c95f616f924511c0750f5973334e33e631c1dc8eff1f8002b439d5cbaf9e9b1808fd1a72314f83cc337bcda7d0b90 EBUILD scribus-9999.ebuild 3944 BLAKE2B cfbe26f95ec4dbf0b1044e61882ce00fbdda133a113bc76c87a30814e64044cdd16b1128da4f1259ca5855440f748a6a849387210982f2442e9d323c9823fa6a SHA512 f1a0bc8c0e395ee24b3d9ce7404c4106f12289cbd1506c0c1f8153f7d3a07154770a9f5cb4f20bb1a5752e83367e5a950e9ec363142d8725b4432f1561aea8c8 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91 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 new file mode 100644 index 000000000000..f1645e516faf --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch @@ -0,0 +1,68 @@ +https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch +https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch +https://bugs.scribus.net/view.php?id=16635 +https://bugs.gentoo.org/817281 +https://bugs.gentoo.org/813711 + +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 +--- 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())
\ No newline at end of file diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild index 67c6ac3aa058..806085da0d11 100644 --- a/app-office/scribus/scribus-1.5.7.ebuild +++ b/app-office/scribus/scribus-1.5.7.ebuild @@ -76,6 +76,8 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.6-docdir.patch "${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch + # upstream + "${FILESDIR}"/${PN}-1.5.8-harfbuzz-3.patch ) CMAKE_BUILD_TYPE="Release" |