Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] scribus: update to 1.5.8.
@ 2022-02-02 13:42 notthewave
  2022-02-02 14:12 ` [PR PATCH] [Updated] " notthewave
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: notthewave @ 2022-02-02 13:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 576 bytes --]

There is a new pull request by notthewave against master on the void-packages repository

https://github.com/notthewave/void-packages scribus
https://github.com/void-linux/void-packages/pull/35356

scribus: update to 1.5.8.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (on x86_64-musl)

Not sure if some of the patches are still necessary since it seems to work just fine.


A patch file from https://github.com/void-linux/void-packages/pull/35356.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scribus-35356.patch --]
[-- Type: text/x-diff, Size: 7821 bytes --]

From b2745d6dfde8c832317e4ed8e48162150062bc09 Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Wed, 2 Feb 2022 14:28:19 +0100
Subject: [PATCH] scribus: update to 1.5.8.

---
 .../patches/cmake-build-type-none.patch       | 32 ---------
 .../patches/export-symbols-for-plugins.patch  | 11 ---
 srcpkgs/scribus/patches/fix-musl.patch        | 31 ---------
 srcpkgs/scribus/patches/harfbuzz-3.0.0.patch  | 68 -------------------
 srcpkgs/scribus/template                      |  6 +-
 5 files changed, 3 insertions(+), 145 deletions(-)
 delete mode 100644 srcpkgs/scribus/patches/cmake-build-type-none.patch
 delete mode 100644 srcpkgs/scribus/patches/export-symbols-for-plugins.patch
 delete mode 100644 srcpkgs/scribus/patches/fix-musl.patch
 delete mode 100644 srcpkgs/scribus/patches/harfbuzz-3.0.0.patch

diff --git a/srcpkgs/scribus/patches/cmake-build-type-none.patch b/srcpkgs/scribus/patches/cmake-build-type-none.patch
deleted file mode 100644
index b5011c92823e..000000000000
--- a/srcpkgs/scribus/patches/cmake-build-type-none.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -75,11 +75,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
- 
- 
- #RPATH setup - more below too
--if (WANT_NORPATH OR WANT_DISTROBUILD)
--	set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
--else()
--	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
--endif()
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
- set(CMAKE_SKIP_BUILD_RPATH TRUE)
-@@ -330,15 +325,6 @@ include (CMakeLists_Directories.cmake)
- 
- #Convert our simpler command line option to the CMake style
- #None, Debug, Release, .. or custom ones
--if(WANT_DEBUG)
--	set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Set Debug Build Type" FORCE)
--endif()
--if (WANT_RELEASEWITHDEBUG)
--	set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Set Release with Debug Info Build Type" FORCE)
--endif()
--if(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
--	set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set Release Build Type" FORCE)
--endif()
- 
- 
- 
diff --git a/srcpkgs/scribus/patches/export-symbols-for-plugins.patch b/srcpkgs/scribus/patches/export-symbols-for-plugins.patch
deleted file mode 100644
index 83895c141aaa..000000000000
--- a/srcpkgs/scribus/patches/export-symbols-for-plugins.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scribus/CMakeLists.txt	2021-04-25 22:24:52.000000000 +0200
-+++ b/scribus/CMakeLists.txt	2021-06-12 16:23:22.884229251 +0200
-@@ -757,7 +757,7 @@
- # Should fix bug 6897 .
- 	set_target_properties(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
- endif ()
--if (GCC AND NOT WIN32)
-+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT WIN32)
- # Use the -E / --export-dynamic flag to ensure that symbols in the Scribus
- # binary are in the public symbol table for plugins. The symbols must also
- # be set as SCRIBUS_API if we're building with -fvisibility=hidden .
diff --git a/srcpkgs/scribus/patches/fix-musl.patch b/srcpkgs/scribus/patches/fix-musl.patch
deleted file mode 100644
index 1b47170b9726..000000000000
--- a/srcpkgs/scribus/patches/fix-musl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/scribus/util.cpp	2019-07-31 00:35:04.000000000 +0200
-+++ b/scribus/util.cpp	2019-07-31 00:35:04.000000000 +0200
-@@ -40,7 +40,7 @@
- 
- #include <csignal>
- 
--#if !defined(_WIN32) && !defined(Q_OS_MAC) 
-+#if defined(__GLIBC__)
- #include <execinfo.h>
- #include <cxxabi.h>
- #endif
---- a/scribus/util_debug.cpp	2019-07-31 00:35:07.000000000 +0200
-+++ b/scribus/util_debug.cpp	2019-07-31 00:35:07.000000000 +0200
-@@ -24,7 +24,7 @@
- #include <QDateTime>
- #include <QtGlobal>
- 
--#if !defined(_WIN32) && !defined(Q_OS_MAC)
-+#if defined(__GLIBC__)
- #include <execinfo.h>
- #include <cxxabi.h>
- #endif
-@@ -54,7 +54,7 @@
-  */
- void printBacktrace ( int nFrames )
- {
--#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_FREEBSD)
-+#if defined(__GLIBC__)
- 	void ** trace = new void*[nFrames + 1];
- 	char **messages = ( char ** ) nullptr;
- 	int i, trace_size = 0;
diff --git a/srcpkgs/scribus/patches/harfbuzz-3.0.0.patch b/srcpkgs/scribus/patches/harfbuzz-3.0.0.patch
deleted file mode 100644
index 4dc4f0db4a36..000000000000
--- a/srcpkgs/scribus/patches/harfbuzz-3.0.0.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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
----
- scribus/fonts/sfnt.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp
-index fca8b39158..b3dfa50dc6 100644
---- 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())
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index cba287176947..0ec908f7ef50 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
-version=1.5.7
-revision=7
+version=1.5.8
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
@@ -17,5 +17,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://scribus.net"
 distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz"
-checksum=318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce
+checksum=47816e8fcf6d05788ff16aa4499f97ff22431c777a7789149b0a88b451e16b74
 python_version=3

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] scribus: update to 1.5.8.
  2022-02-02 13:42 [PR PATCH] scribus: update to 1.5.8 notthewave
@ 2022-02-02 14:12 ` notthewave
  2022-02-04 17:15 ` notthewave
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: notthewave @ 2022-02-02 14:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

There is an updated pull request by notthewave against master on the void-packages repository

https://github.com/notthewave/void-packages scribus
https://github.com/void-linux/void-packages/pull/35356

scribus: update to 1.5.8.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (on x86_64-musl)

Not sure if some of the patches are still necessary since it seems to work just fine.


A patch file from https://github.com/void-linux/void-packages/pull/35356.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scribus-35356.patch --]
[-- Type: text/x-diff, Size: 6557 bytes --]

From 7d8cadaafd0398f107690aea5cfe8989a246fb1f Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Wed, 2 Feb 2022 14:28:19 +0100
Subject: [PATCH] scribus: update to 1.5.8.

---
 .../patches/cmake-build-type-none.patch       | 32 ---------
 .../patches/export-symbols-for-plugins.patch  | 11 ---
 srcpkgs/scribus/patches/harfbuzz-3.0.0.patch  | 68 -------------------
 srcpkgs/scribus/template                      |  6 +-
 4 files changed, 3 insertions(+), 114 deletions(-)
 delete mode 100644 srcpkgs/scribus/patches/cmake-build-type-none.patch
 delete mode 100644 srcpkgs/scribus/patches/export-symbols-for-plugins.patch
 delete mode 100644 srcpkgs/scribus/patches/harfbuzz-3.0.0.patch

diff --git a/srcpkgs/scribus/patches/cmake-build-type-none.patch b/srcpkgs/scribus/patches/cmake-build-type-none.patch
deleted file mode 100644
index b5011c92823e..000000000000
--- a/srcpkgs/scribus/patches/cmake-build-type-none.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -75,11 +75,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
- 
- 
- #RPATH setup - more below too
--if (WANT_NORPATH OR WANT_DISTROBUILD)
--	set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
--else()
--	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
--endif()
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
- set(CMAKE_SKIP_BUILD_RPATH TRUE)
-@@ -330,15 +325,6 @@ include (CMakeLists_Directories.cmake)
- 
- #Convert our simpler command line option to the CMake style
- #None, Debug, Release, .. or custom ones
--if(WANT_DEBUG)
--	set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Set Debug Build Type" FORCE)
--endif()
--if (WANT_RELEASEWITHDEBUG)
--	set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Set Release with Debug Info Build Type" FORCE)
--endif()
--if(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
--	set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set Release Build Type" FORCE)
--endif()
- 
- 
- 
diff --git a/srcpkgs/scribus/patches/export-symbols-for-plugins.patch b/srcpkgs/scribus/patches/export-symbols-for-plugins.patch
deleted file mode 100644
index 83895c141aaa..000000000000
--- a/srcpkgs/scribus/patches/export-symbols-for-plugins.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scribus/CMakeLists.txt	2021-04-25 22:24:52.000000000 +0200
-+++ b/scribus/CMakeLists.txt	2021-06-12 16:23:22.884229251 +0200
-@@ -757,7 +757,7 @@
- # Should fix bug 6897 .
- 	set_target_properties(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
- endif ()
--if (GCC AND NOT WIN32)
-+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT WIN32)
- # Use the -E / --export-dynamic flag to ensure that symbols in the Scribus
- # binary are in the public symbol table for plugins. The symbols must also
- # be set as SCRIBUS_API if we're building with -fvisibility=hidden .
diff --git a/srcpkgs/scribus/patches/harfbuzz-3.0.0.patch b/srcpkgs/scribus/patches/harfbuzz-3.0.0.patch
deleted file mode 100644
index 4dc4f0db4a36..000000000000
--- a/srcpkgs/scribus/patches/harfbuzz-3.0.0.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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
----
- scribus/fonts/sfnt.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp
-index fca8b39158..b3dfa50dc6 100644
---- 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())
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index cba287176947..0ec908f7ef50 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
-version=1.5.7
-revision=7
+version=1.5.8
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
@@ -17,5 +17,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://scribus.net"
 distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz"
-checksum=318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce
+checksum=47816e8fcf6d05788ff16aa4499f97ff22431c777a7789149b0a88b451e16b74
 python_version=3

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] scribus: update to 1.5.8.
  2022-02-02 13:42 [PR PATCH] scribus: update to 1.5.8 notthewave
  2022-02-02 14:12 ` [PR PATCH] [Updated] " notthewave
