From a13920dea00942f40bde5448ec99c6dabe78b3c6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 1 Jun 2019 15:55:03 +0300 Subject: [PATCH] keepassxc: drop quazip patch Not needed after quazip update. --- pkgs/applications/misc/keepassx/community.nix | 1 - pkgs/applications/misc/keepassx/quazip5.patch | 27 ------------------- 2 files changed, 28 deletions(-) delete mode 100644 pkgs/applications/misc/keepassx/quazip5.patch diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index ee99e21f6ec..b52cff784e5 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch - ./quazip5.patch ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/keepassx/quazip5.patch b/pkgs/applications/misc/keepassx/quazip5.patch deleted file mode 100644 index ccea841cac7..00000000000 --- a/pkgs/applications/misc/keepassx/quazip5.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 - - #if defined(WITH_XC_KEESHARE_SECURE) --#include --#include -+#include -+#include - #endif - - namespace