Update quazip.patch drop_thirdParty_repo.patch

4 files changed, 33 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 354a16f72387..a32fab2f440a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -30,8 +30,8 @@ pkgbase = openboard-git
 	sha256sums = SKIP
 	sha256sums = b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549
 	sha256sums = 00688af02006bddeab797f624e5cbae66a5c02f4e14315d87d3f198f74797c17
-	sha256sums = 5a0ccf85dd9f9a05b20fc5cd088181d7c378d2e68dbe789fdf124a607ea2cda7
-	sha256sums = 71a41ecbecb952b402d554aa7c5659650765b692662a28f9db904c7390f8f080
+	sha256sums = 8c0b28ebd6cade0a551b695af9c04a2c45052f2d955357825b3be97bf00d5be7
+	sha256sums = a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14
 	sha256sums = 205062adbbd48d6622341e316e14a5496f73696385a3ed5cda7a89d3e7d2861d
 
 pkgname = openboard-git
diff --git a/PKGBUILD b/PKGBUILD
index 8064426a551b..37698f62dbd2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,8 +22,8 @@ source+=(30fps.patch)
 sha256sums=('SKIP'
             'b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549'
             '00688af02006bddeab797f624e5cbae66a5c02f4e14315d87d3f198f74797c17'
-            'c2772db9b3f0265ba1a54761452f628182369afea1a2d127ea8dae3ff2a139c3'
-            '71a41ecbecb952b402d554aa7c5659650765b692662a28f9db904c7390f8f080'
+            '8c0b28ebd6cade0a551b695af9c04a2c45052f2d955357825b3be97bf00d5be7'
+            'a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14'
             '205062adbbd48d6622341e316e14a5496f73696385a3ed5cda7a89d3e7d2861d')
 
 pkgver() {
diff --git a/drop_ThirdParty_repo.patch b/drop_ThirdParty_repo.patch
index 058ede8829f8..91a0b1315d01 100644
--- a/drop_ThirdParty_repo.patch
+++ b/drop_ThirdParty_repo.patch
@@ -74,15 +74,3 @@ diff -Naur OpenBoard-1.5.3/libs.pri OpenBoard-1.5.3-new/libs.pri
 +}
 +
 +
-diff -Naur OpenBoard-1.5.3/OpenBoard.pro OpenBoard-1.5.3-new/OpenBoard.pro
---- OpenBoard-1.5.3/OpenBoard.pro	2019-04-10 09:04:25.000000000 +0200
-+++ OpenBoard-1.5.3-new/OpenBoard.pro	2019-04-12 14:26:34.289438050 +0200
-@@ -45,7 +45,7 @@
- 
- INCLUDEPATH += src
- 
--include($$THIRD_PARTY_PATH/libs.pri)
-+include(libs.pri)
- include(src/adaptors/adaptors.pri)
- include(src/api/api.pri)
- include(src/board/board.pri)
diff --git a/quazip.patch b/quazip.patch
index 598b55284eac..7e1c554132e5 100644
--- a/quazip.patch
+++ b/quazip.patch
@@ -1,19 +1,31 @@
---- OpenBoard-1.5.3/OpenBoard.pro	2019-04-10 09:04:25.000000000 +0200
-+++ OpenBoard-1.5.3-quazip/OpenBoard.pro	2019-04-12 08:54:40.265598779 +0200
-@@ -71,9 +71,7 @@
- INCLUDEPATH += plugins/cffadaptor/src
- 
- #ThirdParty
--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
- 
- FORMS += resources/forms/mainWindow.ui \
-    resources/forms/preferences.ui \
---- OpenBoard-1.5.3/plugins/cffadaptor/UBCFFAdaptor.pro	2019-04-10 09:04:25.000000000 +0200
-+++ OpenBoard-1.5.3-quazip/plugins/cffadaptor/UBCFFAdaptor.pro	2019-04-12 08:53:45.622844493 +0200
-@@ -39,7 +38,7 @@
+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
+     LIBS += -lX11
+-    LIBS += -lquazip5
+-    INCLUDEPATH += "/usr/include/quazip"
++    LIBS += "-lquazip1-qt5"
++    INCLUDEPATH += /usr/include/QuaZip-Qt5-1.1/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
+@@ -13,9 +13,6 @@
+ linux-g++-32: SUB_DIR = linux
+ linux-g++-64: SUB_DIR = linux
+ 
+-THIRD_PARTY_PATH = ../../../Sankore-ThirdParty
+-QUAZIP_DIR   = "$$PWD/../../../Sankore-ThirdParty/quazip/quazip-0.3"
+-
+ BUILD_DIR = build/$$SUB_DIR
+ CONFIG(debug, debug|release):BUILD_DIR = $$BUILD_DIR/debug
+ CONFIG(release, debug|release) {
+@@ -39,7 +36,7 @@
      QMAKE_POST_LINK += bash postScript_mac.sh "$$DESTDIR" "$$SANKORE_DIR/$$BUILD_DIR/product/Open-Sankore.app/Contents/MacOS"
  }
  
@@ -22,7 +34,7 @@
  
  QT       += xml xmlpatterns core
  QT       += gui
-@@ -51,9 +50,7 @@
+@@ -51,9 +48,7 @@
  
  INCLUDEPATH += src