@ 2022-02-04 17:15 ` notthewave
  2022-02-06 21:38 ` paper42
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: notthewave @ 2022-02-04 17:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

There is an updated pull request by notthewave against master on the void-packages repository

https://github.com/notthewave/void-packages scribus
https://github.com/void-linux/void-packages/pull/35356

scribus: update to 1.5.8.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (on x86_64-musl)

Not sure if some of the patches are still necessary since it seems to work just fine.


A patch file from https://github.com/void-linux/void-packages/pull/35356.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scribus-35356.patch --]
[-- Type: text/x-diff, Size: 5859 bytes --]

From 57ee7fb4c7cb4d597dfcf2cfb7dfd8242c8087ea Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Wed, 2 Feb 2022 14:28:19 +0100
Subject: [PATCH] scribus: update to 1.5.8.

---
 ...-none.patch => cmake-buildtype-none.patch} |  3 -
 .../patches/export-symbols-for-plugins.patch  | 11 ---
 srcpkgs/scribus/patches/harfbuzz-3.0.0.patch  | 68 -------------------
 srcpkgs/scribus/template                      |  6 +-
 4 files changed, 3 insertions(+), 85 deletions(-)
 rename srcpkgs/scribus/patches/{cmake-build-type-none.patch => cmake-buildtype-none.patch} (99%)
 delete mode 100644 srcpkgs/scribus/patches/export-symbols-for-plugins.patch
 delete mode 100644 srcpkgs/scribus/patches/harfbuzz-3.0.0.patch

