Patched for rhbz#2105259
This commit is contained in:
parent
3993435779
commit
4bab2fb98b
|
@ -0,0 +1,36 @@
|
||||||
|
From c0570bfeb2d7e0a6a6de1f257cf28e7f3cac8739 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sam James <sam@gentoo.org>
|
||||||
|
Date: Sun, 12 Jun 2022 11:23:59 +0100
|
||||||
|
Subject: [PATCH] CMake: fix time check typo (fixes build failure w/ GCC 12)
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Without this fixed check, we get a build failure with GCC 12:
|
||||||
|
```
|
||||||
|
/var/tmp/portage/sci-chemistry/openbabel-3.1.1_p20210225/work/openbabel-08e23f39b0cc39b4eebd937a5a2ffc1a7bac3e1b/include/openbabel/obutil.h:65:14: error: ‘clock’ was not declared in this scope; did you mean ‘clock_t’?
|
||||||
|
65 | start= clock();
|
||||||
|
| ^~~~~
|
||||||
|
| clock_t
|
||||||
|
```
|
||||||
|
|
||||||
|
Bug: https://bugs.gentoo.org/851510
|
||||||
|
---
|
||||||
|
src/config.h.cmake | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/config.h.cmake b/src/config.h.cmake
|
||||||
|
index 1c59c67699..26e5dde94f 100644
|
||||||
|
--- a/src/config.h.cmake
|
||||||
|
+++ b/src/config.h.cmake
|
||||||
|
@@ -182,8 +182,8 @@
|
||||||
|
#define OB_MODULE_PATH "@OB_MODULE_PATH@"
|
||||||
|
|
||||||
|
#ifndef TIME_WITH_SYS_TIME
|
||||||
|
- #ifdef HAVE_SYS_TIME
|
||||||
|
- #ifdef HAVE_TIME
|
||||||
|
+ #ifdef HAVE_SYS_TIME_H
|
||||||
|
+ #ifdef HAVE_TIME_H
|
||||||
|
#define TIME_WITH_SYS_TIME 1
|
||||||
|
#else
|
||||||
|
#define TIME_WITH_SYS_TIME 0
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
Name: openbabel
|
Name: openbabel
|
||||||
Version: 3.1.1
|
Version: 3.1.1
|
||||||
Release: 8%{?dist}
|
Release: 9%{?dist}
|
||||||
Summary: Chemistry software file format converter
|
Summary: Chemistry software file format converter
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: https://openbabel.org/
|
URL: https://openbabel.org/
|
||||||
|
@ -17,31 +17,32 @@ Source2: openbabel-inchi-license-lgpl-2.1.txt
|
||||||
Patch0: %{name}-perl.patch
|
Patch0: %{name}-perl.patch
|
||||||
|
|
||||||
# fix plugin directory location (#680292, patch by lg)
|
# fix plugin directory location (#680292, patch by lg)
|
||||||
Patch1: openbabel-plugindir.patch
|
Patch1: %{name}-plugindir.patch
|
||||||
|
|
||||||
# fix SWIG_init even when not using swig (#772149)
|
# fix SWIG_init even when not using swig (#772149)
|
||||||
Patch2: openbabel-noswig-rubymethod.patch
|
Patch2: %{name}-noswig-rubymethod.patch
|
||||||
|
|
||||||
# On F-17, directory for C ruby files changed to use vendorarch directory
|
# On F-17, directory for C ruby files changed to use vendorarch directory
|
||||||
Patch3: openbabel-ruby19-vendorarch.patch
|
Patch3: %{name}-ruby19-vendorarch.patch
|
||||||
|
|
||||||
# temporarily disable some tests on:
|
# temporarily disable some tests on:
|
||||||
# - ppc64 and s390(x) to unblock other builds (#1108103)
|
# - ppc64 and s390(x) to unblock other builds (#1108103)
|
||||||
# - ARM (#1094491)
|
# - ARM (#1094491)
|
||||||
# - aarch64 (#1094513)
|
# - aarch64 (#1094513)
|
||||||
# Upstream bugs: https://sourceforge.net/p/openbabel/bugs/927/ https://sourceforge.net/p/openbabel/bugs/945/
|
# Upstream bugs: https://sourceforge.net/p/openbabel/bugs/927/ https://sourceforge.net/p/openbabel/bugs/945/
|
||||||
Patch4: openbabel-disable-tests.patch
|
Patch4: %{name}-disable-tests.patch
|
||||||
|
|
||||||
# Fix path to libdir in .pc file
|
# Fix path to libdir in .pc file
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1669664
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1669664
|
||||||
Patch5: openbabel-fix-libdir-in-pkgconfig.patch
|
Patch5: %{name}-fix-libdir-in-pkgconfig.patch
|
||||||
|
|
||||||
# Math 4 test is failing on s390x only
|
# Math 4 test is failing on s390x only
|
||||||
Patch6: openbabel-disable-tests-s390x.patch
|
Patch6: %{name}-disable-tests-s390x.patch
|
||||||
|
|
||||||
Patch7: openbabel-3.1.1-fix_bug2223.patch
|
Patch7: %{name}-3.1.1-fix_bug2223.patch
|
||||||
Patch8: openbabel-3.1.1-fix_bug2217.patch
|
Patch8: %{name}-3.1.1-fix_bug2217.patch
|
||||||
Patch9: openbabel-3.1.1-bug2378.patch
|
Patch9: %{name}-3.1.1-bug2378.patch
|
||||||
|
Patch10: %{name}-3.1.1-bug2493.patch
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
%if 0%{?el7}
|
%if 0%{?el7}
|
||||||
|
@ -168,6 +169,7 @@ Ruby wrapper for the Open Babel library.
|
||||||
%patch7 -p1 -b .backup
|
%patch7 -p1 -b .backup
|
||||||
%patch8 -p1 -b .backup
|
%patch8 -p1 -b .backup
|
||||||
%patch9 -p1 -b .backup
|
%patch9 -p1 -b .backup
|
||||||
|
%patch10 -p1 -b .backup
|
||||||
|
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
rm -rf src/formats/libinchi
|
rm -rf src/formats/libinchi
|
||||||
|
@ -317,6 +319,9 @@ ctest3 -j1 --force-new-ctest-process
|
||||||
%{ruby_vendorarchdir}/openbabel.so
|
%{ruby_vendorarchdir}/openbabel.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 08 2022 Antonio Trande <sagitter@fedoraproject.org> - 3.1.1-9
|
||||||
|
- Patched for rhbz#2105259
|
||||||
|
|
||||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.1.1-8
|
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.1.1-8
|
||||||
- Rebuilt for Python 3.11
|
- Rebuilt for Python 3.11
|
||||||
|
|
||||||
|
@ -338,9 +343,9 @@ ctest3 -j1 --force-new-ctest-process
|
||||||
* Wed Sep 22 2021 Antonio Trande <sagitter@fedoraproject.org> - 3.1.1-2
|
* Wed Sep 22 2021 Antonio Trande <sagitter@fedoraproject.org> - 3.1.1-2
|
||||||
- Fix patches order
|
- Fix patches order
|
||||||
|
|
||||||
* Thu Sep 02 2021 Antonio Trande <sagitter@fedoraproject.org> - 3.1.1-1
|
|
||||||
- Release 3.1.1
|
- Release 3.1.1
|
||||||
|
|
||||||
|
* Thu Sep 02 2021 Antonio Trande <sagitter@fedoraproject.org> - 3.1.1-1
|
||||||
* Wed Sep 01 2021 Antonio Trande <sagitter@fedoraproject.org> - 2.4.1-39
|
* Wed Sep 01 2021 Antonio Trande <sagitter@fedoraproject.org> - 2.4.1-39
|
||||||
- Install license file and some release documentation
|
- Install license file and some release documentation
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue