gentoo resync : 06.04.2022

3 files changed, 0 insertions, 338 deletions

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 <QSet>
- 
- #include "scribusapi.h"
--#include "third_party/hyphen/hyphen.h"
-+#include <hyphen.h>
- 
- 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 <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/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 <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