| 1 |
commit: a353ebd90d6cf08b5f2923315e1104d4a9bc3629 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 27 06:04:55 2022 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 27 06:05:14 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a353ebd9 |
| 7 |
|
| 8 |
app-office/scribus: removed obsolete 1.5.7 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=835425 |
| 11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/scribus/Manifest | 1 - |
| 14 |
.../scribus/files/scribus-1.5.5-findhyphen-1.patch | 51 ----- |
| 15 |
.../scribus/files/scribus-1.5.7-osg-cpp17.patch | 219 --------------------- |
| 16 |
.../scribus/files/scribus-1.5.8-harfbuzz-3.patch | 68 ------- |
| 17 |
app-office/scribus/scribus-1.5.7.ebuild | 162 --------------- |
| 18 |
5 files changed, 501 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest |
| 21 |
index 0844d8a46097..b68a6cf5f28c 100644 |
| 22 |
--- a/app-office/scribus/Manifest |
| 23 |
+++ b/app-office/scribus/Manifest |
| 24 |
@@ -1,2 +1 @@ |
| 25 |
-DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01 |
| 26 |
DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d |
| 27 |
|
| 28 |
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 |
| 29 |
deleted file mode 100644 |
| 30 |
index 98682d60f700..000000000000 |
| 31 |
--- a/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,51 +0,0 @@ |
| 34 |
---- a/scribus/CMakeLists.txt 2019-10-02 00:25:01.194386515 +0200 |
| 35 |
-+++ b/scribus/CMakeLists.txt 2019-10-02 00:26:23.584392213 +0200 |
| 36 |
-@@ -1069,7 +1069,9 @@ |
| 37 |
- ${SCRIBUS_GMAGICK_SRC} |
| 38 |
- ) |
| 39 |
- |
| 40 |
--if(NOT HAVE_HYPHEN) |
| 41 |
-+if(HAVE_HYPHEN) |
| 42 |
-+ include_directories(${HYPHEN_INCLUDE_DIR}) |
| 43 |
-+else() |
| 44 |
- include_directories(third_party/hyphen) |
| 45 |
- set(SCRIBUS_SOURCES |
| 46 |
- ${SCRIBUS_SOURCES} |
| 47 |
-@@ -1180,13 +1182,6 @@ |
| 48 |
- |
| 49 |
- endif() |
| 50 |
- |
| 51 |
--if(HAVE_HYPHEN) |
| 52 |
-- target_link_libraries(${EXE_NAME} |
| 53 |
-- ${HYPHEN_LIBRARY} |
| 54 |
-- ) |
| 55 |
--endif() |
| 56 |
-- |
| 57 |
-- |
| 58 |
- if(GESTURE_FRAME_PREVIEW) |
| 59 |
- message(STATUS "Enable gesture frame preview [experimental]") |
| 60 |
- set(GESTURE_FRAME_PREVIEW_SOURCES pageitempreview.cpp) |
| 61 |
-@@ -1234,6 +1229,12 @@ |
| 62 |
- ) |
| 63 |
- endif () |
| 64 |
- |
| 65 |
-+if(HAVE_HYPHEN) |
| 66 |
-+ target_link_libraries(${EXE_NAME} |
| 67 |
-+ ${HYPHEN_LIBRARY} |
| 68 |
-+ ) |
| 69 |
-+endif() |
| 70 |
-+ |
| 71 |
- if(WIN32) |
| 72 |
- set_target_properties(${EXE_NAME} |
| 73 |
- PROPERTIES |
| 74 |
---- a/scribus/hyphenator.h 2019-07-31 00:35:05.000000000 +0200 |
| 75 |
-+++ b/scribus/hyphenator.h 2019-10-02 00:00:42.497285638 +0200 |
| 76 |
-@@ -13,7 +13,7 @@ |
| 77 |
- #include <QSet> |
| 78 |
- |
| 79 |
- #include "scribusapi.h" |
| 80 |
--#include "third_party/hyphen/hyphen.h" |
| 81 |
-+#include <hyphen.h> |
| 82 |
- |
| 83 |
- class ScribusDoc; |
| 84 |
- class ScribusMainWindow; |
| 85 |
|
| 86 |
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 |
| 87 |
deleted file mode 100644 |
| 88 |
index 21f0c00554d2..000000000000 |
| 89 |
--- a/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch |
| 90 |
+++ /dev/null |
| 91 |
@@ -1,219 +0,0 @@ |
| 92 |
-https://bugs.gentoo.org/831161 |
| 93 |
-Backport of https://github.com/scribusproject/scribus/commit/80405ce |
| 94 |
- |
| 95 |
-From: Jean Ghali <jghali@×××××××××××.fr> |
| 96 |
-Date: Mon, 10 Jan 2022 20:38:51 +0000 |
| 97 |
-Subject: [PATCH] Rename byte() to to_byte() in order to avoid potential |
| 98 |
- conflict with std::byte in c++17 mode |
| 99 |
---- a/scribus/third_party/prc/oPRCFile.cc |
| 100 |
-+++ b/scribus/third_party/prc/oPRCFile.cc |
| 101 |
-@@ -76,3 +76,3 @@ |
| 102 |
- // Map [0,1] to [0,255] |
| 103 |
--inline uint8_t byte(double r) |
| 104 |
-+inline uint8_t to_byte(double r) |
| 105 |
- { |
| 106 |
-@@ -451,5 +451,5 @@ |
| 107 |
- { |
| 108 |
-- tess->rgba_vertices.push_back(byte(lit->color.red)); |
| 109 |
-- tess->rgba_vertices.push_back(byte(lit->color.green)); |
| 110 |
-- tess->rgba_vertices.push_back(byte(lit->color.blue)); |
| 111 |
-+ tess->rgba_vertices.push_back(to_byte(lit->color.red)); |
| 112 |
-+ tess->rgba_vertices.push_back(to_byte(lit->color.green)); |
| 113 |
-+ tess->rgba_vertices.push_back(to_byte(lit->color.blue)); |
| 114 |
- } |
| 115 |
-@@ -595,19 +595,19 @@ |
| 116 |
- { |
| 117 |
-- tessFace->rgba_vertices.push_back(byte(C[1].R)); |
| 118 |
-- tessFace->rgba_vertices.push_back(byte(C[1].G)); |
| 119 |
-- tessFace->rgba_vertices.push_back(byte(C[1].B)); |
| 120 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[1].R)); |
| 121 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[1].G)); |
| 122 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[1].B)); |
| 123 |
- if(tessFace->is_rgba) |
| 124 |
-- tessFace->rgba_vertices.push_back(byte(C[1].A)); |
| 125 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[1].A)); |
| 126 |
- |
| 127 |
-- tessFace->rgba_vertices.push_back(byte(C[2].R)); |
| 128 |
-- tessFace->rgba_vertices.push_back(byte(C[2].G)); |
| 129 |
-- tessFace->rgba_vertices.push_back(byte(C[2].B)); |
| 130 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[2].R)); |
| 131 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[2].G)); |
| 132 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[2].B)); |
| 133 |
- if(tessFace->is_rgba) |
| 134 |
-- tessFace->rgba_vertices.push_back(byte(C[2].A)); |
| 135 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[2].A)); |
| 136 |
- |
| 137 |
-- tessFace->rgba_vertices.push_back(byte(C[3].R)); |
| 138 |
-- tessFace->rgba_vertices.push_back(byte(C[3].G)); |
| 139 |
-- tessFace->rgba_vertices.push_back(byte(C[3].B)); |
| 140 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[3].R)); |
| 141 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[3].G)); |
| 142 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[3].B)); |
| 143 |
- if(tessFace->is_rgba) |
| 144 |
-- tessFace->rgba_vertices.push_back(byte(C[3].A)); |
| 145 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[3].A)); |
| 146 |
- } |
| 147 |
-@@ -622,19 +622,19 @@ |
| 148 |
- { |
| 149 |
-- tessFace->rgba_vertices.push_back(byte(C[0].R)); |
| 150 |
-- tessFace->rgba_vertices.push_back(byte(C[0].G)); |
| 151 |
-- tessFace->rgba_vertices.push_back(byte(C[0].B)); |
| 152 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[0].R)); |
| 153 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[0].G)); |
| 154 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[0].B)); |
| 155 |
- if(tessFace->is_rgba) |
| 156 |
-- tessFace->rgba_vertices.push_back(byte(C[0].A)); |
| 157 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[0].A)); |
| 158 |
- |
| 159 |
-- tessFace->rgba_vertices.push_back(byte(C[2].R)); |
| 160 |
-- tessFace->rgba_vertices.push_back(byte(C[2].G)); |
| 161 |
-- tessFace->rgba_vertices.push_back(byte(C[2].B)); |
| 162 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[2].R)); |
| 163 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[2].G)); |
| 164 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[2].B)); |
| 165 |
- if(tessFace->is_rgba) |
| 166 |
-- tessFace->rgba_vertices.push_back(byte(C[2].A)); |
| 167 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[2].A)); |
| 168 |
- |
| 169 |
-- tessFace->rgba_vertices.push_back(byte(C[3].R)); |
| 170 |
-- tessFace->rgba_vertices.push_back(byte(C[3].G)); |
| 171 |
-- tessFace->rgba_vertices.push_back(byte(C[3].B)); |
| 172 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[3].R)); |
| 173 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[3].G)); |
| 174 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[3].B)); |
| 175 |
- if(tessFace->is_rgba) |
| 176 |
-- tessFace->rgba_vertices.push_back(byte(C[3].A)); |
| 177 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[3].A)); |
| 178 |
- } |
| 179 |
-@@ -646,19 +646,19 @@ |
| 180 |
- { |
| 181 |
-- tessFace->rgba_vertices.push_back(byte(C[3].R)); |
| 182 |
-- tessFace->rgba_vertices.push_back(byte(C[3].G)); |
| 183 |
-- tessFace->rgba_vertices.push_back(byte(C[3].B)); |
| 184 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[3].R)); |
| 185 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[3].G)); |
| 186 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[3].B)); |
| 187 |
- if(tessFace->is_rgba) |
| 188 |
-- tessFace->rgba_vertices.push_back(byte(C[3].A)); |
| 189 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[3].A)); |
| 190 |
- |
| 191 |
-- tessFace->rgba_vertices.push_back(byte(C[1].R)); |
| 192 |
-- tessFace->rgba_vertices.push_back(byte(C[1].G)); |
| 193 |
-- tessFace->rgba_vertices.push_back(byte(C[1].B)); |
| 194 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[1].R)); |
| 195 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[1].G)); |
| 196 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[1].B)); |
| 197 |
- if(tessFace->is_rgba) |
| 198 |
-- tessFace->rgba_vertices.push_back(byte(C[1].A)); |
| 199 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[1].A)); |
| 200 |
- |
| 201 |
-- tessFace->rgba_vertices.push_back(byte(C[0].R)); |
| 202 |
-- tessFace->rgba_vertices.push_back(byte(C[0].G)); |
| 203 |
-- tessFace->rgba_vertices.push_back(byte(C[0].B)); |
| 204 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[0].R)); |
| 205 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[0].G)); |
| 206 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[0].B)); |
| 207 |
- if(tessFace->is_rgba) |
| 208 |
-- tessFace->rgba_vertices.push_back(byte(C[0].A)); |
| 209 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[0].A)); |
| 210 |
- } |
| 211 |
-@@ -1650,17 +1650,17 @@ |
| 212 |
- { |
| 213 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].R)); |
| 214 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G)); |
| 215 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B)); |
| 216 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R)); |
| 217 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G)); |
| 218 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B)); |
| 219 |
- if(tessFace->is_rgba) |
| 220 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A)); |
| 221 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R)); |
| 222 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G)); |
| 223 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B)); |
| 224 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A)); |
| 225 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R)); |
| 226 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G)); |
| 227 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B)); |
| 228 |
- if(tessFace->is_rgba) |
| 229 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A)); |
| 230 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R)); |
| 231 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G)); |
| 232 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B)); |
| 233 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A)); |
| 234 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R)); |
| 235 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G)); |
| 236 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B)); |
| 237 |
- if(tessFace->is_rgba) |
| 238 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A)); |
| 239 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A)); |
| 240 |
- } |
| 241 |
-@@ -1794,33 +1794,33 @@ |
| 242 |
- // first triangle |
| 243 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].R)); |
| 244 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G)); |
| 245 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B)); |
| 246 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R)); |
| 247 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G)); |
| 248 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B)); |
| 249 |
- if(tessFace->is_rgba) |
| 250 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A)); |
| 251 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R)); |
| 252 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G)); |
| 253 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B)); |
| 254 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A)); |
| 255 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R)); |
| 256 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G)); |
| 257 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B)); |
| 258 |
- if(tessFace->is_rgba) |
| 259 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A)); |
| 260 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R)); |
| 261 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G)); |
| 262 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B)); |
| 263 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A)); |
| 264 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R)); |
| 265 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G)); |
| 266 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B)); |
| 267 |
- if(tessFace->is_rgba) |
| 268 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A)); |
| 269 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A)); |
| 270 |
- // second triangle |
| 271 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R)); |
| 272 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G)); |
| 273 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B)); |
| 274 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R)); |
| 275 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G)); |
| 276 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B)); |
| 277 |
- if(tessFace->is_rgba) |
| 278 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A)); |
| 279 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R)); |
| 280 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G)); |
| 281 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B)); |
| 282 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A)); |
| 283 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R)); |
| 284 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G)); |
| 285 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B)); |
| 286 |
- if(tessFace->is_rgba) |
| 287 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A)); |
| 288 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R)); |
| 289 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G)); |
| 290 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B)); |
| 291 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A)); |
| 292 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R)); |
| 293 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G)); |
| 294 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B)); |
| 295 |
- if(tessFace->is_rgba) |
| 296 |
-- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A)); |
| 297 |
-+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A)); |
| 298 |
- } |
| 299 |
-@@ -1912,7 +1912,7 @@ |
| 300 |
- { |
| 301 |
-- tess->rgba_vertices.push_back(byte(C[CI[i]].R)); |
| 302 |
-- tess->rgba_vertices.push_back(byte(C[CI[i]].G)); |
| 303 |
-- tess->rgba_vertices.push_back(byte(C[CI[i]].B)); |
| 304 |
-+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].R)); |
| 305 |
-+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].G)); |
| 306 |
-+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].B)); |
| 307 |
- if(tess->is_rgba) |
| 308 |
-- tess->rgba_vertices.push_back(byte(C[CI[i]].A)); |
| 309 |
-+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].A)); |
| 310 |
- } |
| 311 |
|
| 312 |
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 |
| 313 |
deleted file mode 100644 |
| 314 |
index f1645e516faf..000000000000 |
| 315 |
--- a/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch |
| 316 |
+++ /dev/null |
| 317 |
@@ -1,68 +0,0 @@ |
| 318 |
-https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch |
| 319 |
-https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch |
| 320 |
-https://bugs.scribus.net/view.php?id=16635 |
| 321 |
-https://bugs.gentoo.org/817281 |
| 322 |
-https://bugs.gentoo.org/813711 |
| 323 |
- |
| 324 |
-From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001 |
| 325 |
-From: Jean Ghali <jghali@×××××××××××.fr> |
| 326 |
-Date: Sat, 21 Aug 2021 20:05:43 +0000 |
| 327 |
-Subject: [PATCH] Use new hb-subset api with harfbuzz >= 2.9.0 in order to |
| 328 |
- prepeare for removal of legacy API in 3.0 |
| 329 |
- |
| 330 |
-git-svn-id: svn://scribus.net/trunk/Scribus@24696 11d20701-8431-0410-a711-e3c959e3b870 |
| 331 |
---- |
| 332 |
- scribus/fonts/sfnt.cpp | 10 +++++++++- |
| 333 |
- 1 file changed, 9 insertions(+), 1 deletion(-) |
| 334 |
- |
| 335 |
-diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp |
| 336 |
-index 50777f66e3..fca8b39158 100644 |
| 337 |
---- a/scribus/fonts/sfnt.cpp |
| 338 |
-+++ b/scribus/fonts/sfnt.cpp |
| 339 |
-@@ -1256,11 +1256,19 @@ namespace sfnt { |
| 340 |
- |
| 341 |
- for (int i = 0; i < cids.count(); ++i) |
| 342 |
- hb_set_add(glyphSet, cids.at(i)); |
| 343 |
-- |
| 344 |
-+ |
| 345 |
-+#if HB_VERSION_ATLEAST(2, 9, 0) |
| 346 |
-+ uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get()); |
| 347 |
-+ subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS; |
| 348 |
-+ subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING; |
| 349 |
-+ subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY; |
| 350 |
-+ hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags); |
| 351 |
-+#else |
| 352 |
- hb_subset_input_set_retain_gids(hbSubsetInput.get(), true); |
| 353 |
- hb_subset_input_set_drop_hints(hbSubsetInput.get(), false); |
| 354 |
- #if HB_VERSION_ATLEAST(2, 6, 5) |
| 355 |
- hb_subset_input_set_name_legacy(hbSubsetInput.get(), true); |
| 356 |
-+#endif |
| 357 |
- #endif |
| 358 |
- |
| 359 |
- QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get())); |
| 360 |
- |
| 361 |
-From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001 |
| 362 |
-From: Jean Ghali <jghali@×××××××××××.fr> |
| 363 |
-Date: Sun, 19 Sep 2021 11:59:50 +0000 |
| 364 |
-Subject: [PATCH] #16635: Replace hb_subset, removed in harfbuzz 3.0, by |
| 365 |
- hb_subset_or_fail |
| 366 |
- |
| 367 |
-git-svn-id: svn://scribus.net/trunk/Scribus@24707 11d20701-8431-0410-a711-e3c959e3b870 |
| 368 |
---- a/scribus/fonts/sfnt.cpp |
| 369 |
-+++ b/scribus/fonts/sfnt.cpp |
| 370 |
-@@ -1271,9 +1271,15 @@ namespace sfnt { |
| 371 |
- #endif |
| 372 |
- #endif |
| 373 |
- |
| 374 |
-+#if HB_VERSION_ATLEAST(2, 9, 0) |
| 375 |
-+ QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get())); |
| 376 |
-+ if (hbSubsetFace.isNull()) |
| 377 |
-+ return QByteArray(); |
| 378 |
-+#else |
| 379 |
- QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get())); |
| 380 |
- if (hbSubsetFace.isNull()) |
| 381 |
- return QByteArray(); |
| 382 |
-+#endif |
| 383 |
- |
| 384 |
- QScopedPointer<hb_blob_t, HbBlobDeleter> hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get())); |
| 385 |
- if (hbSubsetBlob.isNull()) |
| 386 |
\ No newline at end of file |
| 387 |
|
| 388 |
diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild |
| 389 |
deleted file mode 100644 |
| 390 |
index 2d3e677154da..000000000000 |
| 391 |
--- a/app-office/scribus/scribus-1.5.7.ebuild |
| 392 |
+++ /dev/null |
| 393 |
@@ -1,162 +0,0 @@ |
| 394 |
-# Copyright 1999-2022 Gentoo Authors |
| 395 |
-# Distributed under the terms of the GNU General Public License v2 |
| 396 |
- |
| 397 |
-EAPI=7 |
| 398 |
- |
| 399 |
-PYTHON_COMPAT=( python3_{8..10} ) |
| 400 |
-PYTHON_REQ_USE="tk?" |
| 401 |
-inherit cmake desktop flag-o-matic python-single-r1 xdg |
| 402 |
- |
| 403 |
-DESCRIPTION="Desktop publishing (DTP) and layout program" |
| 404 |
-HOMEPAGE="https://www.scribus.net/" |
| 405 |
-SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz" |
| 406 |
- |
| 407 |
-LICENSE="GPL-2" |
| 408 |
-SLOT="0" |
| 409 |
-KEYWORDS="amd64 ppc ppc64 x86" |
| 410 |
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" |
| 411 |
- |
| 412 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 413 |
- tk? ( scripts )" |
| 414 |
- |
| 415 |
-# osg |
| 416 |
-# couple of third_party libs bundled |
| 417 |
-DEPEND="${PYTHON_DEPS} |
| 418 |
- app-text/libmspub |
| 419 |
- app-text/libqxp |
| 420 |
- app-text/poppler:= |
| 421 |
- dev-libs/hyphen |
| 422 |
- dev-libs/icu:0= |
| 423 |
- dev-libs/librevenge |
| 424 |
- dev-libs/libxml2 |
| 425 |
- dev-qt/qtcore:5 |
| 426 |
- dev-qt/qtgui:5[-gles2-only] |
| 427 |
- dev-qt/qtnetwork:5 |
| 428 |
- dev-qt/qtopengl:5 |
| 429 |
- dev-qt/qtprintsupport:5 |
| 430 |
- dev-qt/qtwidgets:5 |
| 431 |
- dev-qt/qtxml:5 |
| 432 |
- media-libs/fontconfig |
| 433 |
- media-libs/freetype:2 |
| 434 |
- media-libs/harfbuzz:0=[icu] |
| 435 |
- media-libs/lcms:2 |
| 436 |
- media-libs/libcdr |
| 437 |
- media-libs/libfreehand |
| 438 |
- media-libs/libpagemaker |
| 439 |
- media-libs/libpng:0= |
| 440 |
- media-libs/libvisio |
| 441 |
- media-libs/libzmf |
| 442 |
- media-libs/tiff:0 |
| 443 |
- net-print/cups |
| 444 |
- sys-libs/zlib[minizip] |
| 445 |
- virtual/jpeg:0= |
| 446 |
- x11-libs/cairo[X,svg] |
| 447 |
- boost? ( dev-libs/boost:= ) |
| 448 |
- graphicsmagick? ( media-gfx/graphicsmagick:= ) |
| 449 |
- hunspell? ( app-text/hunspell:= ) |
| 450 |
- osg? ( dev-games/openscenegraph:= ) |
| 451 |
- pdf? ( app-text/podofo:0= ) |
| 452 |
- scripts? ( |
| 453 |
- $(python_gen_cond_dep ' |
| 454 |
- dev-python/pillow[tk?,${PYTHON_USEDEP}] |
| 455 |
- ') |
| 456 |
- ) |
| 457 |
-" |
| 458 |
-RDEPEND="${DEPEND} |
| 459 |
- app-text/ghostscript-gpl |
| 460 |
-" |
| 461 |
-BDEPEND=" |
| 462 |
- dev-qt/linguist-tools:5 |
| 463 |
- virtual/pkgconfig |
| 464 |
-" |
| 465 |
- |
| 466 |
-PATCHES=( |
| 467 |
- # non(?)-upstreamable |
| 468 |
- "${FILESDIR}"/${PN}-1.5.3-fpic.patch |
| 469 |
- "${FILESDIR}"/${PN}-1.5.6-docdir.patch |
| 470 |
- "${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch |
| 471 |
- "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch |
| 472 |
- # upstream |
| 473 |
- "${FILESDIR}"/${PN}-1.5.8-harfbuzz-3.patch |
| 474 |
- "${FILESDIR}"/${PN}-1.5.7-osg-cpp17.patch |
| 475 |
-) |
| 476 |
- |
| 477 |
-CMAKE_BUILD_TYPE="Release" |
| 478 |
- |
| 479 |
-S="${WORKDIR}/${P}" |
| 480 |
- |
| 481 |
-src_prepare() { |
| 482 |
- cmake_src_prepare |
| 483 |
- |
| 484 |
- rm -r codegen/cheetah scribus/third_party/hyphen || die |
| 485 |
- |
| 486 |
- sed \ |
| 487 |
- -e "/^\s*unzip\.[ch]/d" \ |
| 488 |
- -e "/^\s*ioapi\.[ch]/d" \ |
| 489 |
- -i scribus/CMakeLists.txt Scribus.pro || die |
| 490 |
- rm scribus/ioapi.[ch] || die |
| 491 |
- |
| 492 |
- sed \ |
| 493 |
- -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ |
| 494 |
- -i resources/templates/CMakeLists.txt || die |
| 495 |
- |
| 496 |
- sed \ |
| 497 |
- -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \ |
| 498 |
- -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test |
| 499 |
-} |
| 500 |
- |
| 501 |
-src_configure() { |
| 502 |
- # bug #550818 |
| 503 |
- append-cppflags -DHAVE_MEMRCHR |
| 504 |
- |
| 505 |
- local mycmakeargs=( |
| 506 |
- -DHAVE_PYTHON=ON |
| 507 |
- -DWANT_DISTROBUILD=ON |
| 508 |
- -DWANT_CPP17=ON |
| 509 |
- -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/ |
| 510 |
- -DPython3_EXECUTABLE="${PYTHON}" |
| 511 |
- -DWITH_BOOST=$(usex boost) |
| 512 |
- -DWANT_DEBUG=$(usex debug) |
| 513 |
- -DWANT_NOEXAMPLES=$(usex !examples) |
| 514 |
- -DWANT_GRAPHICSMAGICK=$(usex graphicsmagick) |
| 515 |
- -DWANT_HUNSPELL=$(usex hunspell) |
| 516 |
- -DWANT_HEADERINSTALL=$(usex !minimal) |
| 517 |
- -DWANT_NOOSG=$(usex !osg) |
| 518 |
- -DWITH_PODOFO=$(usex pdf) |
| 519 |
- -DWANT_NOTEMPLATES=$(usex !templates) |
| 520 |
- ) |
| 521 |
- cmake_src_configure |
| 522 |
-} |
| 523 |
- |
| 524 |
-src_install() { |
| 525 |
- cmake_src_install |
| 526 |
- |
| 527 |
- if ! use tk; then |
| 528 |
- rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die |
| 529 |
- fi |
| 530 |
- if use scripts; then |
| 531 |
- python_fix_shebang "${ED}"/usr/share/scribus/scripts |
| 532 |
- python_optimize "${ED}"/usr/share/scribus/scripts |
| 533 |
- else |
| 534 |
- rm "${ED}"/usr/share/scribus/scripts/*.py || die |
| 535 |
- fi |
| 536 |
- |
| 537 |
- mv "${ED}"/usr/share/doc/${PF}/{en,html} || die |
| 538 |
- ln -sf html "${ED}"/usr/share/doc/${PF}/en || die |
| 539 |
- |
| 540 |
- # These files are parsed to populate the help/about window. |
| 541 |
- cat >> "${T}"/COPYING <<- EOF || die |
| 542 |
- ${PN} is licensed under the "${LICENSE}". |
| 543 |
- Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text. |
| 544 |
- EOF |
| 545 |
- dodoc "${T}"/COPYING |
| 546 |
- docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} |
| 547 |
- |
| 548 |
- local size |
| 549 |
- for size in 16 32 128 256 512; do |
| 550 |
- newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png |
| 551 |
- done |
| 552 |
- newicon -s 64 resources/iconsets/artwork/icon_32x32@××.png scribus.png |
| 553 |
- doicon resources/iconsets/*/scribus.png |
| 554 |
- domenu scribus.desktop |
| 555 |
-} |
Archives