From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- app-office/scribus/Manifest | 7 +- .../scribus/files/scribus-1.5.5-findhyphen-1.patch | 51 ----- .../scribus/files/scribus-1.5.7-osg-cpp17.patch | 219 --------------------- .../scribus/files/scribus-1.5.8-harfbuzz-3.patch | 68 ------- app-office/scribus/scribus-1.5.7.ebuild | 162 --------------- app-office/scribus/scribus-1.5.8.ebuild | 2 +- 6 files changed, 2 insertions(+), 507 deletions(-) delete mode 100644 app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch delete mode 100644 app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch delete mode 100644 app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch delete mode 100644 app-office/scribus/scribus-1.5.7.ebuild (limited to 'app-office/scribus') diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 91053a268b99..0bca2bc4a997 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,16 +1,11 @@ AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015 -AUX scribus-1.5.5-findhyphen-1.patch 1118 BLAKE2B c542a292601b43f12ee2b682225064bd650f2017466aed4aa3a256610dfe1aaa662857cf60682b3c8f1a0dd1b22b34b8c058967bc4879412e8599a641e254b18 SHA512 d536cce91eb161e2d8ead619f932111bcfe661bae9e0706567a0a789ef80eef28e6f81c357bd7bdaaeb97f8c6a872deb7147fea7fef84e279b7e8e812a821cef 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.7-osg-cpp17.patch 11762 BLAKE2B 4f83dd7de919025606068ca5c05d2dd234b0d21d35cb7f784b1cebccc068f638730b7527ea07ed9a2bee16dd1524fa99e0e0ae10db5e98148066c882c00853fb SHA512 1e1e18967ce764d0b228d667d1673f6f7a03a7cba6fe07371435a6c7b9dcb0900fe73974a3a06ff22c87b35f27434bb44a3ec0b264914b8329c92b7e8d857c2c 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 AUX scribus-1.5.8-poppler-22.03.0.patch 2176 BLAKE2B 72f636999677cb166b96ba35896887daa71e1302081698c8b6a70ecc0d4a6e5c6a5dba41ff911d2bbad76ae17b20483050ba71595948e3d3097026506390e67c SHA512 86ea87f3a31ba5729e7c3f18ddcfcbe706d824c80d3fad85d6ea296ca6468e8f19964d6b6a771b5a8bc9deb1ed0b0baf4a0d2253aa562acad0c65e71c3f2e448 AUX scribus-1.5.8-poppler-22.2.0-1.patch 3899 BLAKE2B 616ded940828b14309b1dca597b5b209da3374e41aad01ed3a204888c3ad3ff25fce61bdfa69c947ead67b0a9cbe11f2e4fbdb6054f02bd251477830ddafd375 SHA512 7a5e21cc98bb7d87c326a8576e6ccf368d5fc64538896f5aedcb13598f2aa11cc6f999011e6920f0bf6116e46f5469a713bb7f04fa8c2ca308b0dd07f2c088af AUX scribus-1.5.8-poppler-22.2.0-2.patch 1190 BLAKE2B 5eb29f6246d157f14af0a12bf2234f5981bbd012253ac867a499d2fa3c96221724c060af5549731d00ab96ee67dfd18a26662d601d59a5458fd39c69f022c73e SHA512 826f671ae67e157a6a71befaac77b6fa1888fbbd3c708a3d412d01bfe28a9d3b268ecf33b05fa94390904a140b0eba1e46e712024a02e0ec33933df2a711a611 -DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01 DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d -EBUILD scribus-1.5.7.ebuild 4100 BLAKE2B b2006dbed58cbb72a90c7956d7fc6b270ba309279117a073a004c7ce14645e3bb7a67176ff351a252c131c1dbc56632433002dd8bba01b5bdda6523f907cb8a7 SHA512 b1a23ef9be8fd537072537c2a80710019c0cd0f85d2ed333c0b44cfb3deb7eb4cfbfd50ba8afc9165f4ee4e8791ba91a2d4ac8e98272003e4b4b8a17e2103d48 -EBUILD scribus-1.5.8.ebuild 4147 BLAKE2B f641545877dcf0459d89fa846f253c044deb3028d8b557610e6b79c5d1cb9bebb03f4abfdd033b35806e054d144d841583ab4114fe87958eafba366cd847add0 SHA512 87759327320e136225d2748ec03401416268c1ba8ec3c96d80baefdb6cf80b60b0c443fd66aab274baffb13ff02705268b2df520ab4d8a7e4ee297f3ba6f8f8d +EBUILD scribus-1.5.8.ebuild 4146 BLAKE2B e32ad027e529fd267c4b37de0dbd91c1d4c53855ceb6b8f691f06f112125a765b7395b7f4114a23a699ffcd34fbc522a050b921c44575f683e6b2c21c6f0d0f0 SHA512 21a0d6772d46005f6191e812b2b8e58d94bad4cf7a23d6fd926325f1bd82960a28013a70c4b5951082c3ce67f7d78be14bef5218b4519b3edc468f54e86dc398 EBUILD scribus-9999.ebuild 3964 BLAKE2B 8152771bbcb2b632c8b691b441613103147eb2cdb4bb50765940c20342f33308f01967d7b929ed076cb3be2a012fba00fb47d49040eb1220e2a20e28b76e5d28 SHA512 e3d4884e9f265257a33941eaec56d20cbf0bd0fc0155ca8852db23e54766285d19e4b74017faba3824aeb843e08906dee2387949bdcef73fa5191b16def49499 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91 diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch b/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch deleted file mode 100644 index 98682d60f700..000000000000 --- a/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/scribus/CMakeLists.txt 2019-10-02 00:25:01.194386515 +0200 -+++ b/scribus/CMakeLists.txt 2019-10-02 00:26:23.584392213 +0200 -@@ -1069,7 +1069,9 @@ - ${SCRIBUS_GMAGICK_SRC} - ) - --if(NOT HAVE_HYPHEN) -+if(HAVE_HYPHEN) -+ include_directories(${HYPHEN_INCLUDE_DIR}) -+else() - include_directories(third_party/hyphen) - set(SCRIBUS_SOURCES - ${SCRIBUS_SOURCES} -@@ -1180,13 +1182,6 @@ - - endif() - --if(HAVE_HYPHEN) -- target_link_libraries(${EXE_NAME} -- ${HYPHEN_LIBRARY} -- ) --endif() -- -- - if(GESTURE_FRAME_PREVIEW) - message(STATUS "Enable gesture frame preview [experimental]") - set(GESTURE_FRAME_PREVIEW_SOURCES pageitempreview.cpp) -@@ -1234,6 +1229,12 @@ - ) - endif () - -+if(HAVE_HYPHEN) -+ target_link_libraries(${EXE_NAME} -+ ${HYPHEN_LIBRARY} -+ ) -+endif() -+ - if(WIN32) - set_target_properties(${EXE_NAME} - PROPERTIES ---- a/scribus/hyphenator.h 2019-07-31 00:35:05.000000000 +0200 -+++ b/scribus/hyphenator.h 2019-10-02 00:00:42.497285638 +0200 -@@ -13,7 +13,7 @@ - #include - - #include "scribusapi.h" --#include "third_party/hyphen/hyphen.h" -+#include - - class ScribusDoc; - class ScribusMainWindow; diff --git a/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch b/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch deleted file mode 100644 index 21f0c00554d2..000000000000 --- a/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch +++ /dev/null @@ -1,219 +0,0 @@ -https://bugs.gentoo.org/831161 -Backport of https://github.com/scribusproject/scribus/commit/80405ce - -From: Jean Ghali -Date: Mon, 10 Jan 2022 20:38:51 +0000 -Subject: [PATCH] Rename byte() to to_byte() in order to avoid potential - conflict with std::byte in c++17 mode ---- a/scribus/third_party/prc/oPRCFile.cc -+++ b/scribus/third_party/prc/oPRCFile.cc -@@ -76,3 +76,3 @@ - // Map [0,1] to [0,255] --inline uint8_t byte(double r) -+inline uint8_t to_byte(double r) - { -@@ -451,5 +451,5 @@ - { -- tess->rgba_vertices.push_back(byte(lit->color.red)); -- tess->rgba_vertices.push_back(byte(lit->color.green)); -- tess->rgba_vertices.push_back(byte(lit->color.blue)); -+ tess->rgba_vertices.push_back(to_byte(lit->color.red)); -+ tess->rgba_vertices.push_back(to_byte(lit->color.green)); -+ tess->rgba_vertices.push_back(to_byte(lit->color.blue)); - } -@@ -595,19 +595,19 @@ - { -- tessFace->rgba_vertices.push_back(byte(C[1].R)); -- tessFace->rgba_vertices.push_back(byte(C[1].G)); -- tessFace->rgba_vertices.push_back(byte(C[1].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[1].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[1].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[1].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[1].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[1].A)); - -- tessFace->rgba_vertices.push_back(byte(C[2].R)); -- tessFace->rgba_vertices.push_back(byte(C[2].G)); -- tessFace->rgba_vertices.push_back(byte(C[2].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[2].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[2].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[2].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[2].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[2].A)); - -- tessFace->rgba_vertices.push_back(byte(C[3].R)); -- tessFace->rgba_vertices.push_back(byte(C[3].G)); -- tessFace->rgba_vertices.push_back(byte(C[3].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[3].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[3].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[3].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[3].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[3].A)); - } -@@ -622,19 +622,19 @@ - { -- tessFace->rgba_vertices.push_back(byte(C[0].R)); -- tessFace->rgba_vertices.push_back(byte(C[0].G)); -- tessFace->rgba_vertices.push_back(byte(C[0].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[0].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[0].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[0].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[0].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[0].A)); - -- tessFace->rgba_vertices.push_back(byte(C[2].R)); -- tessFace->rgba_vertices.push_back(byte(C[2].G)); -- tessFace->rgba_vertices.push_back(byte(C[2].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[2].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[2].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[2].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[2].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[2].A)); - -- tessFace->rgba_vertices.push_back(byte(C[3].R)); -- tessFace->rgba_vertices.push_back(byte(C[3].G)); -- tessFace->rgba_vertices.push_back(byte(C[3].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[3].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[3].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[3].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[3].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[3].A)); - } -@@ -646,19 +646,19 @@ - { -- tessFace->rgba_vertices.push_back(byte(C[3].R)); -- tessFace->rgba_vertices.push_back(byte(C[3].G)); -- tessFace->rgba_vertices.push_back(byte(C[3].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[3].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[3].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[3].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[3].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[3].A)); - -- tessFace->rgba_vertices.push_back(byte(C[1].R)); -- tessFace->rgba_vertices.push_back(byte(C[1].G)); -- tessFace->rgba_vertices.push_back(byte(C[1].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[1].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[1].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[1].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[1].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[1].A)); - -- tessFace->rgba_vertices.push_back(byte(C[0].R)); -- tessFace->rgba_vertices.push_back(byte(C[0].G)); -- tessFace->rgba_vertices.push_back(byte(C[0].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[0].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[0].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[0].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[0].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[0].A)); - } -@@ -1650,17 +1650,17 @@ - { -- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].R)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A)); - } -@@ -1794,33 +1794,33 @@ - // first triangle -- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].R)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A)); - // second triangle -- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G)); -- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B)); - if(tessFace->is_rgba) -- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A)); -+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A)); - } -@@ -1912,7 +1912,7 @@ - { -- tess->rgba_vertices.push_back(byte(C[CI[i]].R)); -- tess->rgba_vertices.push_back(byte(C[CI[i]].G)); -- tess->rgba_vertices.push_back(byte(C[CI[i]].B)); -+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].R)); -+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].G)); -+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].B)); - if(tess->is_rgba) -- tess->rgba_vertices.push_back(byte(C[CI[i]].A)); -+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].A)); - } 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 deleted file mode 100644 index f1645e516faf..000000000000 --- a/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch +++ /dev/null @@ -1,68 +0,0 @@ -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 -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 hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get())); - -From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -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 hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get())); -+ if (hbSubsetFace.isNull()) -+ return QByteArray(); -+#else - QScopedPointer hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get())); - if (hbSubsetFace.isNull()) - return QByteArray(); -+#endif - - QScopedPointer 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 deleted file mode 100644 index 2d3e677154da..000000000000 --- a/app-office/scribus/scribus-1.5.7.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="tk?" -inherit cmake desktop flag-o-matic python-single-r1 xdg - -DESCRIPTION="Desktop publishing (DTP) and layout program" -HOMEPAGE="https://www.scribus.net/" -SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - tk? ( scripts )" - -# osg -# couple of third_party libs bundled -DEPEND="${PYTHON_DEPS} - app-text/libmspub - app-text/libqxp - app-text/poppler:= - dev-libs/hyphen - dev-libs/icu:0= - dev-libs/librevenge - dev-libs/libxml2 - dev-qt/qtcore:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/fontconfig - media-libs/freetype:2 - media-libs/harfbuzz:0=[icu] - media-libs/lcms:2 - media-libs/libcdr - media-libs/libfreehand - media-libs/libpagemaker - media-libs/libpng:0= - media-libs/libvisio - media-libs/libzmf - media-libs/tiff:0 - net-print/cups - sys-libs/zlib[minizip] - virtual/jpeg:0= - x11-libs/cairo[X,svg] - boost? ( dev-libs/boost:= ) - graphicsmagick? ( media-gfx/graphicsmagick:= ) - hunspell? ( app-text/hunspell:= ) - osg? ( dev-games/openscenegraph:= ) - pdf? ( app-text/podofo:0= ) - scripts? ( - $(python_gen_cond_dep ' - dev-python/pillow[tk?,${PYTHON_USEDEP}] - ') - ) -" -RDEPEND="${DEPEND} - app-text/ghostscript-gpl -" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -PATCHES=( - # non(?)-upstreamable - "${FILESDIR}"/${PN}-1.5.3-fpic.patch - "${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 - "${FILESDIR}"/${PN}-1.5.7-osg-cpp17.patch -) - -CMAKE_BUILD_TYPE="Release" - -S="${WORKDIR}/${P}" - -src_prepare() { - cmake_src_prepare - - rm -r codegen/cheetah scribus/third_party/hyphen || die - - sed \ - -e "/^\s*unzip\.[ch]/d" \ - -e "/^\s*ioapi\.[ch]/d" \ - -i scribus/CMakeLists.txt Scribus.pro || die - rm scribus/ioapi.[ch] || die - - sed \ - -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ - -i resources/templates/CMakeLists.txt || die - - sed \ - -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \ - -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test -} - -src_configure() { - # bug #550818 - append-cppflags -DHAVE_MEMRCHR - - local mycmakeargs=( - -DHAVE_PYTHON=ON - -DWANT_DISTROBUILD=ON - -DWANT_CPP17=ON - -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/ - -DPython3_EXECUTABLE="${PYTHON}" - -DWITH_BOOST=$(usex boost) - -DWANT_DEBUG=$(usex debug) - -DWANT_NOEXAMPLES=$(usex !examples) - -DWANT_GRAPHICSMAGICK=$(usex graphicsmagick) - -DWANT_HUNSPELL=$(usex hunspell) - -DWANT_HEADERINSTALL=$(usex !minimal) - -DWANT_NOOSG=$(usex !osg) - -DWITH_PODOFO=$(usex pdf) - -DWANT_NOTEMPLATES=$(usex !templates) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - if ! use tk; then - rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die - fi - if use scripts; then - python_fix_shebang "${ED}"/usr/share/scribus/scripts - python_optimize "${ED}"/usr/share/scribus/scripts - else - rm "${ED}"/usr/share/scribus/scripts/*.py || die - fi - - mv "${ED}"/usr/share/doc/${PF}/{en,html} || die - ln -sf html "${ED}"/usr/share/doc/${PF}/en || die - - # These files are parsed to populate the help/about window. - cat >> "${T}"/COPYING <<- EOF || die - ${PN} is licensed under the "${LICENSE}". - Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text. - EOF - dodoc "${T}"/COPYING - docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} - - local size - for size in 16 32 128 256 512; do - newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png - done - newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png - doicon resources/iconsets/*/scribus.png - domenu scribus.desktop -} diff --git a/app-office/scribus/scribus-1.5.8.ebuild b/app-office/scribus/scribus-1.5.8.ebuild index c344d68a2691..20e8e9c6d5a0 100644 --- a/app-office/scribus/scribus-1.5.8.ebuild +++ b/app-office/scribus/scribus-1.5.8.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" REQUIRED_USE="${PYTHON_REQUIRED_USE} -- cgit v1.2.3