diff options
| author | Vekhir | 2023-11-15 20:24:22 +0100 |
|---|---|---|
| committer | bartoszek | 2024-01-16 17:58:55 +0100 |
| commit | 0c75973b8ca4ca1bec232b850348409fc47ce8ce (patch) | |
| tree | 4a511a717d7a381c9f2dfddbecb6942a2e74d94e /quazip.patch | |
| parent | 784fa0b49da1dca03c5d48b6d272895c53e03217 (diff) | |
| download | aur-0c75973b8ca4ca1bec232b850348409fc47ce8ce.tar.gz | |
Fix build issues
Upstream has merged the fixes for c++17 and gcc11, so remove those
patches.
The quazip logic upstream has changed to automatically search for
quazip 5 or 6 depending on Qt version. Updated quazip.patch to account
for that.
OpenBoard now starts with startup hints. An additional directory,
OpenBoard/resources/startupHints, contains the relevant files and
must be installed too.
Qt Script isn't used anymore and Qt WebKit has been replaced by Qt
WebEngine. Qt tools is only used during building for lrelease.
Diffstat (limited to 'quazip.patch')
| -rw-r--r-- | quazip.patch | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/quazip.patch b/quazip.patch index 7793bf5a20bb..0d2eb68d9d10 100644 --- a/quazip.patch +++ b/quazip.patch @@ -1,17 +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/quazip" -+ LIBS += "-lquazip1-qt5" -+ INCLUDEPATH += /usr/include/QuaZip-Qt5-1.2/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 |