CVS commit: pkgsrc/print/scribus

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Nov 24 07:36:55 UTC 2025

Modified Files:
        pkgsrc/print/scribus: distinfo
        pkgsrc/print/scribus/patches:
            patch-scribus_third__party_Qt-Advanced-Docking-System_src_CMakeLists.txt

Log Message:
scribus: fix build with qt6 6.10


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/print/scribus/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/print/scribus/patches/patch-scribus_third__party_Qt-Advanced-Docking-System_src_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/scribus/distinfo
diff -u pkgsrc/print/scribus/distinfo:1.30 pkgsrc/print/scribus/distinfo:1.31
--- pkgsrc/print/scribus/distinfo:1.30  Mon Nov 10 13:54:53 2025
+++ pkgsrc/print/scribus/distinfo       Mon Nov 24 07:36:54 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2025/11/10 13:54:53 wiz Exp $
+$NetBSD: distinfo,v 1.31 2025/11/24 07:36:54 wiz Exp $
 
 BLAKE2s (scribus-1.7.0.tar.xz) = f7ab33b821bcc7da2f7906167bd0b347d559f95081ce9dc1b0f49ee270516d9a
 SHA512 (scribus-1.7.0.tar.xz) = c3a392d69e109165a9c28c2396e0e2e18df2d232099a6836f6a472fc3f899f50316e2b9227be40c3226dffc9f84e9db94dc2f353052fa06b35c776cd4f664448
@@ -12,5 +12,5 @@ SHA1 (patch-scribus_plugins_import_pdf_i
 SHA1 (patch-scribus_plugins_import_pdf_importpdfplugin.h) = e1ab02eb9652cddfbddb14514a330b87f8a743ea
 SHA1 (patch-scribus_plugins_import_pdf_slaoutput.cpp) = aa7fa4aaa4251aa0423e499dca453cdbe71855e6
 SHA1 (patch-scribus_plugins_import_pdf_slaoutput.h) = f5635ccc381909e147fe827c416c2eb788f9d6a1
-SHA1 (patch-scribus_third__party_Qt-Advanced-Docking-System_src_CMakeLists.txt) = 3553f421f5a4f0e5298edda5f450a3e7d3397574
+SHA1 (patch-scribus_third__party_Qt-Advanced-Docking-System_src_CMakeLists.txt) = 0ca274a52983932fb94aead3ddf097bf81d295e4
 SHA1 (patch-scribus_util__text.cpp) = 58aed912f434474f7d87b5fab3f453a3509c2ef4

Index: pkgsrc/print/scribus/patches/patch-scribus_third__party_Qt-Advanced-Docking-System_src_CMakeLists.txt
diff -u pkgsrc/print/scribus/patches/patch-scribus_third__party_Qt-Advanced-Docking-System_src_CMakeLists.txt:1.1 
pkgsrc/print/scribus/patches/patch-scribus_third__party_Qt-Advanced-Docking-System_src_CMakeLists.txt:1.2
--- pkgsrc/print/scribus/patches/patch-scribus_third__party_Qt-Advanced-Docking-System_src_CMakeLists.txt:1.1   Mon Nov 10 13:54:53 2025
+++ pkgsrc/print/scribus/patches/patch-scribus_third__party_Qt-Advanced-Docking-System_src_CMakeLists.txt       Mon Nov 24 07:36:55 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-scribus_third__party_Qt-Advanced-Docking-System_src_CMakeLists.txt,v 1.1 2025/11/10 13:54:53 wiz Exp $
+$NetBSD: patch-scribus_third__party_Qt-Advanced-Docking-System_src_CMakeLists.txt,v 1.2 2025/11/24 07:36:55 wiz Exp $
 
 Don't install qt advanced docking system.
 From gentoo
@@ -6,7 +6,16 @@ https://gitweb.gentoo.org/repo/gentoo.gi
 
 --- scribus/third_party/Qt-Advanced-Docking-System/src/CMakeLists.txt.orig     2025-01-25 21:57:22.000000000 +0000
 +++ scribus/third_party/Qt-Advanced-Docking-System/src/CMakeLists.txt
-@@ -71,13 +71,13 @@ if (UNIX AND NOT APPLE)
+@@ -6,7 +6,7 @@ if (${QT_VERSION_MAJOR})
+ else()
+   find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
+ endif()
+-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets REQUIRED)
++find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui GuiPrivate Widgets REQUIRED)
+ if (UNIX AND NOT APPLE)
+     include_directories(${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})
+ endif()
+@@ -71,18 +71,19 @@ if (UNIX AND NOT APPLE)
  endif()
  
  set(library_name "qt${QT_VERSION_MAJOR}advanceddocking")
@@ -25,7 +34,13 @@ https://gitweb.gentoo.org/repo/gentoo.gi
  
  add_library(ads::${library_name} ALIAS ${library_name})
  
-@@ -119,35 +119,35 @@ write_basic_package_version_file(
+ target_link_libraries(${library_name} PUBLIC Qt${QT_VERSION_MAJOR}::Core 
+                                                Qt${QT_VERSION_MAJOR}::Gui 
++                                               Qt${QT_VERSION_MAJOR}::GuiPrivate 
+                                                Qt${QT_VERSION_MAJOR}::Widgets)
+ if (UNIX AND NOT APPLE)
+   if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+@@ -119,35 +120,35 @@ write_basic_package_version_file(
      VERSION ${VERSION_SHORT}
      COMPATIBILITY SameMajorVersion
  )