summaryrefslogtreecommitdiff
path: root/app-office/scribus
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-01-16 20:27:28 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-01-16 20:27:28 +0000
commit2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /app-office/scribus
parentc3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)
gentoo resync : 16.01.2021
Diffstat (limited to 'app-office/scribus')
-rw-r--r--app-office/scribus/Manifest3
-rw-r--r--app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch219
-rw-r--r--app-office/scribus/scribus-1.5.7.ebuild1
3 files changed, 222 insertions, 1 deletions
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 6df3c13cd750..edf48dc93d46 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -2,9 +2,10 @@ AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27
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
DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
-EBUILD scribus-1.5.7.ebuild 4057 BLAKE2B d54e5ece7d4d089e4871d7917556ca48d6c46a3ca67f04b8e74238fa803f6f78308bbec4578a09edac39d10b6087e633a493e112fdfd6d485e9988a4bca82c4f SHA512 c72afb841bea4ca8f18419151d480278cfb89d589ece9c8bc7e3550b7bf1fcaac2b22e377fa23544c85bd506b3cd54f2f70a0b44731f052b652403221d19f505
+EBUILD scribus-1.5.7.ebuild 4100 BLAKE2B b2006dbed58cbb72a90c7956d7fc6b270ba309279117a073a004c7ce14645e3bb7a67176ff351a252c131c1dbc56632433002dd8bba01b5bdda6523f907cb8a7 SHA512 b1a23ef9be8fd537072537c2a80710019c0cd0f85d2ed333c0b44cfb3deb7eb4cfbfd50ba8afc9165f4ee4e8791ba91a2d4ac8e98272003e4b4b8a17e2103d48
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.7-osg-cpp17.patch b/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch
new file mode 100644
index 000000000000..21f0c00554d2
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch
@@ -0,0 +1,219 @@
+https://bugs.gentoo.org/831161
+Backport of https://github.com/scribusproject/scribus/commit/80405ce
+
+From: Jean Ghali <jghali@libertysurf.fr>
+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/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild
index 5f63eeb1aa19..2d3e677154da 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -78,6 +78,7 @@ PATCHES=(
"${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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 02:13:47 +0000