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

Scribus: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-11-17 11:52:59 +10:00
parent db83bb8bf7
commit 779977a585
4 changed files with 130 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app-office/scribus/additional-files/scribus.rdef.in
View File

@@ -15,6 +15,8 @@ resource app_version {
resource app_signature "@APP_SIGNATURE@";
resource("QT:QPA_FLAGS") "Q_REF_TO_ARGV|Q_REF_TO_FORK";
resource file_types message {
"types" = "application/x-scribus",
"types" = "application/illustrator",

217
app-office/scribus/patches/scribus-1.5.5.patchset
View File

@@ -1,217 +0,0 @@
From 7531a9d2da091518921f5ba1b0566a76cf6edb30 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 11 Aug 2019 16:50:51 +1000
Subject: Fix build for Haiku
Disable python and scriptplugin
Add paths for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cfa1d5..246087e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -472,7 +472,7 @@ else()
endif()
#PLUGINS
-if(WIN32)
+if(WIN32 OR HAIKU)
set(PLUGINDIR "plugins")
elseif (APPLEBUNDLE)
set(PLUGINDIR "${LIBDIR}")
@@ -848,7 +848,7 @@ endif()
#<< PYTHON
#set(PythonLibs_FIND_VERSION 2)
find_package(PythonInterp 2)
-find_package(PythonLibs 2 REQUIRED)
+find_package(PythonLibs 2)
if (PYTHON_LIBRARY)
message("Python Library Found OK")
set(HAVE_PYTHON ON)
@@ -1027,7 +1027,7 @@ pkg_check_modules(ICU REQUIRED icu-uc)
##############################################################################################################
########## Include Setup ##########
-TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
+#TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
if(HAVE_DLFCN_H)
diff --git a/scribus/CMakeLists.txt b/scribus/CMakeLists.txt
index 2f1d39c..5a63364 100644
--- a/scribus/CMakeLists.txt
+++ b/scribus/CMakeLists.txt
@@ -1286,7 +1286,7 @@ target_link_libraries(${EXE_NAME}
${ICU_LIBRARIES}
${FONTCONFIG_LIBRARIES}
${LIBXML2_LIBRARIES}
- ${PYTHON_LIBRARIES}
+# ${PYTHON_LIBRARIES}
${TIFF_LIBRARIES}
${JPEG_LIBRARIES}
${ZLIB_LIBRARIES}
diff --git a/scribus/plugins/CMakeLists.txt b/scribus/plugins/CMakeLists.txt
index 4debb04..9026eb1 100644
--- a/scribus/plugins/CMakeLists.txt
+++ b/scribus/plugins/CMakeLists.txt
@@ -11,12 +11,12 @@ if(NOT WANT_SCRIPTER2)
#scripter1
if(NOT WIN32)
message(STATUS "Building with Scripter 1")
- add_subdirectory(scriptplugin)
+# add_subdirectory(scriptplugin)
endif()
else()
#scripter2
message(STATUS "Building with Scripter 2")
- add_subdirectory(scripter)
+# add_subdirectory(scripter)
endif()
add_subdirectory(short-words)
add_subdirectory(tools)
diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp
index acdc9af..87bd192 100644
--- a/scribus/scpaths.cpp
+++ b/scribus/scpaths.cpp
@@ -324,6 +324,15 @@ QStringList ScPaths::spellDirs() const
d.setPath(linuxLocalPath);
if (d.exists())
spellDirs.append(linuxLocalPath);
+#elif defined(Q_OS_HAIKU)
+ QString haikuSystemHunspellPath("/system/data/hunspell/");
+ QString haikuUserHunspellPath("/boot/home/config/non-packaged/data/hunspell/");
+ d.setPath(haikuSystemHunspellPath);
+ if (d.exists())
+ spellDirs.append(haikuSystemHunspellPath);
+ d.setPath(haikuUserHunspellPath);
+ if (d.exists())
+ spellDirs.append(haikuUserHunspellPath);
#endif
return spellDirs;
}
@@ -390,6 +399,19 @@ QStringList ScPaths::hyphDirs() const
d.setPath(linuxLocalPath);
if (d.exists())
hyphDirs.append(linuxLocalPath);
+#elif defined(Q_OS_HAIKU)
+ QString haikuSystemHyphenPath("/system/data/hyphen/");
+ QString haikuSystemHunspellPath("/system/data/hunspell/");
+ QString haikuUserHunspellPath("/boot/home/config/non-packaged/data/hunspell/");
+ d.setPath(haikuSystemHyphenPath);
+ if (d.exists())
+ hyphDirs.append(haikuSystemHyphenPath);
+ d.setPath(haikuSystemHunspellPath);
+ if (d.exists())
+ hyphDirs.append(haikuSystemHunspellPath);
+ d.setPath(haikuUserHunspellPath);
+ if (d.exists())
+ hyphDirs.append(haikuUserHunspellPath);
#endif
return hyphDirs;
}
@@ -413,6 +435,9 @@ QStringList ScPaths::systemFontDirs()
if (d.exists())
fontDirs.append(roamingFontDir);
fontDirs.append(windowsSpecialDir(CSIDL_FONTS));
+#elif defined(Q_OS_HAIKU)
+ fontDirs.append("/system/data/fonts/ttfonts");
+ fontDirs.append("/boot/home/config/non-packaged/data/fonts");
#endif
return fontDirs;
}
diff --git a/scribus/third_party/pgf/PGFplatform.h b/scribus/third_party/pgf/PGFplatform.h
index c3e3ed0..5184be9 100644
--- a/scribus/third_party/pgf/PGFplatform.h
+++ b/scribus/third_party/pgf/PGFplatform.h
@@ -528,7 +528,7 @@ __inline OSError FileWrite(HANDLE hFile, int *count, void *buffPtr) {
}
__inline OSError GetFPos(HANDLE hFile, UINT64 *pos) {
- #ifdef __APPLE__
+ #if defined(__APPLE__) || defined(__HAIKU__)
off_t ret;
if ((ret = lseek(hFile, 0, SEEK_CUR)) == -1) {
return errno;
@@ -548,7 +548,7 @@ __inline OSError GetFPos(HANDLE hFile, UINT64 *pos) {
}
__inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) {
- #ifdef __APPLE__
+ #if defined(__APPLE__) || defined(__HAIKU__)
if ((lseek(hFile, (off_t)posOff, posMode)) == -1) {
return errno;
} else {
diff --git a/scribus/util_debug.cpp b/scribus/util_debug.cpp
index 5adfab7..ebf0bdb 100644
--- a/scribus/util_debug.cpp
+++ b/scribus/util_debug.cpp
@@ -54,7 +54,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)
void ** trace = new void*[nFrames + 1];
char **messages = ( char ** ) nullptr;
int i, trace_size = 0;
--
2.26.0
From 89e8bf8a49e4276b98532e6fe1b5d35735d935f2 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 12 Aug 2019 21:10:23 +1000
Subject: Disable pkg-config for cairo and fontconfig
diff --git a/cmake/modules/CAIROConfig.cmake b/cmake/modules/CAIROConfig.cmake
index 14abfde..187b742 100644
--- a/cmake/modules/CAIROConfig.cmake
+++ b/cmake/modules/CAIROConfig.cmake
@@ -25,7 +25,7 @@ else(PREFIX_CAIRO)
set(PKG_CAIRO_LIBRARIES ${_libCairoLinkDir})
else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
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 (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
endif(PREFIX_CAIRO)
diff --git a/cmake/modules/FONTCONFIGConfig.cmake b/cmake/modules/FONTCONFIGConfig.cmake
index 1a74069..225658c 100644
--- a/cmake/modules/FONTCONFIGConfig.cmake
+++ b/cmake/modules/FONTCONFIGConfig.cmake
@@ -15,7 +15,7 @@ if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
set(FONTCONFIG_LIBS ${_fontconfigCflags})
else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
include(FindPkgConfig)
- pkg_search_module(FONTCONFIG REQUIRED fontconfig)
+# pkg_search_module(FONTCONFIG REQUIRED fontconfig)
endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
#include(UsePkgConfig)
--
2.26.0
From 926fe8617cdc228bbfb83802710ac02cc8ebb208 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 6 Jun 2020 10:06:38 +0000
Subject: Fix error on QPainterPath
diff --git a/scribus/ui/scresizecursor.cpp b/scribus/ui/scresizecursor.cpp
index f2c78e5..85271ed 100644
--- a/scribus/ui/scresizecursor.cpp
+++ b/scribus/ui/scresizecursor.cpp
@@ -12,6 +12,7 @@
#include <QDebug>
#include <QPainter>
+#include <QPainterPath>
#include <QPixmap>
#include <QPen>
#include <QBrush>
--
2.26.0

120
app-office/scribus/patches/scribus-1.5.6.1.patchset Normal file
View File

@@ -0,0 +1,120 @@
From da8d77a216c8855827466a9bf9d0c77de9a5e4f2 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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -383,7 +383,7 @@ include(CMakeLists_Dependencies.cmake)
##############################################################################################################
########## Include Setup ##########
-TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
+#TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
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
--- a/scribus/scpaths.cpp
+++ b/scribus/scpaths.cpp
@@ -322,6 +322,15 @@ QStringList ScPaths::spellDirs() const
d.setPath(linuxLocalPath);
if (d.exists())
spellDirs.append(linuxLocalPath);
+#elif defined(Q_OS_HAIKU)
+ QString haikuSystemHunspellPath("/system/data/hunspell/");
+ QString haikuUserHunspellPath("/boot/home/config/non-packaged/data/hunspell/");
+ d.setPath(haikuSystemHunspellPath);
+ if (d.exists())
+ spellDirs.append(haikuSystemHunspellPath);
+ d.setPath(haikuUserHunspellPath);
+ if (d.exists())
+ spellDirs.append(haikuUserHunspellPath);
#endif
return spellDirs;
}
@@ -388,6 +397,19 @@ QStringList ScPaths::hyphDirs() const
d.setPath(linuxLocalPath);
if (d.exists())
hyphDirs.append(linuxLocalPath);
+#elif defined(Q_OS_HAIKU)
+ QString haikuSystemHyphenPath("/system/data/hyphen/");
+ QString haikuSystemHunspellPath("/system/data/hunspell/");
+ QString haikuUserHunspellPath("/boot/home/config/non-packaged/data/hunspell/");
+ d.setPath(haikuSystemHyphenPath);
+ if (d.exists())
+ hyphDirs.append(haikuSystemHyphenPath);
+ d.setPath(haikuSystemHunspellPath);
+ if (d.exists())
+ hyphDirs.append(haikuSystemHunspellPath);
+ d.setPath(haikuUserHunspellPath);
+ if (d.exists())
+ hyphDirs.append(haikuUserHunspellPath);
#endif
return hyphDirs;
}
@@ -411,6 +433,9 @@ QStringList ScPaths::systemFontDirs()
if (d.exists())
fontDirs.append(roamingFontDir);
fontDirs.append(windowsSpecialDir(CSIDL_FONTS));
+#elif defined(Q_OS_HAIKU)
+ fontDirs.append("/system/data/fonts/ttfonts");
+ fontDirs.append("/boot/home/config/non-packaged/data/fonts");
#endif
return fontDirs;
}
diff --git a/scribus/third_party/pgf/PGFplatform.h b/scribus/third_party/pgf/PGFplatform.h
index 55a5828..f421582 100644
--- a/scribus/third_party/pgf/PGFplatform.h
+++ b/scribus/third_party/pgf/PGFplatform.h
@@ -529,7 +529,7 @@ __inline OSError FileWrite(HANDLE hFile, int *count, void *buffPtr) {
}
__inline OSError GetFPos(HANDLE hFile, UINT64 *pos) {
- #ifdef __APPLE__
+ #if defined(__APPLE__) || defined(__HAIKU__)
off_t ret;
if ((ret = lseek(hFile, 0, SEEK_CUR)) == -1) {
return errno;
@@ -549,7 +549,7 @@ __inline OSError GetFPos(HANDLE hFile, UINT64 *pos) {
}
__inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) {
- #ifdef __APPLE__
+ #if defined(__APPLE__) || defined(__HAIKU__)
if ((lseek(hFile, (off_t)posOff, posMode)) == -1) {
return errno;
} else {
diff --git a/scribus/util_debug.cpp b/scribus/util_debug.cpp
index 5adfab7..ebf0bdb 100644
--- a/scribus/util_debug.cpp
+++ b/scribus/util_debug.cpp
@@ -54,7 +54,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)
void ** trace = new void*[nFrames + 1];
char **messages = ( char ** ) nullptr;
int i, trace_size = 0;
--
2.28.0

20
app-office/scribus/scribus-1.5.5.recipe → app-office/scribus/scribus-1.5.6.1.recipe
View File

@@ -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-2017 Scribus Team"
COPYRIGHT="2014-2020 Scribus Team"
LICENSE="GNU GPL v2"
REVISION="7"
SOURCE_URI="http://downloads.sourceforge.net/project/scribus/scribus-devel/$portVersion/scribus-$portVersion.tar.xz"
CHECKSUM_SHA256="7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71"
REVISION="1"
SOURCE_URI="https://sourceforge.net/projects/scribus/files/scribus-devel/$portVersion/scribus-$portVersion.tar.xz"
CHECKSUM_SHA256="d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab"
PATCHES="scribus-$portVersion.patchset"
ADDITIONAL_FILES="scribus.rdef.in"
@@ -43,7 +43,7 @@ REQUIRES="
lib:libpng16$secondaryArchSuffix
lib:libpodofo$secondaryArchSuffix
lib:libpoppler$secondaryArchSuffix
# lib:libpython2.7$secondaryArchSuffix
lib:libpython3.7m$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
lib:libQt5Network$secondaryArchSuffix
@@ -79,18 +79,15 @@ BUILD_REQUIRES="
devel:libharfbuzz_icu$secondaryArchSuffix
devel:libhunspell_1.7$secondaryArchSuffix
devel:libhyphen$secondaryArchSuffix
devel:libjpeg$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 >= 87
# devel:libpython2.7$secondaryArchSuffix
devel:libpython3.7m$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5Gui$secondaryArchSuffix
devel:libQt5Network$secondaryArchSuffix
devel:libQt5Xml$secondaryArchSuffix
devel:libqxp_0.0$secondaryArchSuffix
devel:librevenge_0.0$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
@@ -104,7 +101,7 @@ BUILD_PREREQUIRES="
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:lrelease$secondaryArchSuffix >= 5
cmd:lrelease$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
@@ -132,7 +129,6 @@ INSTALL()
make install
mv $appsDir/Scribus/scribus $appsDir/Scribus/Scribus
mv $appsDir/Scribus/pluginsgettext $appsDir/Scribus/plugins/gettext
rm -rf $appsDir/Scribus/bin
local APP_SIGNATURE="application/x-vnd.scribus"