Update to 1.7.0-1

3 files changed, 25 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 87d83310fc1c..e4d8974a24e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openboard
 	pkgdesc = Interactive whiteboard software for schools and universities
-	pkgver = 1.6.4
-	pkgrel = 2
+	pkgver = 1.7.0
+	pkgrel = 1
 	url = http://openboard.ch/index.en.html
 	arch = x86_64
 	arch = i686
@@ -22,16 +22,16 @@ pkgbase = openboard
 	depends = ffmpeg4.4
 	depends = quazip
 	depends = poppler
-	source = https://github.com/OpenBoard-org/OpenBoard/archive/v1.6.4.tar.gz
+	source = https://github.com/OpenBoard-org/OpenBoard/archive/v1.7.0.tar.gz
 	source = openboard.desktop
 	source = qchar.patch
 	source = quazip.patch
 	source = drop_ThirdParty_repo.patch
 	source = ffmpeg.patch
-	sha256sums = a64a575cbc8dd9265f542e361ab77cf7fa612dc9ca34cbcdd6129606403ac8af
+	sha256sums = 03b5e6f728339528b8580542302f1d80567f814b10cb94b83df9c996eca125a3
 	sha256sums = 64289f9d91cb25fa79fb988f19d43a542d67380fcf27668d0da1ee4ba1e705eb
 	sha256sums = b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549
-	sha256sums = 62a70b4aef5e4ed1e41c32948ed529e3f167566517134461b4248a7c1ddad882
+	sha256sums = 7e790bc63831b611a6c068d3208f16cf3fff5294b69ccd6a0592d64538c7d493
 	sha256sums = a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14
 	sha256sums = b2c8d92275c976af195f1b8f8df0ae1a61781a1c20ccc10b41fdc81178427bd3
 
diff --git a/PKGBUILD b/PKGBUILD
index 4e3903893c61..ff1ced61c96f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Frank Siegert <frank.siegert@googlemail.com>
 # Contributor: bartus <arch-user-repoᘓbartus.33mail.com>
 pkgname=openboard
-pkgver=1.6.4
+pkgver=1.7.0
 _src_folder="OpenBoard-${pkgver}"
-pkgrel=2
+pkgrel=1
 pkgdesc="Interactive whiteboard software for schools and universities"
 arch=('x86_64' 'i686')
 url="http://openboard.ch/index.en.html"
@@ -18,10 +18,10 @@ source+=(qchar.patch)
 source+=(quazip.patch)
 source+=(drop_ThirdParty_repo.patch)
 source+=(ffmpeg.patch)
-sha256sums=('a64a575cbc8dd9265f542e361ab77cf7fa612dc9ca34cbcdd6129606403ac8af'
+sha256sums=('03b5e6f728339528b8580542302f1d80567f814b10cb94b83df9c996eca125a3'
             '64289f9d91cb25fa79fb988f19d43a542d67380fcf27668d0da1ee4ba1e705eb'
             'b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549'
-            '62a70b4aef5e4ed1e41c32948ed529e3f167566517134461b4248a7c1ddad882'
+            '7e790bc63831b611a6c068d3208f16cf3fff5294b69ccd6a0592d64538c7d493'
             'a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14'
             'b2c8d92275c976af195f1b8f8df0ae1a61781a1c20ccc10b41fdc81178427bd3')
 
diff --git a/quazip.patch b/quazip.patch
index 6a26c3bcf597..6ee1e8a6a04f 100644
--- a/quazip.patch
+++ b/quazip.patch
@@ -1,18 +1,22 @@
 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
+@@ -466,11 +466,11 @@
      LIBS += -lX11
--    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
+ 
+     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 += -lpopplerdiff -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 @@
@@ -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.3/quazip
++INCLUDEPATH += /usr/include/QuaZip-Qt5-1.4/quazip
  
  
  SOURCES += \