Compare commits

..

No commits in common. "factory" and "factory" have entirely different histories.

3 changed files with 5 additions and 40 deletions

View File

@ -1,13 +1,3 @@
-------------------------------------------------------------------
Wed Jul 24 13:48:02 UTC 2024 - Martin Jambor <mjambor@suse.com>
- Add gnucobol-3.1.2-C99.diff to add missing includes of
libxml/parser.h which cause GCC 14 to emit compiler error rather
than a warning.
- Add -Wno-error=incompatible-pointer-types to optflags so that GCC 14
can compile test 0987 without failing with an error.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 15 18:11:27 UTC 2023 - Sarah Kriesch <sarah.kriesch@opensuse.org> Sat Jul 15 18:11:27 UTC 2023 - Sarah Kriesch <sarah.kriesch@opensuse.org>

View File

@ -1,7 +1,7 @@
# #
# spec file for package gnu-cobol # spec file for package gnu-cobol
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -30,8 +30,6 @@ Source0: https://sourceforge.net/projects/open-cobol/files/gnu-cobol/%{_m
Source1: https://sourceforge.net/projects/open-cobol/files/gnu-cobol/%{_mver}/gnucobol-%{version}.tar.xz.sig Source1: https://sourceforge.net/projects/open-cobol/files/gnu-cobol/%{_mver}/gnucobol-%{version}.tar.xz.sig
# PATCH-FIX-UPSTREAM fix_test_698.patch -- see https://sourceforge.net/p/gnucobol/bugs/695/ # PATCH-FIX-UPSTREAM fix_test_698.patch -- see https://sourceforge.net/p/gnucobol/bugs/695/
Patch1: fix_test_698.patch Patch1: fix_test_698.patch
# PATCH-FIX-UPSTREAM gnucobol-3.1.2-C99.diff -- Missing include which causes compilation errors with GCC 14
Patch2: gnucobol-3.1.2-C99.diff
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: db-devel BuildRequires: db-devel
BuildRequires: dos2unix BuildRequires: dos2unix
@ -43,8 +41,8 @@ BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(ncurses) >= 5.4 BuildRequires: pkgconfig(ncurses) >= 5.4
Requires(post): %{install_info_prereq} Requires(post): %{install_info_prereq}
Requires(preun): %{install_info_prereq} Requires(preun): %{install_info_prereq}
Provides: libcob-devel = %{version}
Provides: opencobol = %{version} Provides: opencobol = %{version}
Provides: libcob-devel = %{version}
Obsoletes: libcob-devel <= 3.1.2 Obsoletes: libcob-devel <= 3.1.2
%description %description
@ -52,6 +50,7 @@ GnuCOBOL (formerly OpenCOBOL) is a COBOL compiler.
cobc translates COBOL to executable using intermediate C sources, cobc translates COBOL to executable using intermediate C sources,
providing full access to nearly all C libraries. providing full access to nearly all C libraries.
%package -n libcob%{sover} %package -n libcob%{sover}
Summary: GnuCOBOL shared library Summary: GnuCOBOL shared library
License: LGPL-3.0-or-later License: LGPL-3.0-or-later
@ -62,12 +61,11 @@ GnuCOBOL (formerly OpenCOBOL) is a COBOL compiler.
cobc translates COBOL to executable using intermediate C sources, cobc translates COBOL to executable using intermediate C sources,
providing full access to nearly all C libraries. providing full access to nearly all C libraries.
%prep %prep
%autosetup -p1 -n gnucobol-%{version} %autosetup -p1 -n gnucobol-%{version}
%build %build
%global optflags %{optflags} -Wno-error=incompatible-pointer-types
%configure \ %configure \
--enable-hardening \ --enable-hardening \
--enable-static=no --enable-static=no
@ -110,4 +108,5 @@ find %{buildroot} -type f -name "*.la" -delete -print
%license COPYING.LESSER %license COPYING.LESSER
%{_libdir}/libcob.so.%{sover}* %{_libdir}/libcob.so.%{sover}*
%changelog %changelog

View File

@ -1,24 +0,0 @@
Index: gnucobol-3.1.2/libcob/common.c
===================================================================
--- gnucobol-3.1.2.orig/libcob/common.c
+++ gnucobol-3.1.2/libcob/common.c
@@ -111,6 +111,7 @@
#endif
#if defined (WITH_XML2)
+#include <libxml/parser.h>
#include <libxml/xmlversion.h>
#include <libxml/xmlwriter.h>
#endif
Index: gnucobol-3.1.2/libcob/mlio.c
===================================================================
--- gnucobol-3.1.2.orig/libcob/mlio.c
+++ gnucobol-3.1.2/libcob/mlio.c
@@ -35,6 +35,7 @@
#include <libxml/xmlversion.h>
#include <libxml/xmlwriter.h>
#include <libxml/uri.h>
+#include <libxml/parser.h>
#endif
#if defined (WITH_CJSON)