[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     2df43625e3e98910f0e1fc6329fe6f13a3286d60
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  5 18:23:16 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep  5 18:45:35 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df43625

app-office/scribus: Build with -DBUILD_STATIC (only libqt6advanceddocking)

Bug: https://bugs.gentoo.org/961290
Closes: https://bugs.gentoo.org/960017
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...ibus-1.7.0-dont-install-qtadvanceddocking.patch | 86 ++++++++++++++++++++++
 ...scribus-9999.ebuild => scribus-1.7.0-r3.ebuild} |  8 +-
 app-office/scribus/scribus-9999.ebuild             |  4 +-
 3 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/app-office/scribus/files/scribus-1.7.0-dont-install-qtadvanceddocking.patch b/app-office/scribus/files/scribus-1.7.0-dont-install-qtadvanceddocking.patch
new file mode 100644
index 000000000000..9c0105e72be3
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.7.0-dont-install-qtadvanceddocking.patch
@@ -0,0 +1,86 @@
+--- a/scribus/third_party/Qt-Advanced-Docking-System/src/CMakeLists.txt
++++ b/scribus/third_party/Qt-Advanced-Docking-System/src/CMakeLists.txt
+@@ -71,13 +71,13 @@
+ endif()
+ 
+ set(library_name "qt${QT_VERSION_MAJOR}advanceddocking")
+-if(BUILD_STATIC)
++#if(BUILD_STATIC)
+     add_library(${library_name} STATIC ${ads_SRCS} ${ads_HEADERS})
+     target_compile_definitions( ${library_name} PUBLIC ADS_STATIC)
+-else()
+-    add_library( ${library_name} SHARED ${ads_SRCS} ${ads_HEADERS})
+-    target_compile_definitions( ${library_name} PRIVATE ADS_SHARED_EXPORT)
+-endif()
++#else()
++#    add_library( ${library_name} SHARED ${ads_SRCS} ${ads_HEADERS})
++#    target_compile_definitions( ${library_name} PRIVATE ADS_SHARED_EXPORT)
++#endif()
+ 
+ add_library(ads::${library_name} ALIAS ${library_name})
+ 
+@@ -119,35 +119,35 @@
+     VERSION ${VERSION_SHORT}
+     COMPATIBILITY SameMajorVersion
+ )
+-install(FILES ${ads_HEADERS}
+-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${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 ${CMAKE_INSTALL_BINDIR}
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${library_name}
+-)
+-
+-install(EXPORT adsTargets
+-    FILE adsTargets.cmake
+-    NAMESPACE ads::
+-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name}
+-)
+-install(FILES qtadvanceddockingConfig.cmake RENAME ${library_name}Config.cmake
+-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name}
+-)
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${library_name}ConfigVersion.cmake"
+-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name}
+-)
++#install(FILES ${ads_HEADERS}
++#    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${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 ${CMAKE_INSTALL_BINDIR}
++#    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++#    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++#    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${library_name}
++#)
++#
++#install(EXPORT adsTargets
++#    FILE adsTargets.cmake
++#    NAMESPACE ads::
++#    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name}
++#)
++#install(FILES qtadvanceddockingConfig.cmake RENAME ${library_name}Config.cmake
++#    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name}
++#)
++#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${library_name}ConfigVersion.cmake"
++#    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name}
++#)
+ 
+ target_include_directories(${library_name} PUBLIC
+     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-1.7.0-r3.ebuild
similarity index 91%
copy from app-office/scribus/scribus-9999.ebuild
copy to app-office/scribus/scribus-1.7.0-r3.ebuild
index f92697f36fd7..d9786c75028c 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-1.7.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 PYTHON_REQ_USE="tk?"
 inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
 
@@ -14,7 +14,7 @@ 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"
+	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 	S="${WORKDIR}/${P}"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
@@ -78,8 +78,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
 	"${FILESDIR}"/${PN}-1.7.0-findhyphen.patch
-	"${FILESDIR}"/${PN}-1.7.0-dont-install-thirdparty-license.patch
+	"${FILESDIR}"/${PN}-1.7.0-dont-install-qtadvanceddocking.patch # bugs 961290, 960017
 	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
+	"${FILESDIR}"/${P}-poppler-25.0{2,6,7,9}.0.patch # from trunk
+	"${FILESDIR}"/${PN}-1.7.0-fix-compiling-with-qt-6.9.0.patch # bug 957695
 )
 
 src_prepare() {

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index f92697f36fd7..b88ccc44884f 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{10..14} )
 PYTHON_REQ_USE="tk?"
 inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
 
@@ -78,7 +78,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
 	"${FILESDIR}"/${PN}-1.7.0-findhyphen.patch
-	"${FILESDIR}"/${PN}-1.7.0-dont-install-thirdparty-license.patch
+	"${FILESDIR}"/${PN}-1.7.0-dont-install-qtadvanceddocking.patch # bugs 961290, 960017
 	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
 )