diff --git a/srcpkgs/scribus/patches/cmake-build-type-none.patch b/srcpkgs/scribus/patches/cmake-buildtype-none.patch
similarity index 99%
rename from srcpkgs/scribus/patches/cmake-build-type-none.patch
rename to srcpkgs/scribus/patches/cmake-buildtype-none.patch
index b5011c92823e..ea1df49410ed 100644
--- a/srcpkgs/scribus/patches/cmake-build-type-none.patch
+++ b/srcpkgs/scribus/patches/cmake-buildtype-none.patch
@@ -27,6 +27,3 @@ Index: CMakeLists.txt
 -if(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
 -	set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set Release Build Type" FORCE)
 -endif()
- 
- 
- 
diff --git a/srcpkgs/scribus/patches/export-symbols-for-plugins.patch b/srcpkgs/scribus/patches/export-symbols-for-plugins.patch
deleted file mode 100644
index 83895c141aaa..000000000000
--- a/srcpkgs/scribus/patches/export-symbols-for-plugins.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scribus/CMakeLists.txt	2021-04-25 22:24:52.000000000 +0200
-+++ b/scribus/CMakeLists.txt	2021-06-12 16:23:22.884229251 +0200
-@@ -757,7 +757,7 @@
- # Should fix bug 6897 .
- 	set_target_properties(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
- endif ()
--if (GCC AND NOT WIN32)
-+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT WIN32)
- # Use the -E / --export-dynamic flag to ensure that symbols in the Scribus
- # binary are in the public symbol table for plugins. The symbols must also
- # be set as SCRIBUS_API if we're building with -fvisibility=hidden .
diff --git a/srcpkgs/scribus/patches/harfbuzz-3.0.0.patch b/srcpkgs/scribus/patches/harfbuzz-3.0.0.patch
deleted file mode 100644
index 4dc4f0db4a36..000000000000
--- a/srcpkgs/scribus/patches/harfbuzz-3.0.0.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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
----
- scribus/fonts/sfnt.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp
-index fca8b39158..b3dfa50dc6 100644
---- 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())
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index cba287176947..0ec908f7ef50 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
-version=1.5.7
-revision=7
+version=1.5.8
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
@@ -17,5 +17,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://scribus.net"
 distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz"
