[arch-commits] Commit in fmt/trunk (PKGBUILD)

[Maxime Gauduin]

    Date: Saturday, November 6, 2021 @ 10:40:01
  Author: alucryd
Revision: 427401

upgpkg: fmt 8.0.1-2

Modified:
  fmt/trunk/PKGBUILD

----------+
 PKGBUILD |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-06 10:14:31 UTC (rev 427400)
+++ PKGBUILD	2021-11-06 10:40:01 UTC (rev 427401)
@@ -3,7 +3,7 @@
 
 pkgname=fmt
 pkgver=8.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Open-source formatting library for C++'
 arch=(x86_64)
 url=https://fmt.dev
@@ -19,14 +19,18 @@
   python-virtualenv
 )
 provides=(libfmt.so)
-_commit=d141cdbeb0fb422a3fb7173b285fd38e0d1772dc
-source=(git+https://github.com/fmtlib/fmt.git#commit=${_commit})
-b2sums=('SKIP')
+_tag=d141cdbeb0fb422a3fb7173b285fd38e0d1772dc
+source=(git+https://github.com/fmtlib/fmt.git#tag=${_tag})
+b2sums=(SKIP)
 
 prepare() {
   pushd fmt
   # https://github.com/fmtlib/fmt/pull/2376
   git cherry-pick -n c9a10631cb3a656b0a0a3ba3cf0ef7ea541df30f
+  # https://github.com/fmtlib/fmt/pull/2432
+  git cherry-pick -n 55d3c4831d67141265c9462360d20787413e692e
+  # https://github.com/fmtlib/fmt/pull/2575
+  git cherry-pick -n 6eaceb5f73f12943376c833a8433b38ff7faed10
   popd
 
   npm install less less-plugin-clean-css
@@ -43,7 +47,7 @@
     -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    -DBUILD_SHARED_LIBS=1
+    -DBUILD_SHARED_LIBS=ON
   cmake --build build
   cmake --build build --target doc
 }
@@ -54,7 +58,7 @@
 
 package() {
   DESTDIR="${pkgdir}" cmake --build build --target install
-  install -Dm 644 fmt/LICENSE.rst -t "${pkgdir}"/usr/share/licenses/fmt
+  install -Dm 644 fmt/LICENSE.rst -t "${pkgdir}"/usr/share/licenses/fmt/
 }
 
 # vim: ts=2 sw=2 et: