summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2024-03-12 15:50:33 +0100
committerbartus2024-03-12 15:50:51 +0100
commit9a0bf07d1e702db54e5407cebff7056e7644b963 (patch)
tree7391b1461b5b96796fca0ec221c5c012d65a8fed
parent7f2f75c4ed72dffd9f09092a6d1b7e61739eb1f7 (diff)
downloadaur-9a0bf07d1e702db54e5407cebff7056e7644b963.tar.gz
Update quazip.patch for v1.7
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--quazip.patch25
3 files changed, 14 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b79bd733504a..5131a92047bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -31,7 +31,7 @@ pkgbase = openboard-develop
sha256sums = cf5bfb570b9ac4e61e1670c5a433f1dcaf0de1e8dbcbd544f058711690afba79
sha256sums = 18ee4fab83b0c92490c81c2aaace98f669d07d7260cc0f83a24acb8d6224e5e7
sha256sums = b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549
- sha256sums = 8c0b28ebd6cade0a551b695af9c04a2c45052f2d955357825b3be97bf00d5be7
+ sha256sums = da603ed16eb15cb81f641aaf669963553f16c823688eb27b788d36892edb35b2
sha256sums = a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14
pkgname = openboard-develop
diff --git a/PKGBUILD b/PKGBUILD
index 269fbc4d3113..d412ded0fec1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,7 +23,7 @@ source+=(drop_ThirdParty_repo.patch)
sha256sums=('cf5bfb570b9ac4e61e1670c5a433f1dcaf0de1e8dbcbd544f058711690afba79'
'18ee4fab83b0c92490c81c2aaace98f669d07d7260cc0f83a24acb8d6224e5e7'
'b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549'
- '8c0b28ebd6cade0a551b695af9c04a2c45052f2d955357825b3be97bf00d5be7'
+ 'da603ed16eb15cb81f641aaf669963553f16c823688eb27b788d36892edb35b2'
'a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14')
prepare() {
diff --git a/quazip.patch b/quazip.patch
index 7e1c554132e5..b0d65d4dca1b 100644
--- a/quazip.patch
+++ b/quazip.patch
@@ -1,17 +1,16 @@
-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
+--- 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
+@@ -465,8 +465,8 @@
+ LIBS += -lquazip6
+ INCLUDEPATH += "/usr/include/quazip6"
+ } 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 +40,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 += \