diff options
Diffstat (limited to 'app-office/scribus')
14 files changed, 303 insertions, 278 deletions
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 1ef4d5a62e03..0ffc05a70363 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1 +1 @@ -DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01 +DIST scribus-1.6.1.tar.xz 73266900 BLAKE2B b8120823cf98201ed197748cffe3f12019acfbd4831b497585ad7d04fa6d6e470bf4bc85dac15700483dfc977c56136cb49bcee20106f482cd9b0022d75d28d5 SHA512 ffde5628ea314dab8f212f78e7dd96cd258ceaebccc5b8de2c21e338a433f82d7fbbb047d05882abb07b4dceac031141b77fef933c9a3ed0e26f29bb94377e7e diff --git a/app-office/scribus/files/scribus-1.5.3-fpic.patch b/app-office/scribus/files/scribus-1.5.3-fpic.patch index ba0721955ef8..bb4378e5effa 100644 --- a/app-office/scribus/files/scribus-1.5.3-fpic.patch +++ b/app-office/scribus/files/scribus-1.5.3-fpic.patch @@ -1,8 +1,6 @@ scribus/third_party/prc/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt -index 5f7c2c6..1da7177 100644 --- a/scribus/third_party/prc/CMakeLists.txt +++ b/scribus/third_party/prc/CMakeLists.txt @@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR} diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch b/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch deleted file mode 100644 index 98682d60f700..000000000000 --- a/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/scribus/CMakeLists.txt 2019-10-02 00:25:01.194386515 +0200 -+++ b/scribus/CMakeLists.txt 2019-10-02 00:26:23.584392213 +0200 -@@ -1069,7 +1069,9 @@ - ${SCRIBUS_GMAGICK_SRC} - ) - --if(NOT HAVE_HYPHEN) -+if(HAVE_HYPHEN) -+ include_directories(${HYPHEN_INCLUDE_DIR}) -+else() - include_directories(third_party/hyphen) - set(SCRIBUS_SOURCES - ${SCRIBUS_SOURCES} -@@ -1180,13 +1182,6 @@ - - endif() - --if(HAVE_HYPHEN) -- target_link_libraries(${EXE_NAME} -- ${HYPHEN_LIBRARY} -- ) --endif() -- -- - if(GESTURE_FRAME_PREVIEW) - message(STATUS "Enable gesture frame preview [experimental]") - set(GESTURE_FRAME_PREVIEW_SOURCES pageitempreview.cpp) -@@ -1234,6 +1229,12 @@ - ) - endif () - -+if(HAVE_HYPHEN) -+ target_link_libraries(${EXE_NAME} -+ ${HYPHEN_LIBRARY} -+ ) -+endif() -+ - if(WIN32) - set_target_properties(${EXE_NAME} - PROPERTIES ---- a/scribus/hyphenator.h 2019-07-31 00:35:05.000000000 +0200 -+++ b/scribus/hyphenator.h 2019-10-02 00:00:42.497285638 +0200 -@@ -13,7 +13,7 @@ - #include <QSet> - - #include "scribusapi.h" --#include "third_party/hyphen/hyphen.h" -+#include <hyphen.h> - - class ScribusDoc; - class ScribusMainWindow; diff --git a/app-office/scribus/files/scribus-1.5.6-docdir.patch b/app-office/scribus/files/scribus-1.5.6-docdir.patch deleted file mode 100644 index 957991c2acc4..000000000000 --- a/app-office/scribus/files/scribus-1.5.6-docdir.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists_Directories.cmake b/CMakeLists_Directories.cmake -index db6133f..faf85ce 100644 ---- a/CMakeLists_Directories.cmake -+++ b/CMakeLists_Directories.cmake -@@ -36,14 +36,16 @@ else() - endif() - - #SHARE - use the default on Apple as TAG_VERSION is empty --if(WIN32 OR OS2) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") --elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") --elseif(NOT WANT_VERSIONING) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") --else() -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") -+if(NOT DOCDIR) -+ if(WIN32 OR OS2) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") -+ elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") -+ elseif(NOT WANT_VERSIONING) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") -+ else() -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") -+ endif() - endif() - - if(IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE) diff --git a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch deleted file mode 100644 index 3123ce4477c9..000000000000 --- a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/CMakeLists_Dependencies.cmake 2019-07-31 00:34:43.000000000 +0200 -+++ b/CMakeLists_Dependencies.cmake 2019-10-02 00:17:34.968355656 +0200 -@@ -954,6 +954,16 @@ - endif() - #>>HUNSPELL for Speelling support - -+#<<HYPHEN for Hyphenation support -+find_package(HYPHEN) -+if(HYPHEN_FOUND) -+ message("System Hyphen Found OK") -+ set(HAVE_HYPHEN ON) -+else() -+ message("Hyphen or its developer libraries NOT found - using bundled Hyphen instead") -+endif() -+#>>HYPHEN for Hyphenation support -+ - #<<PoDoFo for AI PDF import - option(WITH_PODOFO "Enable support for PDF embedded in AI" ON) - if (WITH_PODOFO) diff --git a/app-office/scribus/files/scribus-1.5.8-cmake.patch b/app-office/scribus/files/scribus-1.5.8-cmake.patch new file mode 100644 index 000000000000..6ddd76912dbe --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.8-cmake.patch @@ -0,0 +1,28 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -362,25 +362,6 @@ + if(APPLE) + ### Include our Apple configure commands + include(CMakeLists_Apple.cmake) +-else() +- if(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*") +- # Windows build with Visual Studio +- # Surely there's a better way to identify the compiler? +- set(CMAKE_CXX_FLAGS_DEBUG) +- set(CMAKE_C_FLAGS_DEBUG) +- else() +- # vanilla gcc +- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -Wall -fstrict-aliasing") +- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -Wall -fstrict-aliasing") +- endif() +- if(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*") +- set(CMAKE_CXX_FLAGS_RELEASE) +- set(CMAKE_C_FLAGS_RELEASE) +- else() +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -Wall") +- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -Wall") +- # add_definitions(-DNDEBUG) +- endif() + endif() + if(WIN32) + add_definitions(-DWIN32_LEAN_AND_MEAN diff --git a/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch deleted file mode 100644 index f1645e516faf..000000000000 --- a/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch +++ /dev/null @@ -1,68 +0,0 @@ -https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch -https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch -https://bugs.scribus.net/view.php?id=16635 -https://bugs.gentoo.org/817281 -https://bugs.gentoo.org/813711 - -From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001 -From: Jean Ghali <jghali@libertysurf.fr> -Date: Sat, 21 Aug 2021 20:05:43 +0000 -Subject: [PATCH] Use new hb-subset api with harfbuzz >= 2.9.0 in order to - prepeare for removal of legacy API in 3.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@24696 11d20701-8431-0410-a711-e3c959e3b870 ---- - scribus/fonts/sfnt.cpp | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp -index 50777f66e3..fca8b39158 100644 ---- a/scribus/fonts/sfnt.cpp -+++ b/scribus/fonts/sfnt.cpp -@@ -1256,11 +1256,19 @@ namespace sfnt { -
- for (int i = 0; i < cids.count(); ++i)
- hb_set_add(glyphSet, cids.at(i));
--
-+
-+#if HB_VERSION_ATLEAST(2, 9, 0)
-+ uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get());
-+ subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS;
-+ subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING;
-+ subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY;
-+ hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags);
-+#else
- hb_subset_input_set_retain_gids(hbSubsetInput.get(), true);
- hb_subset_input_set_drop_hints(hbSubsetInput.get(), false);
- #if HB_VERSION_ATLEAST(2, 6, 5)
- hb_subset_input_set_name_legacy(hbSubsetInput.get(), true);
-+#endif
- #endif
-
- QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
- -From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001 -From: Jean Ghali <jghali@libertysurf.fr> -Date: Sun, 19 Sep 2021 11:59:50 +0000 -Subject: [PATCH] #16635: Replace hb_subset, removed in harfbuzz 3.0, by - hb_subset_or_fail - -git-svn-id: svn://scribus.net/trunk/Scribus@24707 11d20701-8431-0410-a711-e3c959e3b870 ---- a/scribus/fonts/sfnt.cpp -+++ b/scribus/fonts/sfnt.cpp -@@ -1271,9 +1271,15 @@ namespace sfnt { - #endif
- #endif
-
-+#if HB_VERSION_ATLEAST(2, 9, 0)
-+ QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get()));
-+ if (hbSubsetFace.isNull())
-+ return QByteArray();
-+#else
- QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
- if (hbSubsetFace.isNull())
- return QByteArray();
-+#endif
-
- QScopedPointer<hb_blob_t, HbBlobDeleter> hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get()));
- if (hbSubsetBlob.isNull())
\ No newline at end of file diff --git a/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch b/app-office/scribus/files/scribus-1.6.1-findhyphen.patch index 39a11b0ee4a9..cc6e5db58a24 100644 --- a/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch +++ b/app-office/scribus/files/scribus-1.6.1-findhyphen.patch @@ -1,8 +1,25 @@ -diff --git a/scribus/CMakeLists.txt b/scribus/CMakeLists.txt -index aec69d3..9451404 100644 +--- a/CMakeLists_Dependencies.cmake ++++ b/CMakeLists_Dependencies.cmake +@@ -1,6 +1,16 @@ + ############################################################################################################## + ########## Find Dependencies ########## + ++#<<HYPHEN for Hyphenation support ++find_package(HYPHEN) ++if(HYPHEN_FOUND) ++ message("System Hyphen Found OK") ++ set(HAVE_HYPHEN ON) ++else() ++ message("Hyphen or its developer libraries NOT found - using bundled Hyphen instead") ++endif() ++#>>HYPHEN for Hyphenation support ++ + #<<PoDoFo for AI PDF import + option(WITH_PODOFO "Enable support for PDF embedded in AI" ON) + if (WITH_PODOFO) --- a/scribus/CMakeLists.txt +++ b/scribus/CMakeLists.txt -@@ -587,7 +587,9 @@ set(SCRIBUS_SOURCES +@@ -585,7 +585,9 @@ set(SCRIBUS_SOURCES ${SCRIBUS_GMAGICK_SRC} ) @@ -13,7 +30,7 @@ index aec69d3..9451404 100644 include_directories(third_party/hyphen) set(SCRIBUS_SOURCES ${SCRIBUS_SOURCES} -@@ -678,12 +680,6 @@ if(HAVE_PODOFO) +@@ -676,12 +678,6 @@ if(HAVE_PODOFO) endif() @@ -26,7 +43,7 @@ index aec69d3..9451404 100644 if(GESTURE_FRAME_PREVIEW) message(STATUS "Enable gesture frame preview [experimental]") -@@ -743,6 +739,12 @@ if(WANT_PCH) +@@ -741,6 +737,12 @@ if(WANT_PCH) target_precompile_headers(${EXE_NAME} PRIVATE scribus_pch.h) endif() @@ -39,8 +56,6 @@ index aec69d3..9451404 100644 if(WIN32) set_target_properties(${EXE_NAME} PROPERTIES -diff --git a/scribus/hyphenator.h b/scribus/hyphenator.h -index 7fa4abd..2863c70 100644 --- a/scribus/hyphenator.h +++ b/scribus/hyphenator.h @@ -13,7 +13,7 @@ for which a new license (GPL+exception) is in place. diff --git a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch new file mode 100644 index 000000000000..076e48e14fd9 --- /dev/null +++ b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch @@ -0,0 +1,70 @@ +From dc2470990ab73c87fdd60068c99518ced01a3edd Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 4 Mar 2024 17:35:11 +0100 +Subject: [PATCH] Fix build with >=poppler-24.03.0 + +Fixes build errors caused by: + +"Use an enum for Function getType" +Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + scribus/plugins/import/pdf/slaoutput.cpp | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 4e31e4b6c..3e4a768ec 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -1731,7 +1731,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do + VGradient FillGradient = VGradient(VGradient::linear);
+ FillGradient.clearStops();
+ GfxColorSpace *color_space = shading->getColorSpace();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ if (func->getType() == Function::Type::Stitching)
++#else
+ if (func->getType() == 3)
++#endif
+ {
+ StitchingFunction *stitchingFunc = (StitchingFunction*)func;
+ const double *bounds = stitchingFunc->getBounds();
+@@ -1753,7 +1757,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do + FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade );
+ }
+ }
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled))
++#else
+ else if ((func->getType() == 2) || (func->getType() == 0))
++#endif
+ {
+ GfxColor stop1;
+ shading->getColor(0.0, &stop1);
+@@ -1865,7 +1873,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, + VGradient FillGradient = VGradient(VGradient::linear);
+ FillGradient.clearStops();
+ GfxColorSpace *color_space = shading->getColorSpace();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ if (func->getType() == Function::Type::Stitching)
++#else
+ if (func->getType() == 3)
++#endif
+ {
+ StitchingFunction *stitchingFunc = (StitchingFunction*)func;
+ const double *bounds = stitchingFunc->getBounds();
+@@ -1887,7 +1899,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, + FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade );
+ }
+ }
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled))
++#else
+ else if ((func->getType() == 2) || (func->getType() == 0))
++#endif
+ {
+ GfxColor stop1;
+ shading->getColor(0.0, &stop1);
+-- +2.44.0 + diff --git a/app-office/scribus/files/scribus-1.7.0-dont-install-thirdparty-license.patch b/app-office/scribus/files/scribus-1.7.0-dont-install-thirdparty-license.patch new file mode 100644 index 000000000000..d660b8dca008 --- /dev/null +++ b/app-office/scribus/files/scribus-1.7.0-dont-install-thirdparty-license.patch @@ -0,0 +1,15 @@ +--- a/scribus/third_party/Qt-Advanced-Docking-System/src/CMakeLists.txt ++++ b/scribus/third_party/Qt-Advanced-Docking-System/src/CMakeLists.txt +@@ -123,12 +123,6 @@ install(FILES ${ads_HEADERS} + DESTINATION include/${library_name} + COMPONENT headers + ) +-install(FILES +- "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE" +- "${CMAKE_CURRENT_SOURCE_DIR}/../gnu-lgpl-v2.1.md" +- DESTINATION license/ads +- COMPONENT license +-) + install(TARGETS ${library_name} + EXPORT adsTargets + RUNTIME DESTINATION bin diff --git a/app-office/scribus/files/scribus-1.7.0-findhyphen.patch b/app-office/scribus/files/scribus-1.7.0-findhyphen.patch new file mode 100644 index 000000000000..1fb7151c096d --- /dev/null +++ b/app-office/scribus/files/scribus-1.7.0-findhyphen.patch @@ -0,0 +1,70 @@ +--- a/CMakeLists_Dependencies.cmake ++++ b/CMakeLists_Dependencies.cmake +@@ -1,6 +1,16 @@ + ############################################################################################################## + ########## Find Dependencies ########## + ++#<<HYPHEN for Hyphenation support ++find_package(HYPHEN) ++if(HYPHEN_FOUND) ++ message("System Hyphen Found OK") ++ set(HAVE_HYPHEN ON) ++else() ++ message("Hyphen or its developer libraries NOT found - using bundled Hyphen instead") ++endif() ++#>>HYPHEN for Hyphenation support ++ + #<<PoDoFo for AI PDF import + option(WITH_PODOFO "Enable support for PDF embedded in AI" ON) + if (WITH_PODOFO) +--- a/scribus/CMakeLists.txt ++++ b/scribus/CMakeLists.txt +@@ -120,11 +120,6 @@ if(HAVE_PODOFO) + + endif() + +-if(HAVE_HYPHEN) +- target_link_libraries(${EXE_NAME} PRIVATE ${HYPHEN_LIBRARY}) +-endif() +- +- + if(GESTURE_FRAME_PREVIEW) + message(STATUS "Enable gesture frame preview [experimental]") + set(GESTURE_FRAME_PREVIEW_SOURCES pageitempreview.cpp) +@@ -178,6 +173,12 @@ if(WANT_PCH) + target_precompile_headers(${EXE_NAME} PRIVATE scribus_pch.h) + endif() + ++if(HAVE_HYPHEN) ++ target_link_libraries(${EXE_NAME} PRIVATE ++ ${HYPHEN_LIBRARY} ++ ) ++endif() ++ + if(WIN32) + set_target_properties(${EXE_NAME} + PROPERTIES +--- a/scribus/CMakeLists_Sources.txt ++++ b/scribus/CMakeLists_Sources.txt +@@ -560,7 +560,9 @@ set(SCRIBUS_SOURCES + ) + #endif() + +-if(NOT HAVE_HYPHEN) ++if(HAVE_HYPHEN) ++ include_directories(${HYPHEN_INCLUDE_DIR}) ++else() + include_directories(third_party/hyphen) + set(SCRIBUS_SOURCES + ${SCRIBUS_SOURCES} +--- a/scribus/hyphenator.h ++++ b/scribus/hyphenator.h +@@ -13,7 +13,7 @@ for which a new license (GPL+exception) is in place. + #include <QSet> + + #include "scribusapi.h" +-#include "third_party/hyphen/hyphen.h" ++#include <hyphen.h> + + class ScribusDoc; + class ScribusMainWindow; diff --git a/app-office/scribus/files/scribus-1.7.0-fix-icon-version.patch b/app-office/scribus/files/scribus-1.7.0-fix-icon-version.patch new file mode 100644 index 000000000000..56c42602d20b --- /dev/null +++ b/app-office/scribus/files/scribus-1.7.0-fix-icon-version.patch @@ -0,0 +1,11 @@ +--- a/resources/iconsets/artwork/CMakeLists.txt ++++ b/resources/iconsets/artwork/CMakeLists.txt +@@ -20,7 +20,7 @@ if(NOT WIN32 AND NOT APPLE) + FOREACH(res 16x16 32x32 64x64 128x128 256x256) + INSTALL(FILES + application-vnd.scribus_${res}.png +- RENAME application-vnd.scribus.png ++ RENAME application-vnd.scribus${TAG_VERSION}.png + DESTINATION ${SYSICONDIR}/${res}/mimetypes/ + ) + ENDFOREACH(res) diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild index 806085da0d11..6943d0b9a6bc 100644 --- a/app-office/scribus/scribus-1.5.7.ebuild +++ b/app-office/scribus/scribus-1.6.1-r1.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="tk?" -inherit cmake desktop flag-o-matic python-single-r1 xdg +inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg DESCRIPTION="Desktop publishing (DTP) and layout program" HOMEPAGE="https://www.scribus.net/" -SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz" +S="${WORKDIR}/${P}" LICENSE="GPL-2" -SLOT="0" +SLOT="$(ver_cut 1-2)" KEYWORDS="amd64 ppc ppc64 x86" IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" @@ -21,10 +22,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # osg # couple of third_party libs bundled -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" DEPEND="${PYTHON_DEPS} app-text/libmspub app-text/libqxp @@ -46,15 +43,15 @@ DEPEND="${PYTHON_DEPS} media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand + media-libs/libjpeg-turbo:= media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf - media-libs/tiff:0 + media-libs/tiff:= net-print/cups sys-libs/zlib[minizip] - virtual/jpeg:0= - x11-libs/cairo[X,svg] + x11-libs/cairo[X,svg(+)] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) @@ -69,39 +66,25 @@ DEPEND="${PYTHON_DEPS} RDEPEND="${DEPEND} app-text/ghostscript-gpl " +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" PATCHES=( - # non(?)-upstreamable + "${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251 "${FILESDIR}"/${PN}-1.5.3-fpic.patch - "${FILESDIR}"/${PN}-1.5.6-docdir.patch - "${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch - "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch - # upstream - "${FILESDIR}"/${PN}-1.5.8-harfbuzz-3.patch + "${FILESDIR}"/${PN}-1.6.1-findhyphen.patch + "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch + "${FILESDIR}"/${PN}-1.6.1-poppler-24.03.patch ) -CMAKE_BUILD_TYPE="Release" - -S="${WORKDIR}/${P}" - src_prepare() { cmake_src_prepare + cmake_run_in scribus cmake_comment_add_subdirectory ui/qml - rm -r codegen/cheetah scribus/third_party/hyphen || die - - sed \ - -e "/^\s*unzip\.[ch]/d" \ - -e "/^\s*ioapi\.[ch]/d" \ - -i scribus/CMakeLists.txt Scribus.pro || die - rm scribus/ioapi.[ch] || die - - sed \ - -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ - -i resources/templates/CMakeLists.txt || die - - sed \ - -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \ - -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test + # for safety remove files that we patched out + rm -r scribus/third_party/hyphen || die } src_configure() { @@ -109,8 +92,10 @@ src_configure() { append-cppflags -DHAVE_MEMRCHR local mycmakeargs=( + -DTAG_VERSION="-${SLOT}" -DHAVE_PYTHON=ON -DWANT_DISTROBUILD=ON + -DWANT_CPP17=ON -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/ -DPython3_EXECUTABLE="${PYTHON}" -DWITH_BOOST=$(usex boost) @@ -130,13 +115,13 @@ src_install() { cmake_src_install if ! use tk; then - rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die + rm "${ED}"/usr/share/scribus-${SLOT}/scripts/{FontSample,CalendarWizard}.py || die fi if use scripts; then - python_fix_shebang "${ED}"/usr/share/scribus/scripts - python_optimize "${ED}"/usr/share/scribus/scripts + python_fix_shebang "${ED}"/usr/share/scribus-${SLOT}/scripts + python_optimize "${ED}"/usr/share/scribus-${SLOT}/scripts else - rm "${ED}"/usr/share/scribus/scripts/*.py || die + rm "${ED}"/usr/share/scribus-${SLOT}/scripts/*.py || die fi mv "${ED}"/usr/share/doc/${PF}/{en,html} || die @@ -152,9 +137,15 @@ src_install() { local size for size in 16 32 128 256 512; do - newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png + newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus-${SLOT}.png done - newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png - doicon resources/iconsets/*/scribus.png - domenu scribus.desktop + newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus-${SLOT}.png + newicon resources/iconsets/1_5_1/scribus.png scribus-${SLOT}.png + newmenu scribus.desktop scribus-${SLOT}.desktop +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "MS Word .doc file import filter support" app-text/antiword } diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild index 9ee1a1dcf524..d7e694a35803 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-9999.ebuild @@ -1,33 +1,35 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="tk?" -inherit cmake desktop flag-o-matic python-single-r1 subversion xdg +inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg DESCRIPTION="Desktop publishing (DTP) and layout program" HOMEPAGE="https://www.scribus.net/" -SRC_URI="" -ESVN_REPO_URI="svn://scribus.net/trunk/Scribus" -ESVN_PROJECT=Scribus-1.5 + +if [[ "${PV}" == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/scribusproject/scribus" + inherit git-r3 +else + SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz" + S="${WORKDIR}/${P}" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +fi LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" +SLOT="$(ver_cut 1-2)" +IUSE="+boost debug examples graphicsmagick +minimal osg +pdf scripts +templates tk" REQUIRED_USE="${PYTHON_REQUIRED_USE} tk? ( scripts )" # osg # couple of third_party libs bundled -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" DEPEND="${PYTHON_DEPS} + app-text/hunspell:= app-text/libmspub app-text/libqxp app-text/poppler:= @@ -35,31 +37,27 @@ DEPEND="${PYTHON_DEPS} dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 - dev-qt/qtcore:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 + dev-qt/qt5compat:6 + dev-qt/qtbase:6[cups,gui,network,opengl,xml,widgets] + dev-qt/qtsvg:6 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand + media-libs/libjpeg-turbo:= media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf - media-libs/tiff:0 + media-libs/tiff:= net-print/cups sys-libs/zlib[minizip] - virtual/jpeg:0= - x11-libs/cairo[X,svg] + x11-libs/cairo[X,svg(+)] + x11-libs/libxcb boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) - hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( @@ -71,35 +69,24 @@ DEPEND="${PYTHON_DEPS} RDEPEND="${DEPEND} app-text/ghostscript-gpl " +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" PATCHES=( - # non(?)-upstreamable + "${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251 "${FILESDIR}"/${PN}-1.5.3-fpic.patch - "${FILESDIR}"/${PN}-1.5.6-docdir.patch - "${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch - "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch + "${FILESDIR}"/${PN}-1.7.0-findhyphen.patch + "${FILESDIR}"/${PN}-1.7.0-dont-install-thirdparty-license.patch + "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch ) -CMAKE_BUILD_TYPE="Release" - src_prepare() { cmake_src_prepare - rm -r codegen/cheetah scribus/third_party/hyphen || die - - sed \ - -e "/^\s*unzip\.[ch]/d" \ - -e "/^\s*ioapi\.[ch]/d" \ - -i scribus/CMakeLists.txt Scribus.pro || die - rm scribus/ioapi.[ch] || die - - sed \ - -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ - -i resources/templates/CMakeLists.txt || die - - sed \ - -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \ - -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test + # for safety remove files that we patched out + rm -r scribus/third_party/hyphen || die } src_configure() { @@ -107,15 +94,16 @@ src_configure() { append-cppflags -DHAVE_MEMRCHR local mycmakeargs=( + -DTAG_VERSION="-${SLOT}" -DHAVE_PYTHON=ON -DWANT_DISTROBUILD=ON + -DWANT_CPP17=ON -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/ -DPython3_EXECUTABLE="${PYTHON}" -DWITH_BOOST=$(usex boost) -DWANT_DEBUG=$(usex debug) -DWANT_NOEXAMPLES=$(usex !examples) -DWANT_GRAPHICSMAGICK=$(usex graphicsmagick) - -DWANT_HUNSPELL=$(usex hunspell) -DWANT_HEADERINSTALL=$(usex !minimal) -DWANT_NOOSG=$(usex !osg) -DWITH_PODOFO=$(usex pdf) @@ -128,13 +116,13 @@ src_install() { cmake_src_install if ! use tk; then - rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die + rm "${ED}"/usr/share/scribus-${SLOT}/scripts/{FontSample,CalendarWizard}.py || die fi if use scripts; then - python_fix_shebang "${ED}"/usr/share/scribus/scripts - python_optimize "${ED}"/usr/share/scribus/scripts + python_fix_shebang "${ED}"/usr/share/scribus-${SLOT}/scripts + python_optimize "${ED}"/usr/share/scribus-${SLOT}/scripts else - rm "${ED}"/usr/share/scribus/scripts/*.py || die + rm "${ED}"/usr/share/scribus-${SLOT}/scripts/*.py || die fi mv "${ED}"/usr/share/doc/${PF}/{en,html} || die @@ -150,9 +138,15 @@ src_install() { local size for size in 16 32 128 256 512; do - newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png + newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus-${SLOT}.png done - newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png - doicon resources/iconsets/*/scribus.png - domenu scribus.desktop + newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus-${SLOT}.png + newicon resources/iconsets/1_7_0/scribus-icon.svg scribus-${SLOT}.png + newmenu scribus.desktop scribus-${SLOT}.desktop +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "MS Word .doc file import filter support" app-text/antiword } |