[arch-commits] Commit in cryfs/repos/community-x86_64 (3 files)

[Antonio Rojas]

    Date: Saturday, February 5, 2022 @ 18:54:30
  Author: arojas
Revision: 1126512

archrelease: copy trunk to community-x86_64

Added:
  cryfs/repos/community-x86_64/PKGBUILD
    (from rev 1126511, cryfs/trunk/PKGBUILD)
  cryfs/repos/community-x86_64/fix-openmp.patch
    (from rev 1126511, cryfs/trunk/fix-openmp.patch)
Deleted:
  cryfs/repos/community-x86_64/PKGBUILD

------------------+
 PKGBUILD         |   79 +++++++++++++++++++++++++++--------------------------
 fix-openmp.patch |   13 ++++++++
 2 files changed, 54 insertions(+), 38 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-05 18:54:18 UTC (rev 1126511)
+++ PKGBUILD	2022-02-05 18:54:30 UTC (rev 1126512)
@@ -1,38 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andy Weidenbaum <archbaum at gmail.com>
-# Contributor: kaylyn
-# Contributor: Giuseppe Calà <jiveaxe at gmail.com>
-
-pkgname=cryfs
-pkgver=0.11.1
-pkgrel=1
-pkgdesc='Cryptographic filesystem for the cloud'
-arch=(x86_64)
-depends=(fuse2 curl spdlog fmt boost-libs)
-makedepends=(cmake python boost range-v3)
-url='https://www.cryfs.org'
-license=(LGPL3)
-source=(https://github.com/cryfs/cryfs/releases/download/$pkgver/cryfs-$pkgver.tar.xz{,.asc})
-sha256sums=('55f139b07b9737851cc0d6e26c425a7debc2fabd2a62aa43ba56e5a33ca93ece'
-            'SKIP')
-validpgpkeys=(5D5EC7BC6F1443EC2AF7177A9E6C996C991D25E1) # CryFS Team <messmer at cryfs.org>
-
-prepare() {
-  sed -e '/Release/d' -i doc/CMakeLists.txt # Install man page also with dafault build type
-}
-
-build() {
-  cmake -B build -S . \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_TESTING=OFF \
-    -DCRYFS_UPDATE_CHECKS=OFF \
-    -DDEPENDENCY_CONFIG="cmake-utils/DependenciesFromLocalSystem.cmake"
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-
-  install -Dm 644 LICENSE.txt -t "$pkgdir"/usr/share/licenses/$pkgname
-  install -Dm 644 README.md -t "$pkgdir"/usr/share/doc/$pkgname
-}

Copied: cryfs/repos/community-x86_64/PKGBUILD (from rev 1126511, cryfs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-02-05 18:54:30 UTC (rev 1126512)
@@ -0,0 +1,41 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andy Weidenbaum <archbaum at gmail.com>
+# Contributor: kaylyn
+# Contributor: Giuseppe Calà <jiveaxe at gmail.com>
+
+pkgname=cryfs
+pkgver=0.11.1
+pkgrel=2
+pkgdesc='Cryptographic filesystem for the cloud'
+arch=(x86_64)
+depends=(fuse2 curl spdlog fmt boost-libs)
+makedepends=(cmake python boost range-v3)
+url='https://www.cryfs.org'
+license=(LGPL3)
+source=(https://github.com/cryfs/cryfs/releases/download/$pkgver/cryfs-$pkgver.tar.xz{,.asc}
+        fix-openmp.patch)
+sha256sums=('55f139b07b9737851cc0d6e26c425a7debc2fabd2a62aa43ba56e5a33ca93ece'
+            'SKIP'
+            '9db0aeef631c21a4d10a4235a16573e2ef81808fb7645ecf2b77615e6978b0b1')
+validpgpkeys=(5D5EC7BC6F1443EC2AF7177A9E6C996C991D25E1) # CryFS Team <messmer at cryfs.org>
+
+prepare() {
+  sed -e '/Release/d' -i doc/CMakeLists.txt # Install man page also with dafault build type
+  patch -p1 < fix-openmp.patch # Fix openMP support https://github.com/cryfs/cryfs/issues/414
+}
+
+build() {
+  cmake -B build -S . \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_TESTING=OFF \
+    -DCRYFS_UPDATE_CHECKS=OFF \
+    -DDEPENDENCY_CONFIG="cmake-utils/DependenciesFromLocalSystem.cmake"
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+
+  install -Dm 644 LICENSE.txt -t "$pkgdir"/usr/share/licenses/$pkgname
+  install -Dm 644 README.md -t "$pkgdir"/usr/share/doc/$pkgname
+}

Copied: cryfs/repos/community-x86_64/fix-openmp.patch (from rev 1126511, cryfs/trunk/fix-openmp.patch)
===================================================================
--- fix-openmp.patch	                        (rev 0)
+++ fix-openmp.patch	2022-02-05 18:54:30 UTC (rev 1126512)
@@ -0,0 +1,13 @@
+diff --git a/vendor/cryptopp/CMakeLists.txt b/vendor/cryptopp/CMakeLists.txt
+index 991c6ba1..5f2045bb 100644
+--- a/vendor/cryptopp/CMakeLists.txt
++++ b/vendor/cryptopp/CMakeLists.txt
+@@ -15,6 +15,8 @@ set(CRYPTOPP_BUILD_TESTING OFF CACHE BOOL "")
+ set(BUILD_DOCUMENTATION OFF CACHE BOOL "")
+ set(BUILD_SHARED OFF CACHE BOOL "")
+ set(BUILD_STATIC ON CACHE BOOL "")
++set(USE_INTERMEDIATE_OBJECTS_TARGET OFF CACHE BOOL "")
++
+ set(cryptocpp_DISPLAY_CMAKE_SUPPORT_WARNING OFF CACHE BOOL "")
+ add_subdirectory(vendor_cryptopp EXCLUDE_FROM_ALL)
+