Update quazip.patch

3 files changed, 18 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 597bad9a7f1a..c0a9b6ad4649 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -32,8 +32,7 @@ pkgbase = openboard-develop-git
 	sha256sums = SKIP
 	sha256sums = 18ee4fab83b0c92490c81c2aaace98f669d07d7260cc0f83a24acb8d6224e5e7
 	sha256sums = b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549
-	sha256sums = 8c0b28ebd6cade0a551b695af9c04a2c45052f2d955357825b3be97bf00d5be7
+	sha256sums = 1ebd1025762ac97fa47ddcfae8d10a68bb6499d79c1f36dff52f6a10a1e3fa74
 	sha256sums = a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14
 
 pkgname = openboard-develop-git
-
diff --git a/PKGBUILD b/PKGBUILD
index f23e04f1af83..71b4006d3ee5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ source+=(drop_ThirdParty_repo.patch)
 sha256sums=('SKIP'
             '18ee4fab83b0c92490c81c2aaace98f669d07d7260cc0f83a24acb8d6224e5e7'
             'b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549'
-            '8c0b28ebd6cade0a551b695af9c04a2c45052f2d955357825b3be97bf00d5be7'
+            '1ebd1025762ac97fa47ddcfae8d10a68bb6499d79c1f36dff52f6a10a1e3fa74'
             'a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14')
 
 pkgver() {
diff --git a/quazip.patch b/quazip.patch
index 7e1c554132e5..8b76c23ef677 100644
--- a/quazip.patch
+++ b/quazip.patch
@@ -1,17 +1,21 @@
-diff -Naur OpenBoard-1.6.0a3.orig/OpenBoard.pro OpenBoard-1.6.0a3/OpenBoard.pro
---- OpenBoard-1.6.0a3.orig/OpenBoard.pro	2020-05-22 18:40:49.000000000 +0200
-+++ OpenBoard-1.6.0a3/OpenBoard.pro	2020-10-12 07:26:16.628748656 +0200
-@@ -433,8 +431,8 @@
-     LIBS += -lcrypto
-     #LIBS += -lprofiler
+--- OpenBoard-1.7.1rc-240202/OpenBoard.pro	2024-02-02 14:42:21.000000000 +0100
++++ OpenBoard-1.7.1rc-240202.new/OpenBoard.pro	2024-03-12 15:11:04.682694326 +0100
+@@ -462,11 +462,11 @@
      LIBS += -lX11
--    LIBS += -lquazip5
--    INCLUDEPATH += "/usr/include/quazip"
-+    LIBS += "-lquazip1-qt5"
-+    INCLUDEPATH += /usr/include/QuaZip-Qt5-1.1/quazip
+ 
+     greaterThan(QT_MAJOR_VERSION, 5) {
+-        LIBS += -lquazip6
+-        INCLUDEPATH += "/usr/include/quazip6"
++        LIBS += "-lquazip1-qt6"
++        INCLUDEPATH += /usr/include/QuaZip-Qt6-1.4/quazip
+     } else {
+-        LIBS += -lquazip5
+-        INCLUDEPATH += "/usr/include/quazip5"
++        LIBS += "-lquazip1-qt5"
++        INCLUDEPATH += /usr/include/QuaZip-Qt5-1.4/quazip
+     }
  
      LIBS += -lpoppler
-     INCLUDEPATH += "/usr/include/poppler"
 diff -Naur OpenBoard-1.6.0a3.orig/plugins/cffadaptor/UBCFFAdaptor.pro OpenBoard-1.6.0a3/plugins/cffadaptor/UBCFFAdaptor.pro
 --- OpenBoard-1.6.0a3.orig/plugins/cffadaptor/UBCFFAdaptor.pro	2020-05-22 18:40:49.000000000 +0200
 +++ OpenBoard-1.6.0a3/plugins/cffadaptor/UBCFFAdaptor.pro	2020-10-12 07:20:08.496096917 +0200
@@ -41,7 +45,7 @@ diff -Naur OpenBoard-1.6.0a3.orig/plugins/cffadaptor/UBCFFAdaptor.pro OpenBoard-
 -DEPENDPATH  += $$THIRD_PARTY_PATH/quazip/
 -INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
 -include($$THIRD_PARTY_PATH/quazip/quazip.pri)
-+INCLUDEPATH += /usr/include/QuaZip-Qt5-1.1/quazip
++INCLUDEPATH += /usr/include/QuaZip-Qt5-1.4/quazip
  
  
  SOURCES += \