-checksum=318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce
+checksum=47816e8fcf6d05788ff16aa4499f97ff22431c777a7789149b0a88b451e16b74
 python_version=3

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: scribus: update to 1.5.8.
  2022-02-02 13:42 [PR PATCH] scribus: update to 1.5.8 notthewave
  2022-02-02 14:12 ` [PR PATCH] [Updated] " notthewave
  2022-02-04 17:15 ` notthewave
@ 2022-02-06 21:38 ` paper42
  2022-02-06 23:22 ` notthewave
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2022-02-06 21:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35356#issuecomment-1030919852

Comment:
If you can't reproduce #31343, it was probably fixed upstream and we don't need export-symbols-for-plugins.patch. harfbuzz-3.0.0.patch is already applied in 1.5.8.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: scribus: update to 1.5.8.
  2022-02-02 13:42 [PR PATCH] scribus: update to 1.5.8 notthewave
                   ` (2 preceding siblings ...)
  2022-02-06 21:38 ` paper42
@ 2022-02-06 23:22 ` notthewave
  2022-02-06 23:22 ` notthewave
  2022-02-08 21:41 ` [PR PATCH] [Merged]: " paper42
  5 siblings, 0 replies; 7+ messages in thread
From: notthewave @ 2022-02-06 23:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

New comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/35356#issuecomment-1030938825

Comment:
Can't reproduce. 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: scribus: update to 1.5.8.
  2022-02-02 13:42 [PR PATCH] scribus: update to 1.5.8 notthewave
                   ` (3 preceding siblings ...)
  2022-02-06 23:22 ` notthewave
@ 2022-02-06 23:22 ` notthewave
  2022-02-08 21:41 ` [PR PATCH] [Merged]: " paper42
  5 siblings, 0 replies; 7+ messages in thread
From: notthewave @ 2022-02-06 23:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

New comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/35356#issuecomment-1030938825

Comment:
Can't reproduce. I'm able to save and open files.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Merged]: scribus: update to 1.5.8.
  2022-02-02 13:42 [PR PATCH] scribus: update to 1.5.8 notthewave
                   ` (4 preceding siblings ...)
  2022-02-06 23:22 ` notthewave
@ 2022-02-08 21:41 ` paper42
  5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2022-02-08 21:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 419 bytes --]

There's a merged pull request on the void-packages repository

scribus: update to 1.5.8.
https://github.com/void-linux/void-packages/pull/35356

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (on x86_64-musl)

Not sure if some of the patches are still necessary since it seems to work just fine.


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-02-08 21:41 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-02 13:42 [PR PATCH] scribus: update to 1.5.8 notthewave
2022-02-02 14:12 ` [PR PATCH] [Updated] " notthewave
2022-02-04 17:15 ` notthewave
2022-02-06 21:38 ` paper42
2022-02-06 23:22 ` notthewave
2022-02-06 23:22 ` notthewave
2022-02-08 21:41 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).