diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:15:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:18:23 +0000 |
| commit | b935ae5f3cfb2bb4f9a3746d284f156a6dece505 (patch) | |
| tree | 5efe4e2e7a7723a737d0130a333b057c5e76df40 /nixpkgs/pkgs/applications/misc/keepassx/quazip5.patch | |
| parent | dc9566e91c9453378c24e98b5737234364670df5 (diff) | |
| parent | d26027792812fbfad4d0f451b5f47fdabf7fdeb9 (diff) | |
| download | nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.gz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.bz2 nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.lz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.xz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.zst nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.zip | |
Merge commit 'd26027792812fbfad4d0f451b5f47fdabf7fdeb9'
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/keepassx/quazip5.patch')
| -rw-r--r-- | nixpkgs/pkgs/applications/misc/keepassx/quazip5.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/applications/misc/keepassx/quazip5.patch b/nixpkgs/pkgs/applications/misc/keepassx/quazip5.patch new file mode 100644 index 000000000000..ccea841cac7d --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/keepassx/quazip5.patch @@ -0,0 +1,27 @@ +diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake +index 8d309181..92aa892c 100644 +--- a/cmake/FindQuaZip.cmake ++++ b/cmake/FindQuaZip.cmake +@@ -9,7 +9,6 @@ IF(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) + SET(QUAZIP_FOUND TRUE) + ELSE(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) + IF(Qt5Core_FOUND) +- set(QUAZIP_LIB_VERSION_SUFFIX 5) + ENDIF() + IF(WIN32) + FIND_PATH(QUAZIP_LIBRARY_DIR +diff --git a/src/keeshare/ShareObserver.cpp b/src/keeshare/ShareObserver.cpp +index 33f5ed1f..5fcd9202 100644 +--- a/src/keeshare/ShareObserver.cpp ++++ b/src/keeshare/ShareObserver.cpp +@@ -46,8 +46,8 @@ + #include <QStringBuilder> + + #if defined(WITH_XC_KEESHARE_SECURE) +-#include <quazip5/quazip.h> +-#include <quazip5/quazipfile.h> ++#include <quazip/quazip.h> ++#include <quazip/quazipfile.h> + #endif + + namespace |