haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

scribus: bump version

Browse Source
This commit is contained in:
Jerome Duval
2024-05-29 18:49:58 +02:00
parent 506eacab2c
commit a801f52075
2 changed files with 79 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
app-office/scribus/patches/scribus-1.5.8.patchset → app-office/scribus/patches/scribus-1.6.1.patchset
View File

@@ -1,14 +1,14 @@
From 317cbb4c0b3d14d17a8133064e612d232e11ab16 Mon Sep 17 00:00:00 2001
From acf250310c0549b74afbfe19fbcbcb03492e9566 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 a1f259e..a5b56d0 100644
index d184843..29a4b68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -421,7 +421,7 @@ include(CMakeLists_Dependencies.cmake)
@@ -430,7 +430,7 @@ include(CMakeLists_Dependencies.cmake)
##############################################################################################################
########## Include Setup ##########
@@ -18,10 +18,10 @@ index a1f259e..a5b56d0 100644
CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
if(HAVE_DLFCN_H)
diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp
index 7d5b424..66995bf 100644
index 0a0185a..8820364 100644
--- a/scribus/scpaths.cpp
+++ b/scribus/scpaths.cpp
@@ -322,6 +322,15 @@ QStringList ScPaths::spellDirs() const
@@ -327,6 +327,15 @@ QStringList ScPaths::spellDirs() const
d.setPath(linuxLocalPath);
if (d.exists())
spellDirs.append(linuxLocalPath);
@@ -37,7 +37,7 @@ index 7d5b424..66995bf 100644
#endif
return spellDirs;
}
@@ -388,6 +397,19 @@ QStringList ScPaths::hyphDirs() const
@@ -393,6 +402,19 @@ QStringList ScPaths::hyphDirs() const
d.setPath(linuxLocalPath);
if (d.exists())
hyphDirs.append(linuxLocalPath);
@@ -57,7 +57,7 @@ index 7d5b424..66995bf 100644
#endif
return hyphDirs;
}
@@ -411,6 +433,9 @@ QStringList ScPaths::systemFontDirs()
@@ -416,6 +438,9 @@ QStringList ScPaths::systemFontDirs()
if (d.exists())
fontDirs.append(roamingFontDir);
fontDirs.append(windowsSpecialDir(CSIDL_FONTS));
@@ -90,15 +90,15 @@ index 55a5828..f421582 100644
return errno;
} else {
diff --git a/scribus/util_debug.cpp b/scribus/util_debug.cpp
index 6f19200..d3a8c61 100644
index 3c5b241..780c590 100644
--- a/scribus/util_debug.cpp
+++ b/scribus/util_debug.cpp
@@ -53,7 +53,7 @@ void tDebug(const QString& message)
*/
void printBacktrace ( int nFrames )
{
-#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_FREEBSD)
+#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_FREEBSD) && !defined(Q_OS_HAIKU)
-#if !defined(_WIN32) && !defined(Q_OS_MACOS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_FREEBSD)
+#if !defined(_WIN32) && !defined(Q_OS_MACOS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_FREEBSD) && !defined(Q_OS_HAIKU)
void ** trace = new void*[nFrames + 1];
char **messages = ( char ** ) nullptr;
int i, trace_size = 0;
@@ -106,57 +106,42 @@ index 6f19200..d3a8c61 100644
2.42.1
From bcb78fea0a4dad74ceda05f83b10d55631a20d08 Mon Sep 17 00:00:00 2001
From b8b306f53f68c57c46cfd6b67e60efdd99549cac 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/main_nix.cpp b/scribus/main_nix.cpp
index e50217e..a20ab3c 100644
--- a/scribus/main_nix.cpp
+++ b/scribus/main_nix.cpp
@@ -64,8 +64,9 @@ int main(int argc, char *argv[])
int mainApp(int argc, char **argv)
{
emergencyActivated = false;
-
+#ifndef Q_OS_HAIKU
ScribusQApp::setAttribute(Qt::AA_EnableHighDpiScaling);
+#endif
ScribusQApp app(argc, argv);
initCrashHandler();
app.parseCommandLine();
diff --git a/scribus/prefsmanager.cpp b/scribus/prefsmanager.cpp
index e6fe249..98b672e 100644
index 2d3a88e..eb72582 100644
--- a/scribus/prefsmanager.cpp
+++ b/scribus/prefsmanager.cpp
@@ -2783,9 +2783,11 @@ bool PrefsManager::readPref(const QString& filePath)
@@ -2797,9 +2797,11 @@ bool PrefsManager::readPref(const QString& filePath)
else
appPrefs.uiPrefs.style.clear();
}
+#ifndef Q_OS_HAIKU
QFont apf = qApp->font();
QFont apf = QApplication::font();
apf.setPointSize(appPrefs.uiPrefs.applicationFontSize);
qApp->setFont(apf);
QApplication::setFont(apf);
+#endif
return true;
}
diff --git a/scribus/scribus.cpp b/scribus/scribus.cpp
index dca5b13..3a2e2bd 100644
index 24f0dc6..31d3464 100644
--- a/scribus/scribus.cpp
+++ b/scribus/scribus.cpp
@@ -6484,12 +6484,14 @@ void ScribusMainWindow::slotPrefsOrg()
@@ -6479,12 +6479,14 @@ void ScribusMainWindow::slotPrefsOrg()
ScQApp->changeIconSet(newIconSet);
int newUIFontSize = m_prefsManager.guiFontSize();
+#ifndef Q_OS_HAIKU
if (oldPrefs.uiPrefs.applicationFontSize != newUIFontSize)
{
QFont apf = qApp->font();
QFont apf = QApplication::font();
apf.setPointSize(newUIFontSize);
qApp->setFont(apf);
QApplication::setFont(apf);
}
+#endif
emit UpdateRequest(reqDefFontListUpdate);
@@ -166,17 +151,17 @@ index dca5b13..3a2e2bd 100644
2.42.1
From 658834b7e64883bb02756c4472e465c71f0e8760 Mon Sep 17 00:00:00 2001
From e6a1e1c485659e33110215b156f4c27547eedf13 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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 0a660bf..281fc33 100644
index 05dd4fc..e16165c 100644
--- a/CMakeLists_Dependencies.cmake
+++ b/CMakeLists_Dependencies.cmake
@@ -160,6 +160,7 @@ endif()
@@ -200,6 +200,7 @@ endif()
#<< PYTHON
if (NOT WANT_PYTHON_2X)
message("Python 3.x Selected")
@@ -188,17 +173,17 @@ index 0a660bf..281fc33 100644
2.42.1
From 77a5ec18de343f8607c4002e427360267970954d Mon Sep 17 00:00:00 2001
From 39960d02011f1f4a910cbb4aa09f79871645f4ca Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 25 Feb 2022 20:42:38 +0100
Subject: fix uint32_t type for x86
diff --git a/scribus/imagedataloaders/scimgdataloader_tiff.cpp b/scribus/imagedataloaders/scimgdataloader_tiff.cpp
index 1073051..0a8e539 100644
index a73ca7a..260d837 100644
--- a/scribus/imagedataloaders/scimgdataloader_tiff.cpp
+++ b/scribus/imagedataloaders/scimgdataloader_tiff.cpp
@@ -52,7 +52,7 @@ void ScImgDataLoader_TIFF::loadEmbeddedProfile(const QString& fn, int /*page*/)
@@ -49,7 +49,7 @@ void ScImgDataLoader_TIFF::loadEmbeddedProfile(const QString& fn, int /*page*/)
if (!tif)
return;
@@ -207,16 +192,14 @@ index 1073051..0a8e539 100644
void* EmbedBuffer;
if (TIFFGetField(tif, TIFFTAG_ICCPROFILE, &EmbedLen, &EmbedBuffer))
{
@@ -289,26 +289,26 @@ bool ScImgDataLoader_TIFF::getImageData(TIFF* tif, RawImage *image, uint widtht,
@@ -302,19 +302,19 @@ bool ScImgDataLoader_TIFF::getImageData(TIFF* tif, RawImage *image, uint widtht,
if (TIFFIsTiled(tif))
{
- uint32_t columns, rows;
- uint32_t *tile_buf;
- uint32_t xt, yt;
+ uint32 columns, rows;
+ uint32 *tile_buf;
+ uint32 xt, yt;
TIFFGetField(tif, TIFFTAG_TILEWIDTH, &columns);
TIFFGetField(tif, TIFFTAG_TILELENGTH, &rows);
- tile_buf = (uint32_t*) _TIFFmalloc(columns * rows * sizeof(uint32_t));
@@ -226,22 +209,29 @@ index 1073051..0a8e539 100644
TIFFClose(tif);
return false;
}
- uint32_t tileW = columns, tileH = rows;
- for (yt = 0; yt < (uint32_t) image->height(); yt += rows)
+ uint32 tileW = columns, tileH = rows;
+ for (yt = 0; yt < (uint32) image->height(); yt += rows)
- uint32_t tileW = columns;
- uint32_t tileH = rows;
- for (uint32_t yt = 0; yt < (uint32_t) image->height(); yt += rows)
+ uint32 tileW = columns;
+ uint32 tileH = rows;
+ for (uint32 yt = 0; yt < (uint32) image->height(); yt += rows)
{
if (yt > (uint) image->height())
break;
if (image->height() - yt < rows)
@@ -322,10 +322,10 @@ bool ScImgDataLoader_TIFF::getImageData(TIFF* tif, RawImage *image, uint widtht,
tileH = image->height() - yt;
tileW = columns;
- uint32_t yi;
+ uint32 yi;
int chans = image->channels();
for (xt = 0; xt < (uint) image->width(); xt += columns)
- for (uint32_t xt = 0; xt < (uint) image->width(); xt += columns)
+ for (uint32 xt = 0; xt < (uint) image->width(); xt += columns)
{
@@ -325,7 +325,7 @@ bool ScImgDataLoader_TIFF::getImageData(TIFF* tif, RawImage *image, uint widtht,
TIFFReadTile(tif, tile_buf, xt, yt, 0, 0);
- for (uint32_t yi = 0; yi < tileH; yi++)
+ for (uint32 yi = 0; yi < tileH; yi++)
{
_TIFFmemcpy(image->scanLine(yt + (tileH - 1 - yi)) + xt, tile_buf + tileW * yi, tileW * chans);
}
@@ -337,7 +337,7 @@ bool ScImgDataLoader_TIFF::getImageData(TIFF* tif, RawImage *image, uint widtht,
{
int chans = image->channels();
tsize_t bytesperrow = TIFFScanlineSize(tif);
@@ -250,7 +240,7 @@ index 1073051..0a8e539 100644
if (bits)
{
for (unsigned int y = 0; y < heightt; y++)
@@ -351,7 +351,7 @@ bool ScImgDataLoader_TIFF::getImageData(TIFF* tif, RawImage *image, uint widtht,
@@ -363,7 +363,7 @@ bool ScImgDataLoader_TIFF::getImageData(TIFF* tif, RawImage *image, uint widtht,
bool ScImgDataLoader_TIFF::getImageData_RGBA(TIFF* tif, RawImage *image, uint widtht, uint heightt, uint size, const SampleFormatInfo& sampleInfo)
{
@@ -259,10 +249,10 @@ index 1073051..0a8e539 100644
if (!bits)
return false;
@@ -733,7 +733,7 @@ bool ScImgDataLoader_TIFF::loadPicture(const QString& fn, int page, int res, boo
m_imageInfoRecord.exifInfo.artist = QString(artist);
m_imageInfoRecord.exifInfo.thumbnail = QImage();
m_imageInfoRecord.exifDataValid = true;
@@ -755,7 +755,7 @@ bool ScImgDataLoader_TIFF::loadPicture(const QString& fn, int page, int res, boo
m_imageInfoRecord.profileName.clear();
m_imageInfoRecord.embeddedProfileName.clear();
- uint32_t EmbedLen = 0;
+ uint32 EmbedLen = 0;
void* EmbedBuffer;
@@ -272,18 +262,18 @@ index 1073051..0a8e539 100644
2.42.1
From 3c6cd8097d56943de6267eb668c70906c8b60d7b Mon Sep 17 00:00:00 2001
From ce882187467939b7bc69a4d270b8ec111f9e706c Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
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
index 29a4b68..8c5b8f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -392,6 +392,9 @@ if(WIN32)
set(BUILD_WINDOWS_VERSION ON)
@@ -404,6 +404,9 @@ if(WIN32)
)
set(DLL_USE_NATIVE_API ON)
endif()
+if(HAIKU)
@@ -295,3 +285,26 @@ index a5b56d0..a7cb5c6 100644
--
2.42.1
From c733b4c46aed6846baef952e7814c5695a96d45c Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 29 May 2024 18:48:34 +0200
Subject: Haiku: don't set platform plugin
diff --git a/scribus/main_nix.cpp b/scribus/main_nix.cpp
index 626be05..4fa712b 100644
--- a/scribus/main_nix.cpp
+++ b/scribus/main_nix.cpp
@@ -65,7 +65,7 @@ int mainApp(int argc, char **argv)
{
emergencyActivated = false;
-#if !defined(Q_OS_MACOS)
+#if !defined(Q_OS_MACOS) && !defined(Q_OS_HAIKU)
qputenv("QT_QPA_PLATFORM", "xcb");
#endif
--
2.42.1

9
app-office/scribus/scribus-1.5.8.recipe → app-office/scribus/scribus-1.6.1.recipe
View File

@@ -9,9 +9,9 @@ versatile PDF creation."
HOMEPAGE="https://www.scribus.net"
COPYRIGHT="2014-2022 Scribus Team"
LICENSE="GNU GPL v2"
REVISION="2"
SOURCE_URI="https://sourceforge.net/projects/scribus/files/scribus-devel/$portVersion/scribus-$portVersion.tar.xz"
CHECKSUM_SHA256="47816e8fcf6d05788ff16aa4499f97ff22431c777a7789149b0a88b451e16b74"
REVISION="1"
SOURCE_URI="https://sourceforge.net/projects/scribus/files/scribus/$portVersion/scribus-$portVersion.tar.xz"
CHECKSUM_SHA256="e09dd78e6db61d01b9321108fededbccd6ec0ab352dd5bafdb8b041f0ef79e99"
PATCHES="scribus-$portVersion.patchset"
ADDITIONAL_FILES="scribus.rdef.in"
@@ -58,6 +58,7 @@ REQUIRES="
lib:librevenge_generators_0.0$secondaryArchSuffix
lib:librevenge_stream_0.0$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
lib:libstdc++$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libvisio_0.1$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
@@ -86,7 +87,7 @@ BUILD_REQUIRES="
devel:libpagemaker_0.0$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libpodofo$secondaryArchSuffix
devel:libpoppler$secondaryArchSuffix >= 117
devel:libpoppler$secondaryArchSuffix >= 131
devel:libpython3.10$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libqxp_0.0$secondaryArchSuffix