From f7839542bf4d1fb9c0a4681063680f2269fa42ce Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 27 Apr 2023 20:42:50 +0200
Subject: [PATCH] Port configure script to C99

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
---
 libgsf-configure-c99.patch | 33 +++++++++++++++++++++++++++++++++
 libgsf.spec                |  8 ++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 libgsf-configure-c99.patch

diff --git a/libgsf-configure-c99.patch b/libgsf-configure-c99.patch
new file mode 100644
index 0000000..6e16d01
--- /dev/null
+++ b/libgsf-configure-c99.patch
@@ -0,0 +1,33 @@
+configure.ac: Avoid implicit int in libbz2 probe
+
+Otherwise, this probe will always fail with future compilers, which
+are likely not to support implict ints by default.
+
+Submitted upstream: <https://gitlab.gnome.org/GNOME/libgsf/-/merge_requests/13>
+
+diff --git a/configure b/configure
+index ea7b0390d19dc958..ad99b48b7b9466f9 100755
+--- a/configure
++++ b/configure
+@@ -16658,7 +16658,7 @@ $as_echo_n "checking usable libbz2... " >&6; }
+ 	  #undef VERSION
+ 	  #undef HAVE_STDLIB_H
+ 	  #include <bzlib.h>
+-          main ()
++          int main (void)
+           {
+             return BZ2_bzDecompressInit (NULL, 0, 0);
+           }
+diff --git a/configure.ac b/configure.ac
+index a5847bebe7889283..327ff52075c559fe 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -428,7 +428,7 @@ if test "x$test_bz2" = xtrue ; then
+ 	  #undef VERSION
+ 	  #undef HAVE_STDLIB_H
+ 	  #include <bzlib.h>
+-          main ()
++          int main (void)
+           {
+             return BZ2_bzDecompressInit (NULL, 0, 0);
+           }
diff --git a/libgsf.spec b/libgsf.spec
index ff11c88..9127def 100644
--- a/libgsf.spec
+++ b/libgsf.spec
@@ -1,9 +1,10 @@
 Summary: GNOME Structured File library
 Name: libgsf
 Version: 1.14.50
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL-2.1-only
 Source: https://download.gnome.org/sources/%{name}/1.14/%{name}-%{version}.tar.xz
+Patch0: libgsf-configure-c99.patch
 URL: http://www.gnome.org/projects/libgsf/
 
 BuildRequires: bzip2-devel
@@ -33,7 +34,7 @@ Libraries, headers, and support files necessary to compile applications using
 libgsf.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %configure --disable-gtk-doc --disable-static --enable-introspection=yes \
@@ -79,6 +80,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_mandir}/man1/gsf-vba-dump.1*
 
 %changelog
+* Thu Apr 27 2023 Florian Weimer <fweimer@redhat.com> - 1.14.50-2
+- Port configure script to C99
+
 * Thu Mar 23 2023 Caolán McNamara <caolanm@redhat.com> 1.14.50-1
 - latest version