diff --git a/app-office/scribus/patches/scribus-1.6.1.patchset b/app-office/scribus/patches/scribus-1.6.4.patchset similarity index 85% rename from app-office/scribus/patches/scribus-1.6.1.patchset rename to app-office/scribus/patches/scribus-1.6.4.patchset index 21bf8a310..b2fdbdbc7 100644 --- a/app-office/scribus/patches/scribus-1.6.1.patchset +++ b/app-office/scribus/patches/scribus-1.6.4.patchset @@ -1,14 +1,14 @@ -From acf250310c0549b74afbfe19fbcbcb03492e9566 Mon Sep 17 00:00:00 2001 +From e2462a46a5e48734b1cc062a2b87abce19b74ac0 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 diff --git a/CMakeLists.txt b/CMakeLists.txt -index d184843..29a4b68 100644 +index bdd66a3..1632620 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -430,7 +430,7 @@ include(CMakeLists_Dependencies.cmake) +@@ -443,7 +443,7 @@ include(CMakeLists_Dependencies.cmake) ############################################################################################################## ########## Include Setup ########## @@ -18,10 +18,10 @@ index d184843..29a4b68 100644 CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) if(HAVE_DLFCN_H) diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp -index 0a0185a..8820364 100644 +index c0fe919..47a3003 100644 --- a/scribus/scpaths.cpp +++ b/scribus/scpaths.cpp -@@ -327,6 +327,15 @@ QStringList ScPaths::spellDirs() const +@@ -347,6 +347,15 @@ QStringList ScPaths::spellDirs() const d.setPath(linuxLocalPath); if (d.exists()) spellDirs.append(linuxLocalPath); @@ -37,7 +37,7 @@ index 0a0185a..8820364 100644 #endif return spellDirs; } -@@ -393,6 +402,19 @@ QStringList ScPaths::hyphDirs() const +@@ -413,6 +422,19 @@ QStringList ScPaths::hyphDirs() const d.setPath(linuxLocalPath); if (d.exists()) hyphDirs.append(linuxLocalPath); @@ -57,7 +57,7 @@ index 0a0185a..8820364 100644 #endif return hyphDirs; } -@@ -416,6 +438,9 @@ QStringList ScPaths::systemFontDirs() +@@ -436,6 +458,9 @@ QStringList ScPaths::systemFontDirs() if (d.exists()) fontDirs.append(roamingFontDir); fontDirs.append(windowsSpecialDir(CSIDL_FONTS)); @@ -103,36 +103,20 @@ index 3c5b241..780c590 100644 char **messages = ( char ** ) nullptr; int i, trace_size = 0; -- -2.42.1 +2.48.1 -From b8b306f53f68c57c46cfd6b67e60efdd99549cac Mon Sep 17 00:00:00 2001 +From daaced09b34e4c6af6d7ddc54f4feacb18e20629 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 -diff --git a/scribus/prefsmanager.cpp b/scribus/prefsmanager.cpp -index 2d3a88e..eb72582 100644 ---- a/scribus/prefsmanager.cpp -+++ b/scribus/prefsmanager.cpp -@@ -2797,9 +2797,11 @@ bool PrefsManager::readPref(const QString& filePath) - else - appPrefs.uiPrefs.style.clear(); - } -+#ifndef Q_OS_HAIKU - QFont apf = QApplication::font(); - apf.setPointSize(appPrefs.uiPrefs.applicationFontSize); - QApplication::setFont(apf); -+#endif - return true; - } - diff --git a/scribus/scribus.cpp b/scribus/scribus.cpp -index 24f0dc6..31d3464 100644 +index d0f818c..369b778 100644 --- a/scribus/scribus.cpp +++ b/scribus/scribus.cpp -@@ -6479,12 +6479,14 @@ void ScribusMainWindow::slotPrefsOrg() +@@ -6480,12 +6480,14 @@ void ScribusMainWindow::slotPrefsOrg() ScQApp->changeIconSet(newIconSet); int newUIFontSize = m_prefsManager.guiFontSize(); @@ -147,21 +131,37 @@ index 24f0dc6..31d3464 100644 emit UpdateRequest(reqDefFontListUpdate); if (m_prefsManager.appPrefs.uiPrefs.useTabs) { +diff --git a/scribus/scribuscore.cpp b/scribus/scribuscore.cpp +index 231e32c..550d3e9 100644 +--- a/scribus/scribuscore.cpp ++++ b/scribus/scribuscore.cpp +@@ -186,9 +186,11 @@ int ScribusCore::initScribusCore(bool showSplash, bool showFontInfo, bool showPr + else + m_prefsManager.appPrefs.uiPrefs.style.clear(); + } ++#ifndef Q_OS_HAIKU + QFont apf = QApplication::font(); + apf.setPointSize(m_prefsManager.appPrefs.uiPrefs.applicationFontSize); + QApplication::setFont(apf); ++#endif + + LocaleManager::instance().setUserPreferredLocale(m_prefsManager.appPrefs.uiPrefs.userPreferredLocale); + m_prefsManager.appPrefs.uiPrefs.showSplashOnStartup = showSplash; -- -2.42.1 +2.48.1 -From e6a1e1c485659e33110215b156f4c27547eedf13 Mon Sep 17 00:00:00 2001 +From 678f20b7081f0ea2833ca43fe10d7468182ce80c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 22 Nov 2021 20:40:09 +0100 Subject: Prefer the shared libpython3 diff --git a/CMakeLists_Dependencies.cmake b/CMakeLists_Dependencies.cmake -index 05dd4fc..e16165c 100644 +index 8e609b1..1dcef14 100644 --- a/CMakeLists_Dependencies.cmake +++ b/CMakeLists_Dependencies.cmake -@@ -200,6 +200,7 @@ endif() +@@ -207,6 +207,7 @@ endif() #<< PYTHON if (NOT WANT_PYTHON_2X) message("Python 3.x Selected") @@ -170,10 +170,10 @@ index 05dd4fc..e16165c 100644 if (Python3_Development_FOUND) message("Python 3.x Library Found OK (Version ${Python3_VERSION})") -- -2.42.1 +2.48.1 -From 39960d02011f1f4a910cbb4aa09f79871645f4ca Mon Sep 17 00:00:00 2001 +From 0a47da88d20154d6a2ede9ebfa163d78318b12a5 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 @@ -259,20 +259,20 @@ index a73ca7a..260d837 100644 if (TIFFGetField(tif, TIFFTAG_ICCPROFILE, &EmbedLen, &EmbedBuffer)) { -- -2.42.1 +2.48.1 -From ce882187467939b7bc69a4d270b8ec111f9e706c Mon Sep 17 00:00:00 2001 +From 2a54e2547a0396f624d0c4d02d4b802bd65384d7 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 29a4b68..8c5b8f6 100644 +index 1632620..06ab25a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -404,6 +404,9 @@ if(WIN32) +@@ -417,6 +417,9 @@ if(WIN32) ) set(DLL_USE_NATIVE_API ON) endif() @@ -283,10 +283,10 @@ index 29a4b68..8c5b8f6 100644 #C++11 Support #as of 1.5.5.svn, require C++11 -- -2.42.1 +2.48.1 -From c733b4c46aed6846baef952e7814c5695a96d45c Mon Sep 17 00:00:00 2001 +From 87a92341cd6c67cc363b35fbba2825535eb59761 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 29 May 2024 18:48:34 +0200 Subject: Haiku: don't set platform plugin @@ -306,5 +306,5 @@ index 626be05..4fa712b 100644 #endif -- -2.42.1 +2.48.1 diff --git a/app-office/scribus/scribus-1.6.1.recipe b/app-office/scribus/scribus-1.6.4.recipe similarity index 93% rename from app-office/scribus/scribus-1.6.1.recipe rename to app-office/scribus/scribus-1.6.4.recipe index 6e4ba6b71..50a003704 100644 --- a/app-office/scribus/scribus-1.6.1.recipe +++ b/app-office/scribus/scribus-1.6.4.recipe @@ -7,11 +7,11 @@ user-friendly interface, Scribus supports professional publishing features, \ such as color separations, CMYK and spot colors, ICC color management, and \ versatile PDF creation." HOMEPAGE="https://www.scribus.net" -COPYRIGHT="2014-2022 Scribus Team" +COPYRIGHT="2014-2025 Scribus Team" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="https://sourceforge.net/projects/scribus/files/scribus/$portVersion/scribus-$portVersion.tar.xz" -CHECKSUM_SHA256="e09dd78e6db61d01b9321108fededbccd6ec0ab352dd5bafdb8b041f0ef79e99" +CHECKSUM_SHA256="533be7af03acfaa736ec5f7a3fc2562abd200fef5ca2a7cdee02b5f44d61829e" PATCHES="scribus-$portVersion.patchset" ADDITIONAL_FILES="scribus.rdef.in" @@ -68,10 +68,10 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libboost_system$secondaryArchSuffix >= 1.83.0 + devel:libboost_system$secondaryArchSuffix >= 1.88.0 devel:libcairo$secondaryArchSuffix devel:libcdr_0.1$secondaryArchSuffix - devel:libcrypto$secondaryArchSuffix >= 3 + devel:libcrypto$secondaryArchSuffix devel:libexecinfo$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix devel:libfreehand_0.1$secondaryArchSuffix @@ -87,12 +87,12 @@ BUILD_REQUIRES=" devel:libpagemaker_0.0$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libpodofo$secondaryArchSuffix - devel:libpoppler$secondaryArchSuffix >= 133 + devel:libpoppler$secondaryArchSuffix >= 148 devel:libpython3.10$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libqxp_0.0$secondaryArchSuffix devel:librevenge_0.0$secondaryArchSuffix - devel:libssl$secondaryArchSuffix >= 3 + devel:libssl$secondaryArchSuffix devel:libtiff$secondaryArchSuffix devel:libvisio_0.1$secondaryArchSuffix devel:libxml2$secondaryArchSuffix