diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | xpiks-build_with_system_libquazip5.patch | 27 |
3 files changed, 12 insertions, 21 deletions
@@ -21,7 +21,7 @@ pkgbase = xpiks-git source = xpiks-libxpks_stub.patch source = xpiks.desktop md5sums = SKIP - md5sums = 8d082ec0a08051aec943aa3c35486592 + md5sums = c7b93172c88154f6d3834b7dccabd3e5 md5sums = c3b93f3c3410f76fc50b94a55b551e6b md5sums = 4112f7181afe7e45eb878b8eccc91eaf @@ -20,7 +20,7 @@ source=( "xpiks.desktop" ) md5sums=('SKIP' - '8d082ec0a08051aec943aa3c35486592' + 'c7b93172c88154f6d3834b7dccabd3e5' 'c3b93f3c3410f76fc50b94a55b551e6b' '4112f7181afe7e45eb878b8eccc91eaf') @@ -32,7 +32,7 @@ pkgver() { prepare() { cd "${srcdir}/${_gitname}" - #git apply ../xpiks-build_with_system_libquazip5.patch + git apply ../xpiks-build_with_system_libquazip5.patch git apply ../xpiks-libxpks_stub.patch git submodule update --init --recursive diff --git a/xpiks-build_with_system_libquazip5.patch b/xpiks-build_with_system_libquazip5.patch index bd3dbd134bbe..3901ba3c54e5 100644 --- a/xpiks-build_with_system_libquazip5.patch +++ b/xpiks-build_with_system_libquazip5.patch @@ -1,21 +1,21 @@ diff --git a/src/xpiks-qt/Helpers/ziphelper.cpp b/src/xpiks-qt/Helpers/ziphelper.cpp -index 1e3c99aa..8f53d404 100644 +index 1b46f221..2e35f79a 100644 --- a/src/xpiks-qt/Helpers/ziphelper.cpp +++ b/src/xpiks-qt/Helpers/ziphelper.cpp -@@ -10,7 +10,7 @@ +@@ -16,7 +16,7 @@ + #include <QStringList> + #include <QtDebug> - #include "ziphelper.h" - #include <QFileInfo> --#include <quazip/JlCompress.h> +-#include <vendors/quazip/quazip/JlCompress.h> +#include <quazip5/JlCompress.h> - #include "filehelpers.h" - #include "../Common/logging.h" + #include "Common/logging.h" + #include "Helpers/filehelpers.h" diff --git a/src/xpiks-qt/xpiks-qt.pro b/src/xpiks-qt/xpiks-qt.pro -index d36ccb0d..d6cff7e5 100644 +index fcf9d02a..c5993843 100644 --- a/src/xpiks-qt/xpiks-qt.pro +++ b/src/xpiks-qt/xpiks-qt.pro -@@ -635,7 +635,7 @@ LIBS += -lhunspell +@@ -720,7 +720,7 @@ LIBS += -lhunspell LIBS += -lcurl LIBS += -lface LIBS += -lssdll @@ -24,12 +24,3 @@ index d36ccb0d..d6cff7e5 100644 LIBS += -lz LIBS += -lthmbnlr LIBS += -lxpks -@@ -735,7 +735,7 @@ win32 { - - linux { - message("for Linux") -- INCLUDEPATH += "../../vendors/quazip" -+ #INCLUDEPATH += "../../vendors/quazip" - BUILDNO = $$system($$PWD/../../scripts/build/buildno.sh) - - LIBS += -ldl |