diff options
| author | Tim Biermann <tbier@posteo.de> | 2021-06-18 10:22:52 +0000 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2021-06-18 13:51:23 +0000 |
| commit | b63115bf403b2f2244f58abb0a6e335daa8f6110 (patch) | |
| tree | 4d6ecb4703bdef5c989d59b7530cf99d4e1a7621 /keepassxc | |
| parent | c72aa2df9d20a03674e82f43acac2ee0724322da (diff) | |
| download | contrib-b63115bf403b2f2244f58abb0a6e335daa8f6110.tar.gz contrib-b63115bf403b2f2244f58abb0a6e335daa8f6110.tar.xz | |
keepassxc: 2.6.4 -> 2.6.6
Diffstat (limited to 'keepassxc')
| -rw-r--r-- | keepassxc/.signature | 7 | ||||
| -rw-r--r-- | keepassxc/Pkgfile | 15 | ||||
| -rw-r--r-- | keepassxc/keepassxc-quazip1.patch | 19 |
3 files changed, 10 insertions, 31 deletions
diff --git a/keepassxc/.signature b/keepassxc/.signature index 11dc69684..709e1a294 100644 --- a/keepassxc/.signature +++ b/keepassxc/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3w5tvoGU1MICqTRNrclpOfNbDcjf9eTelovXCQqCrPN/uxHe1YBLRBCOvjgbyDGuq/D1ytJnOeJ1CM+cq3libQg= -SHA256 (Pkgfile) = 79e6085e60e33eac94eeff80a06c733e8640aa7a4f294940b0a5cdd43037d086 +RWSagIOpLGJF38ThOBM+0d7Mjy4LVcAeh4Qz+cIy9VS9Nix/VGLf9LEz4Kbk4jjSZ9BZLTYP6VStGQJI/2DMvZ7RqbRqdkFbPAY= +SHA256 (Pkgfile) = 53c2ca950d1eebc5dacc0e550eacd2910bede6e28a6d981a85157ac3139395ce SHA256 (.footprint) = 3518370ae52ecb1b0452d1aaa3b291be9b017eb1a4c8ac77c322ac88aa7fbdf1 -SHA256 (keepassxc-2.6.4-src.tar.xz) = e536e2a71c90fcf264eb831fb1a8b518ee1b03829828f862eeea748d3310f82b -SHA256 (keepassxc-quazip1.patch) = 8744b0ba137d644d855ac095b928bc4bdb5674b431a1f24fee7212036097ceaf +SHA256 (keepassxc-2.6.6-src.tar.xz) = 3603b11ac39b289c47fac77fa150e05fd64b393d8cfdf5732dc3ef106650a4e2 diff --git a/keepassxc/Pkgfile b/keepassxc/Pkgfile index 38b97bd9f..78755cdea 100644 --- a/keepassxc/Pkgfile +++ b/keepassxc/Pkgfile @@ -2,19 +2,18 @@ # URL: https://keepassxc.org/ # Maintainer: Tim Biermann, tbier at posteo dot de # Depends on: argon2 libgcrypt libsodium qrencode qt5 yubikey-personalization -# Optional: quazip5 +# Optional: asciidoctor quazip5 name=keepassxc -version=2.6.4 +version=2.6.6 release=1 -source=(https://github.com/keepassxreboot/keepassxc/releases/download/$version/$name-$version-src.tar.xz - keepassxc-quazip1.patch) +source=(https://github.com/keepassxreboot/keepassxc/releases/download/$version/$name-$version-src.tar.xz) build() { - [[ -e /usr/lib/ccache ]] && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" - [[ -e /usr/lib/ccache ]] && PKGMK_KEEPASSXC+=' -D WITH_CCACHE=ON' + prt-get isinst ccache && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" + prt-get isinst ccache && PKGMK_KEEPASSXC+=' -D WITH_CCACHE=ON' - patch -Np1 -d $name-$version -i $SRC/keepassxc-quazip1.patch + prt-get isinst asciidoctor && PKGMK_KEEPASSXC+=' -D WITH_XC_DOCS=ON' || PKGMK_KEEPASSXC+=' -D WITH_XC_DOCS=OFF' cmake -S $name-$version -B build -G Ninja $PKGMK_KEEPASSXC \ -D CMAKE_INSTALL_PREFIX=/usr \ @@ -23,11 +22,11 @@ build() { -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ -D WITH_XC_ALL=ON \ - -D WITH_XC_DOCS=OFF \ -D WITH_TESTS=OFF \ -Wno-dev cmake --build build DESTDIR=$PKG cmake --install build rm -r $PKG/usr/share/keepassxc/translations + rm -rf $PKG/usr/share/keepassxc/docs } diff --git a/keepassxc/keepassxc-quazip1.patch b/keepassxc/keepassxc-quazip1.patch deleted file mode 100644 index 95514ab14..000000000 --- a/keepassxc/keepassxc-quazip1.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake -index a387e2f8..9fab3e57 100644 ---- a/cmake/FindQuaZip.cmake -+++ b/cmake/FindQuaZip.cmake -@@ -10,12 +10,12 @@ if(MINGW) - find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h) - else() - find_library(QUAZIP_LIBRARIES -- NAMES quazip5 quazip -+ NAMES quazip5 quazip quazip1-qt5 - PATHS /usr/lib /usr/lib64 /usr/local/lib - ) - find_path(QUAZIP_INCLUDE_DIR quazip.h - PATHS /usr/include /usr/local/include -- PATH_SUFFIXES quazip5 quazip -+ PATH_SUFFIXES quazip5 quazip QuaZip-Qt5-1.0/quazip QuaZip-Qt5-1.1/quazip - ) - find_path(QUAZIP_ZLIB_INCLUDE_DIR zlib.h PATHS /usr/include /usr/local/include) - endif() |