Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package libsemigroups for openSUSE:Factory 
checked in at 2022-11-20 19:47:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libsemigroups (Old)
 and      /work/SRC/openSUSE:Factory/.libsemigroups.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libsemigroups"

Sun Nov 20 19:47:05 2022 rev:22 rq:1036841 version:2.3.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/libsemigroups/libsemigroups.changes      
2022-11-19 18:09:33.602519614 +0100
+++ /work/SRC/openSUSE:Factory/.libsemigroups.new.1597/libsemigroups.changes    
2022-11-20 19:47:10.485293574 +0100
@@ -1,0 +2,6 @@
+Sat Nov 19 19:36:33 UTC 2022 - Jan Engelhardt <jeng...@inai.de>
+
+- Enable fmt component
+- Refresh pkgconfig.patch
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libsemigroups.spec ++++++
--- /var/tmp/diff_new_pack.CYMyhP/_old  2022-11-20 19:47:11.701300602 +0100
+++ /var/tmp/diff_new_pack.CYMyhP/_new  2022-11-20 19:47:11.709300648 +0100
@@ -30,6 +30,7 @@
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  pkgconfig(eigen3)
+BuildRequires:  pkgconfig(fmt) >= 8.1.1
 
 %description
 A C++14 library containing implementations of several algorithms for
@@ -65,7 +66,9 @@
 %build
 autoreconf -fi
 # hpcombi requires AVX-256, which is not guaranteed to exist everywhere
-%configure --disable-static --disable-hpcombi --with-external-eigen
+%configure --disable-static --disable-hpcombi \
+       --enable-eigen --with-external-eigen \
+       --enable-fmt --with-external-fmt
 %make_build
 
 %install

++++++ pkgconfig.patch ++++++
--- /var/tmp/diff_new_pack.CYMyhP/_old  2022-11-20 19:47:11.729300764 +0100
+++ /var/tmp/diff_new_pack.CYMyhP/_new  2022-11-20 19:47:11.733300787 +0100
@@ -1,30 +1,121 @@
-From 1f770e8663d358424eca6bbff316e2a76ba37122 Mon Sep 17 00:00:00 2001
+From dee9d85230894f871a90dbb1767f05cda6d2679d Mon Sep 17 00:00:00 2001
 From: Jan Engelhardt <jeng...@inai.de>
 Date: Sat, 19 Nov 2022 02:33:54 +0100
-Subject: [PATCH] build: add missing eigen3 to pkg-config file
-References: https://github.com/libsemigroups/libsemigroups/pull/414
+Subject: [PATCH] build: add missing eigen3 / fmt to pkg-config file
 
-A libsemigroups installed to /usr requires eigen3 to be
+A libsemigroups installed to /usr requires eigen3 and fmt to be
 present due to an #include line,
 
-include/libsemigroups/digraph.hpp:#include <Eigen/Core>
+$ grep -r Eigen/ /usr/include/libsemigroups/
+/usr/include/libsemigroups/digraph.hpp:#include <Eigen/Core>
+/usr/include/libsemigroups/obvinf.hpp:#include <Eigen/Core>
+$ grep -r fmt/ /usr/include/libsemigroups/
+/usr/include/libsemigroups/report.hpp:#include "fmt/color.h"
+/usr/include/libsemigroups/report.hpp:#include "fmt/printf.h"
 
-However, with eigen3 not being specified in the .pc file, package
-managers do not install eigen3 alongside libsemigroups-devel.
-Rectify that.
+However, with eigen3/fmt not being specified in the .pc file, package
+managers do not install eigen3/fmt alongside libsemigroups-devel, and
+compilation can fail. Rectify that.
 ---
- libsemigroups.pc.in | 1 +
- 1 file changed, 1 insertion(+)
+ libsemigroups.pc.in  |  1 +
+ m4/ax_check_eigen.m4 | 11 +++++++----
+ m4/ax_check_fmt.m4   | 11 +++++++----
+ 3 files changed, 15 insertions(+), 8 deletions(-)
 
 diff --git a/libsemigroups.pc.in b/libsemigroups.pc.in
-index 4f3dee0..9a92652 100644
+index 4f3dee0..f32dd57 100644
 --- a/libsemigroups.pc.in
 +++ b/libsemigroups.pc.in
 @@ -8,3 +8,4 @@ Description: C++ library for semigroups and monoids
  Version: @PACKAGE_VERSION@
  Libs: -L${libdir} -lsemigroups
  Cflags: -I${includedir}
