From eba7c5f61a8ba1716d0715dd707fbc1d6ff2c032 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sandro=20Knau=C3=9F?= <hefee@debian.org>
Date: Sat, 5 Oct 2024 20:01:26 +0200
Subject: [PATCH] Update patch hunks.

---
 .../patches/0002-use_system_buildflags.patch  |  2 +-
 .../0003-Use-release-version-for-Debian.patch |  8 +++----
 .../patches/0004-Don-t-use-GuiPrivate.patch   | 24 +++++++++----------
 ..._SHA1-points-to-the-sha1-of-upstream.patch |  6 ++---
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/debian/patches/0002-use_system_buildflags.patch b/debian/patches/0002-use_system_buildflags.patch
index 1bfd324f4..976edb232 100644
--- a/debian/patches/0002-use_system_buildflags.patch
+++ b/debian/patches/0002-use_system_buildflags.patch
@@ -14,7 +14,7 @@ any modification from these flags from package side.
  1 file changed, 1 deletion(-)
 
 diff --git a/src/csync/CMakeLists.txt b/src/csync/CMakeLists.txt
-index 382eab2..5e3b077 100644
+index 533eedc..0311409 100644
 --- a/src/csync/CMakeLists.txt
 +++ b/src/csync/CMakeLists.txt
 @@ -14,7 +14,6 @@ set(LIBRARY_SOVERSION "0")
diff --git a/debian/patches/0003-Use-release-version-for-Debian.patch b/debian/patches/0003-Use-release-version-for-Debian.patch
index aec8528ae..fa7c3edbf 100644
--- a/debian/patches/0003-Use-release-version-for-Debian.patch
+++ b/debian/patches/0003-Use-release-version-for-Debian.patch
@@ -8,13 +8,13 @@ Forwarded: not-needed
  1 file changed, 5 insertions(+)
 
 diff --git a/VERSION.cmake b/VERSION.cmake
-index cf82833..5785c95 100644
+index bce1a3b..3d0ce6a 100644
 --- a/VERSION.cmake
 +++ b/VERSION.cmake
-@@ -37,3 +37,8 @@ set( MIRALL_VERSION_STRING "${MIRALL_VERSION}${MIRALL_VERSION_SUFFIX}" )
- if( MIRALL_VERSION_BUILD )
-     set( MIRALL_VERSION_STRING "${MIRALL_VERSION_STRING} (build ${MIRALL_VERSION_BUILD})" )
+@@ -39,3 +39,8 @@ if( MIRALL_VERSION_BUILD )
  endif( MIRALL_VERSION_BUILD )
+ 
+ set(QT_MAJOR_VERSION 6)
 +
 +# Version from Debian changelog
 +if( EXTERNAL_VERSION )
diff --git a/debian/patches/0004-Don-t-use-GuiPrivate.patch b/debian/patches/0004-Don-t-use-GuiPrivate.patch
index ba91ab4ef..96f1ab9d4 100644
--- a/debian/patches/0004-Don-t-use-GuiPrivate.patch
+++ b/debian/patches/0004-Don-t-use-GuiPrivate.patch
@@ -10,25 +10,25 @@ Forwarded: not-needed
  1 file changed, 5 deletions(-)
 
 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 6e4acf2..7e00bd7 100644
+index ce33b8f..abdc291 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
-@@ -11,10 +11,6 @@ if(QUICK_COMPILER)
-         )
- endif()
+@@ -3,10 +3,6 @@ find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Widgets Svg Qml Quick Qui
+ find_package(KF6Archive REQUIRED)
+ find_package(KF6GuiAddons)
  
--if (NOT TARGET Qt5::GuiPrivate)
--    message(FATAL_ERROR "Could not find GuiPrivate component of Qt5. It might be shipped as a separate package, please check that.")
+-if (NOT TARGET Qt::GuiPrivate)
+-    message(FATAL_ERROR "Could not find GuiPrivate component of Qt. It might be shipped as a separate package, please check that.")
 -endif()
 -
  if(CMAKE_BUILD_TYPE MATCHES Debug)
      add_definitions(-DQT_QML_DEBUG)
  endif()
-@@ -557,7 +553,6 @@ target_link_libraries(nextcloudCore
+@@ -548,7 +544,6 @@ target_link_libraries(nextcloudCore
    PUBLIC
    Nextcloud::sync
-   Qt5::Widgets
--  Qt5::GuiPrivate
-   Qt5::Svg
-   Qt5::Network
-   Qt5::Xml
+   Qt::Widgets
+-  Qt::GuiPrivate
+   Qt::Svg
+   Qt::Network
+   Qt::Xml
diff --git a/debian/patches/0004-GIT_SHA1-points-to-the-sha1-of-upstream.patch b/debian/patches/0004-GIT_SHA1-points-to-the-sha1-of-upstream.patch
index e6bc41005..fe6096a2a 100644
--- a/debian/patches/0004-GIT_SHA1-points-to-the-sha1-of-upstream.patch
+++ b/debian/patches/0004-GIT_SHA1-points-to-the-sha1-of-upstream.patch
@@ -7,10 +7,10 @@ Subject: GIT_SHA1 points to the sha1 of upstream.
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6877335..e1ecc4a 100644
+index 27102a6..f87c3ef 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -103,9 +103,8 @@ include(GNUInstallDirs)
+@@ -106,9 +106,8 @@ include(GNUInstallDirs)
  include(DefineInstallationPaths)
  include(GenerateExportHeader)
  
@@ -21,4 +21,4 @@ index 6877335..e1ecc4a 100644
 +set(GIT_SHA1 "GITDIR-NOTFOUND")
  
  add_definitions(
-     -DQT_DISABLE_DEPRECATED_BEFORE=0x000000
+     -DQT_DISABLE_DEPRECATED_BEFORE=0x051200
-- 
2.30.2