From d434c8f99e46bd872a95f19f9c46fe62ae316add Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 7 Feb 2024 15:42:33 +0100 Subject: [PATCH] scribus, revbump for boost and icu version (#10067) --- .../scribus/patches/scribus-1.5.8.patchset | 40 +++++++++++++++---- app-office/scribus/scribus-1.5.8.recipe | 13 +++--- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/app-office/scribus/patches/scribus-1.5.8.patchset b/app-office/scribus/patches/scribus-1.5.8.patchset index d2ebdb3af..6380b38dd 100644 --- a/app-office/scribus/patches/scribus-1.5.8.patchset +++ b/app-office/scribus/patches/scribus-1.5.8.patchset @@ -1,4 +1,4 @@ -From afa4cb6d40e13f22edc678a0bc52fee1f0dade55 Mon Sep 17 00:00:00 2001 +From 317cbb4c0b3d14d17a8133064e612d232e11ab16 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 16 Nov 2020 21:51:24 +1000 Subject: Fix build @@ -103,10 +103,10 @@ index 6f19200..d3a8c61 100644 char **messages = ( char ** ) nullptr; int i, trace_size = 0; -- -2.30.2 +2.42.1 -From 27b2024b2f783d09c103059924852838eff45407 Mon Sep 17 00:00:00 2001 +From bcb78fea0a4dad74ceda05f83b10d55631a20d08 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 8 Jan 2021 22:00:46 +1000 Subject: Fix for app font @@ -163,10 +163,10 @@ index dca5b13..3a2e2bd 100644 if (m_prefsManager.appPrefs.uiPrefs.useTabs) { -- -2.30.2 +2.42.1 -From 4ad3b247e814bb8fddcf56508ac00ce1bdfd6fa0 Mon Sep 17 00:00:00 2001 +From 658834b7e64883bb02756c4472e465c71f0e8760 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 22 Nov 2021 20:40:09 +0100 Subject: Prefer the shared libpython3 @@ -185,10 +185,10 @@ index 0a660bf..281fc33 100644 if (Python3_Development_FOUND) message("Python 3.x Library Found OK (Version ${Python3_VERSION})") -- -2.30.2 +2.42.1 -From 06f52ede0e7b7c5b226791b16e499f185f19fd48 Mon Sep 17 00:00:00 2001 +From 77a5ec18de343f8607c4002e427360267970954d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 25 Feb 2022 20:42:38 +0100 Subject: fix uint32_t type for x86 @@ -269,5 +269,29 @@ index 1073051..0a8e539 100644 if (TIFFGetField(tif, TIFFTAG_ICCPROFILE, &EmbedLen, &EmbedBuffer)) { -- -2.30.2 +2.42.1 + + +From 3c6cd8097d56943de6267eb668c70906c8b60d7b Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Wed, 7 Feb 2024 14:39:53 +0100 +Subject: Silence deprecated warnings + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a5b56d0..a7cb5c6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -392,6 +392,9 @@ if(WIN32) + set(BUILD_WINDOWS_VERSION ON) + set(DLL_USE_NATIVE_API ON) + endif() ++if(HAIKU) ++ add_definitions(-Wno-deprecated-declarations) ++endif() + + #C++11 Support + #as of 1.5.5.svn, require C++11 +-- +2.42.1 diff --git a/app-office/scribus/scribus-1.5.8.recipe b/app-office/scribus/scribus-1.5.8.recipe index 7340ce5d2..dd4ff6205 100644 --- a/app-office/scribus/scribus-1.5.8.recipe +++ b/app-office/scribus/scribus-1.5.8.recipe @@ -34,12 +34,12 @@ REQUIRES=" lib:libharfbuzz_icu$secondaryArchSuffix lib:libhunspell_1.7$secondaryArchSuffix lib:libhyphen$secondaryArchSuffix - lib:libicudata$secondaryArchSuffix >= 66 - lib:libicuuc$secondaryArchSuffix >= 66 + lib:libicudata$secondaryArchSuffix + lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:liblcms2$secondaryArchSuffix lib:libmspub_0.1$secondaryArchSuffix - lib:libpagemaker_0.0${secondaryArchSuffix} + lib:libpagemaker_0.0$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libpodofo$secondaryArchSuffix lib:libpoppler$secondaryArchSuffix @@ -55,8 +55,8 @@ REQUIRES=" lib:libQt5Xml$secondaryArchSuffix lib:libqxp_0.0$secondaryArchSuffix lib:librevenge_0.0${secondaryArchSuffix} - lib:librevenge_generators_0.0${secondaryArchSuffix} - lib:librevenge_stream_0.0${secondaryArchSuffix} + lib:librevenge_generators_0.0$secondaryArchSuffix + lib:librevenge_stream_0.0$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libtiff$secondaryArchSuffix lib:libvisio_0.1$secondaryArchSuffix @@ -67,7 +67,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libboost_system${secondaryArchSuffix} >= 1.69.0 + devel:libboost_system$secondaryArchSuffix >= 1.83.0 devel:libcairo$secondaryArchSuffix devel:libcdr_0.1$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix @@ -76,6 +76,7 @@ BUILD_REQUIRES=" devel:libfreehand_0.1$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libGL$secondaryArchSuffix + devel:libicuuc$secondaryArchSuffix >= 74 devel:libharfbuzz_icu$secondaryArchSuffix devel:libhunspell_1.7$secondaryArchSuffix devel:libhyphen$secondaryArchSuffix