-+Requires: eigen3
++Requires: @eigen_PCDEP@ @fmt_PCDEP@
+diff --git a/m4/ax_check_eigen.m4 b/m4/ax_check_eigen.m4
+index b117a97..651d153 100644
+--- a/m4/ax_check_eigen.m4
++++ b/m4/ax_check_eigen.m4
+@@ -3,7 +3,7 @@ dnl handle eigen checks
+ AC_DEFUN([AX_CHECK_EIGEN], [
+   AC_ARG_ENABLE(
+     [eigen],
+-    [AS_HELP_STRING([--enable-eigen], [enable eigen])],
++    [AS_HELP_STRING([--enable-eigen], [enable eigen (default: yes)])],
+     [],
+     [enable_eigen=yes]
+   )
+@@ -18,7 +18,7 @@ AC_DEFUN([AX_CHECK_EIGEN], [
+   if test "x$enable_eigen" = xyes; then
+     AC_ARG_WITH(
+       [external-eigen],
+-      [AS_HELP_STRING([--with-external-eigen],[use the external eigen])],
++      [AS_HELP_STRING([--with-external-eigen], [use the external eigen 
(default: no)])],
+       [], 
+       [with_external_eigen=no]
+     )
+@@ -26,15 +26,18 @@ AC_DEFUN([AX_CHECK_EIGEN], [
+     AC_MSG_RESULT([$with_external_eigen])
+    
+     MIN_EIGEN_VERSION="3.3.7"
++    eigen_PCDEP=""
+ 
+     if test "x$with_external_eigen" = xyes;  then
+           m4_ifdef([PKG_CHECK_MODULES], [
+-          PKG_CHECK_MODULES([EIGEN3], 
+-                            [eigen3 >= $MIN_EIGEN_VERSION])],
++              PKG_CHECK_MODULES([EIGEN3], [eigen3 >= $MIN_EIGEN_VERSION])
++              eigen_PCDEP="eigen3"
++          ],
+           [AC_MSG_ERROR([cannot use flag --with-external-eigen, the 
libsemigroups configure file was created on a system without m4 macros for 
pkg-config available...])])
+     else
+           AC_SUBST(EIGEN3_CFLAGS, ['-I$(srcdir)/extern/eigen-3.3.9/'])
+     fi
++    AC_SUBST([eigen_PCDEP])
+   fi
+ 
+   dnl The following makes LIBSEMIGROUPS_WITH_INTERNAL_EIGEN usable in 
Makefile.am
+diff --git a/m4/ax_check_fmt.m4 b/m4/ax_check_fmt.m4
+index 9e53438..31ce62b 100644
+--- a/m4/ax_check_fmt.m4
++++ b/m4/ax_check_fmt.m4
+@@ -3,7 +3,7 @@ dnl handle fmt checks
+ AC_DEFUN([AX_CHECK_FMT], [
+   AC_ARG_ENABLE(
+     [fmt],
+-    [AS_HELP_STRING([--enable-fmt], [enable fmt])],
++    [AS_HELP_STRING([--enable-fmt], [enable fmt (default: no)])],
+     [],
+     [enable_fmt=no]
+   )
+@@ -18,7 +18,7 @@ AC_DEFUN([AX_CHECK_FMT], [
+   if test "x$enable_fmt" = xyes;  then
+     AC_ARG_WITH(
+       [external-fmt],
+-      [AS_HELP_STRING([--with-external-fmt],[use the external fmt])],
++      [AS_HELP_STRING([--with-external-fmt], [use the external fmt (default: 
no)])],
+       [],
+       [with_external_fmt=no]
+     )
+@@ -27,14 +27,17 @@ AC_DEFUN([AX_CHECK_FMT], [
+ 
+     MIN_FMT_VERSION="8.1.1"
+ 
++    fmt_PCDEP=""
+     if test "x$with_external_fmt" = xyes;  then
+           m4_ifdef([PKG_CHECK_MODULES], [
+-          PKG_CHECK_MODULES([FMT], 
+-                            [fmt >= $MIN_FMT_VERSION])],
++              PKG_CHECK_MODULES([FMT], [fmt >= $MIN_FMT_VERSION])
++              fmt_PCDEP="fmt"
++          ],
+           [AC_MSG_ERROR([cannot use flag --with-external-fmt, the 
libsemigroups configure file was created on a system without m4 macros for 
pkg-config available...])])
+     else
+           AC_SUBST(FMT_CFLAGS, ['-I$(srcdir)/extern/fmt-8.1.1/include'])
+     fi
++    AC_SUBST([fmt_PCDEP])
+   fi
+ 
+   dnl The following makes LIBSEMIGROUPS_WITH_INTERNAL_FMT usable in 
Makefile.am
 -- 
 2.38.1
 

Reply via email to