[arch-commits] Commit in fmt/repos/extra-x86_64 (3 files)

[Jelle van der Waa]

    Date: Saturday, May 30, 2020 @ 18:39:41
  Author: jelle
Revision: 387922

archrelease: copy trunk to extra-x86_64

Added:
  fmt/repos/extra-x86_64/PKGBUILD
    (from rev 387921, fmt/trunk/PKGBUILD)
  fmt/repos/extra-x86_64/dont-install-doctrees.patch
    (from rev 387921, fmt/trunk/dont-install-doctrees.patch)
Deleted:
  fmt/repos/extra-x86_64/PKGBUILD

-----------------------------+
 PKGBUILD                    |  119 ++++++++++++++++++++++--------------------
 dont-install-doctrees.patch |   24 ++++++++
 2 files changed, 87 insertions(+), 56 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-30 18:39:31 UTC (rev 387921)
+++ PKGBUILD	2020-05-30 18:39:41 UTC (rev 387922)
@@ -1,56 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Mihai Bişog <mihai.bisog at gmail.com>
-
-pkgname=fmt
-pkgver=6.2.1
-pkgrel=2
-pkgdesc='Open-source formatting library for C++'
-arch=(x86_64)
-url=https://fmt.dev
-license=(BSD)
-depends=(gcc-libs)
-makedepends=(
-  cmake
-  doxygen
-  git
-  ninja
-  npm
-  python-pip
-  python-virtualenv
-)
-provides=(libfmt.so)
-source=(git+https://github.com/fmtlib/fmt.git#tag=19bd751020a1f3c3363b2eb67a039852f139a8d3)
-sha256sums=(SKIP)
-
-pkgver() {
-  cd fmt
-
-  git describe --tags
-}
-
-prepare() {
-  npm install less less-plugin-clean-css
-  sed "s/'lessc',/'npx', 'lessc',/" -i fmt/doc/build.py
-}
-
-build() {
-  cmake -S fmt -B build \
-    -G Ninja \
-    -DCMAKE_BUILD_TYPE=None \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    -DBUILD_SHARED_LIBS=1
-  cmake --build build
-  cmake --build build --target doc
-}
-
-check() {
-  cmake --build build --target test
-}
-
-package() {
-  DESTDIR="${pkgdir}" cmake --build build --target install
-  install -Dm 644 fmt/LICENSE.rst -t "${pkgdir}"/usr/share/licenses/fmt
-}
-
-# vim: ts=2 sw=2 et:

Copied: fmt/repos/extra-x86_64/PKGBUILD (from rev 387921, fmt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-30 18:39:41 UTC (rev 387922)
@@ -0,0 +1,63 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Mihai Bişog <mihai.bisog at gmail.com>
+
+pkgname=fmt
+pkgver=6.2.1
+pkgrel=3
+pkgdesc='Open-source formatting library for C++'
+arch=(x86_64)
+url=https://fmt.dev
+license=(BSD)
+depends=(gcc-libs)
+makedepends=(
+  cmake
+  doxygen
+  git
+  ninja
+  npm
+  python-pip
+  python-virtualenv
+)
+provides=(libfmt.so)
+source=(git+https://github.com/fmtlib/fmt.git#tag=19bd751020a1f3c3363b2eb67a039852f139a8d3
+        dont-install-doctrees.patch) # https://github.com/fmtlib/fmt/commit/8f2b5fe74d34ba8bb20a362a4daa6cc5a99a2010
+
+
+pkgver() {
+  cd fmt
+
+  git describe --tags
+}
+
+prepare() {
+  npm install less less-plugin-clean-css
+  sed "s/'lessc',/'npx', 'lessc',/" -i fmt/doc/build.py
+
+  # Don't install sphinx cache doctrees directory
+  cd fmt
+  patch -Np1 -i ${srcdir}/dont-install-doctrees.patch
+}
+
+build() {
+  cmake -S fmt -B build \
+    -G Ninja \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DBUILD_SHARED_LIBS=1
+  cmake --build build
+  cmake --build build --target doc
+}
+
+check() {
+  cmake --build build --target test
+}
+
+package() {
+  DESTDIR="${pkgdir}" cmake --build build --target install
+  install -Dm 644 fmt/LICENSE.rst -t "${pkgdir}"/usr/share/licenses/fmt
+}
+
+# vim: ts=2 sw=2 et:
+md5sums=('SKIP'
+         'f29b10877482313f98456cc2674c0c37')

Copied: fmt/repos/extra-x86_64/dont-install-doctrees.patch (from rev 387921, fmt/trunk/dont-install-doctrees.patch)
===================================================================
--- dont-install-doctrees.patch	                        (rev 0)
+++ dont-install-doctrees.patch	2020-05-30 18:39:41 UTC (rev 387922)
@@ -0,0 +1,24 @@
+From 8f2b5fe74d34ba8bb20a362a4daa6cc5a99a2010 Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <jelle at vdwaa.nl>
+Date: Fri, 29 May 2020 23:19:16 +0200
+Subject: [PATCH] Don't install sphinx cache files
+
+When building documentation sphinx creates cached files in the .doctrees
+directory and aren't required for viewing documentation only for
+building. As added benefit this makes fmt reprodcubile as the cached
+files are different when the build environment is varied.
+---
+ doc/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index f3dae606e..108aa71e8 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -9,4 +9,5 @@ add_custom_target(doc
+   SOURCES api.rst syntax.rst usage.rst build.py conf.py _templates/layout.html)
+ 
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
+-        DESTINATION share/doc/fmt OPTIONAL)
++        DESTINATION share/doc/fmt OPTIONAL
++        PATTERN ".doctrees" EXCLUDE)