[arch-commits] Commit in libsemigroups/trunk (PKGBUILD system-fmt.patch)

[Antonio Rojas]

    Date: Wednesday, November 27, 2019 @ 22:19:27
  Author: arojas
Revision: 534231

Update to 1.0.0, use system fmt

Added:
  libsemigroups/trunk/system-fmt.patch
Modified:
  libsemigroups/trunk/PKGBUILD

------------------+
 PKGBUILD         |   16 +++++++++++++---
 system-fmt.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-27 22:18:06 UTC (rev 534230)
+++ PKGBUILD	2019-11-27 22:19:27 UTC (rev 534231)
@@ -1,7 +1,7 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=libsemigroups
-pkgver=0.6.7
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="C++ library for semigroups and monoids"
 url="https://libsemigroups.github.io/libsemigroups/"
@@ -8,9 +8,19 @@
 arch=(x86_64)
 license=(GPL3)
 depends=(gcc-libs)
-source=(https://github.com/libsemigroups/libsemigroups/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('635ac5ef9251b22092028d6a28ce0493fff3ec7c0dc39a8600d90c8371db3a6c')
+makedepends=(fmt)
+source=(https://github.com/libsemigroups/libsemigroups/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz
+        system-fmt.patch)
+sha256sums=('db58bddf29ef58b4caeba42fa7cf5e1b52406c6b5c5c6c23c7e9d571b3f3de48'
+            '86c0ae8613df2959924d86c16874ee8d72288b10f87225c3909132b1d2a83fdf')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../system-fmt.patch
+  rm -r extern/fmt-*
+  autoreconf -fi
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr

Added: system-fmt.patch
===================================================================
--- system-fmt.patch	                        (rev 0)
+++ system-fmt.patch	2019-11-27 22:19:27 UTC (rev 534231)
@@ -0,0 +1,38 @@
+diff --git a/Makefile.am b/Makefile.am
+index 761a772..0a8391b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -108,17 +108,6 @@ pkginclude_HEADERS += extern/HPCombi/include/vect_generic.hpp
+ endif
+ 
+ fmtincludedir = $(includedir)/fmt
+-fmtinclude_HEADERS =  extern/fmt-5.3.0/include/fmt/chrono.h  
+-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/color.h  
+-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/core.h  
+-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/format-inl.h  
+-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/format.h  
+-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/locale.h  
+-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/ostream.h	
+-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/posix.h  
+-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/printf.h  
+-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/ranges.h  
+-fmtinclude_HEADERS += extern/fmt-5.3.0/include/fmt/time.h
+ 
+ lib_LTLIBRARIES = libsemigroups.la
+ 
+diff --git a/configure.ac b/configure.ac
+index c40acdb..832d8a3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -212,11 +212,5 @@ AS_IF([test "x$enable_hpcombi" = xyes],
+ AM_CONDITIONAL([HPCOMBI_CONSTEXPR_FUN_ARGS], 
+                [test "x$hpcombi_constexpr_fun_args" = xyes])
+ 
+-AC_CHECK_FILE([$srcdir/extern/fmt-5.3.0/README.rst], 
+-               [], 
+-               []
+-               [AC_MSG_ERROR([fmt-5.3.0 is not available, please download fmt-5.3.0 from https://fmt.dev/ and put the unpacked archive in the libsemigroups/extern directory])])
+-dnl Output configured files
+-
+ AC_CONFIG_FILES([Makefile libsemigroups.pc])
+ AC_OUTPUT