mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
scribus: bump to 1.5.7 (#5883)
This commit is contained in:
kenmays
GitHub
@@ -1,14 +1,14 @@
|
||||
From 879e16368f70e15dbbfc77996788a6a59b286817 Mon Sep 17 00:00:00 2001
|
||||
From 77e723de9ed4ada3df11e6e7eea4964bb844b630 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 a8401b8..40860ff 100644
|
||||
index 3a536a3..327ae32 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -383,7 +383,7 @@ include(CMakeLists_Dependencies.cmake)
|
||||
@@ -408,7 +408,7 @@ include(CMakeLists_Dependencies.cmake)
|
||||
##############################################################################################################
|
||||
########## Include Setup ##########
|
||||
|
||||
@@ -17,21 +17,8 @@ index a8401b8..40860ff 100644
|
||||
|
||||
CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
|
||||
if(HAVE_DLFCN_H)
|
||||
diff --git a/cmake/modules/CAIROConfig.cmake b/cmake/modules/CAIROConfig.cmake
|
||||
index c047da3..3a35d4c 100644
|
||||
--- a/cmake/modules/CAIROConfig.cmake
|
||||
+++ b/cmake/modules/CAIROConfig.cmake
|
||||
@@ -19,7 +19,7 @@ else(PREFIX_CAIRO)
|
||||
# use pkgconfig to get the directories and then use these values
|
||||
# in the find_path() and find_library() calls
|
||||
include(FindPkgConfig)
|
||||
- pkg_search_module(CAIRO REQUIRED libcairo>=1.14.0 cairo>=1.14.0)
|
||||
+# pkg_search_module(CAIRO REQUIRED libcairo>=1.14.0 cairo>=1.14.0)
|
||||
endif(PREFIX_CAIRO)
|
||||
|
||||
find_path(CAIRO_INCLUDE_DIR
|
||||
diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp
|
||||
index 2f68eb5..b5918f9 100644
|
||||
index 25369fa..289fe68 100644
|
||||
--- a/scribus/scpaths.cpp
|
||||
+++ b/scribus/scpaths.cpp
|
||||
@@ -322,6 +322,15 @@ QStringList ScPaths::spellDirs() const
|
||||
@@ -116,10 +103,10 @@ index 5adfab7..ebf0bdb 100644
|
||||
char **messages = ( char ** ) nullptr;
|
||||
int i, trace_size = 0;
|
||||
--
|
||||
2.30.0
|
||||
2.30.2
|
||||
|
||||
|
||||
From e1abb27e77e98a0496980537bcb500d36642c521 Mon Sep 17 00:00:00 2001
|
||||
From f3e7d20b9428a20afadbcb324419b15858dcfbcb 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
|
||||
@@ -141,12 +128,12 @@ index e50217e..a20ab3c 100644
|
||||
initCrashHandler();
|
||||
app.parseCommandLine();
|
||||
diff --git a/scribus/prefsmanager.cpp b/scribus/prefsmanager.cpp
|
||||
index 6c68349..176dd76 100644
|
||||
index 6821fed..1fa5936 100644
|
||||
--- a/scribus/prefsmanager.cpp
|
||||
+++ b/scribus/prefsmanager.cpp
|
||||
@@ -2756,9 +2756,11 @@ bool PrefsManager::ReadPref(const QString& ho)
|
||||
// Eg : Windows XP and Windows Vista styles
|
||||
// qApp->setPalette(qApp->style()->standardPalette());
|
||||
@@ -2776,9 +2776,11 @@ bool PrefsManager::readPref(const QString& filePath)
|
||||
else
|
||||
appPrefs.uiPrefs.style.clear();
|
||||
}
|
||||
+#ifndef Q_OS_HAIKU
|
||||
QFont apf = qApp->font();
|
||||
@@ -157,10 +144,10 @@ index 6c68349..176dd76 100644
|
||||
}
|
||||
|
||||
diff --git a/scribus/scribus.cpp b/scribus/scribus.cpp
|
||||
index 47ddead..7253da9 100644
|
||||
index 7deca71..e6e16a6 100644
|
||||
--- a/scribus/scribus.cpp
|
||||
+++ b/scribus/scribus.cpp
|
||||
@@ -6517,12 +6517,14 @@ void ScribusMainWindow::slotPrefsOrg()
|
||||
@@ -6460,12 +6460,14 @@ void ScribusMainWindow::slotPrefsOrg()
|
||||
ScQApp->changeIconSet(newIconSet);
|
||||
|
||||
int newUIFontSize = m_prefsManager.guiFontSize();
|
||||
@@ -176,5 +163,5 @@ index 47ddead..7253da9 100644
|
||||
if (m_prefsManager.appPrefs.uiPrefs.useTabs)
|
||||
{
|
||||
--
|
||||
2.30.0
|
||||
2.30.2
|
||||
|
||||
150
app-office/scribus/scribus-1.5.7.recipe
Normal file
150
app-office/scribus/scribus-1.5.7.recipe
Normal file
@@ -0,0 +1,150 @@
|
||||
SUMMARY="A powerful desktop publishing application"
|
||||
DESCRIPTION="Scribus is an Open Source program that brings professional page \
|
||||
layout to Linux, BSD UNIX, Solaris, OpenIndiana, GNU/Hurd, Mac OS X, OS/2 \
|
||||
Warp 4, eComStation, Haiku and Windows desktops with a combination of \
|
||||
press-ready output and new approaches to page design. Underneath a modern and \
|
||||
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-2021 Scribus Team"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://sourceforge.net/projects/scribus/files/scribus-devel/$portVersion/scribus-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce"
|
||||
PATCHES="scribus-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="scribus.rdef.in"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
scribus$secondaryArchSuffix = $portVersion
|
||||
app:Scribus
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libcairo$secondaryArchSuffix
|
||||
lib:libcdr_0.1$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libexecinfo$secondaryArchSuffix
|
||||
lib:libfontconfig$secondaryArchSuffix
|
||||
lib:libfreehand_0.1$secondaryArchSuffix
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
lib:libharfbuzz_icu$secondaryArchSuffix
|
||||
lib:libhunspell_1.7$secondaryArchSuffix
|
||||
lib:libhyphen$secondaryArchSuffix
|
||||
lib:libicudata$secondaryArchSuffix >= 66
|
||||
lib:libicuuc$secondaryArchSuffix >= 66
|
||||
lib:libjpeg$secondaryArchSuffix
|
||||
lib:liblcms2$secondaryArchSuffix
|
||||
lib:libmspub_0.1$secondaryArchSuffix
|
||||
lib:libpagemaker_0.0${secondaryArchSuffix}
|
||||
lib:libpng16$secondaryArchSuffix
|
||||
lib:libpodofo$secondaryArchSuffix
|
||||
lib:libpoppler$secondaryArchSuffix
|
||||
lib:libpython3.9$secondaryArchSuffix
|
||||
lib:libQt5Core$secondaryArchSuffix
|
||||
lib:libQt5Gui$secondaryArchSuffix
|
||||
lib:libQt5Network$secondaryArchSuffix
|
||||
lib:libQt5OpenGL$secondaryArchSuffix
|
||||
lib:libQt5PrintSupport$secondaryArchSuffix
|
||||
lib:libQt5Qml$secondaryArchSuffix
|
||||
lib:libQt5Quick$secondaryArchSuffix
|
||||
lib:libQt5Widgets$secondaryArchSuffix
|
||||
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:libssl$secondaryArchSuffix
|
||||
lib:libtiff$secondaryArchSuffix
|
||||
lib:libvisio_0.1$secondaryArchSuffix
|
||||
lib:libxml2$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
lib:libzmf_0.0$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libboost_system${secondaryArchSuffix} >= 1.69.0
|
||||
devel:libcairo$secondaryArchSuffix
|
||||
devel:libcdr_0.1$secondaryArchSuffix
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libexecinfo$secondaryArchSuffix
|
||||
devel:libfontconfig$secondaryArchSuffix
|
||||
devel:libfreehand_0.1$secondaryArchSuffix
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libGL$secondaryArchSuffix
|
||||
devel:libharfbuzz_icu$secondaryArchSuffix
|
||||
devel:libhunspell_1.7$secondaryArchSuffix
|
||||
devel:libhyphen$secondaryArchSuffix
|
||||
devel:libjpeg$secondaryArchSuffix
|
||||
devel:liblcms2$secondaryArchSuffix
|
||||
devel:libmspub_0.1$secondaryArchSuffix
|
||||
devel:libpagemaker_0.0$secondaryArchSuffix
|
||||
devel:libpng16$secondaryArchSuffix
|
||||
devel:libpodofo$secondaryArchSuffix
|
||||
devel:libpoppler$secondaryArchSuffix >= 104
|
||||
devel:libpython3.9$secondaryArchSuffix
|
||||
devel:libQt5Core$secondaryArchSuffix
|
||||
devel:libqxp_0.0$secondaryArchSuffix
|
||||
devel:librevenge_0.0$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libtiff$secondaryArchSuffix
|
||||
devel:libvisio_0.1$secondaryArchSuffix
|
||||
devel:libxml2$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
devel:libzmf_0.0$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:lrelease$secondaryArchSuffix >= 5
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:python3.9
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
cmake . -DCMAKE_INSTALL_PREFIX=$appsDir/Scribus \
|
||||
-DEXECUTABLE_OUTPUT_PATH=$appsDir/Scribus \
|
||||
-DPLUGINDIR=$appsDir/Scribus/plugins \
|
||||
-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
|
||||
-DSHAREDIR=$dataDir \
|
||||
-DFONTCONFIG_INCLUDE_DIRS=/system/$relativeIncludeDir \
|
||||
-DFONTCONFIG_LIBRARY_DIRS=/system/$relativeDevelopLibDir \
|
||||
-DCAIRO_INCLUDE_DIRS=/system/$relativeIncludeDir/cairo \
|
||||
-DCAIRO_LIBRARY_DIRS=/system/$relativeDevelopLibDir \
|
||||
-DAPPLICATION_DATA_DIR="config/settings/Scribus" \
|
||||
-DWANT_DISTROBUILD=1 \
|
||||
-DWANT_CPP11=1 \
|
||||
-DLIB_SUFFIX="$secondaryArchSuffix"
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
mv $appsDir/Scribus/scribus $appsDir/Scribus/Scribus
|
||||
rm -rf $appsDir/Scribus/bin
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.scribus"
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
|
||||
local MINOR="`echo "$portVersion" | cut -d. -f3`"
|
||||
local LONG_INFO="$SUMMARY"
|
||||
sed \
|
||||
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
|
||||
-e "s|@MAJOR@|$MAJOR|" \
|
||||
-e "s|@MIDDLE@|$MIDDLE|" \
|
||||
-e "s|@MINOR@|$MINOR|" \
|
||||
-e "s|@LONG_INFO@|$LONG_INFO|" \
|
||||
$portDir/additional-files/scribus.rdef.in > $sourceDir/scribus.rdef
|
||||
|
||||
addResourcesToBinaries $sourceDir/scribus.rdef $appsDir/Scribus/Scribus
|
||||
addAppDeskbarSymlink $appsDir/Scribus/Scribus Scribus
|
||||
}
|
||||
Reference in New Issue
Block a user