From e79dc168919277e33a43321096776946369f9b88 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sep 09 2019 20:41:51 +0000 Subject: Fix building in C99 mode --- diff --git a/gtk+-1.2.10-c99.patch b/gtk+-1.2.10-c99.patch new file mode 100644 index 0000000..0005b6f --- /dev/null +++ b/gtk+-1.2.10-c99.patch @@ -0,0 +1,66 @@ +diff -ur gtk+-1.2.10.orig/configure gtk+-1.2.10/configure +--- gtk+-1.2.10.orig/configure 2019-09-09 21:49:43.602211637 +0200 ++++ gtk+-1.2.10/configure 2019-09-09 22:40:10.672294726 +0200 +@@ -1151,7 +1151,7 @@ + #line 1152 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:1157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +@@ -1867,7 +1867,7 @@ + #line 1868 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +@@ -2457,6 +2457,7 @@ + #line 2458 "configure" + #include "confdefs.h" + #include ++#include + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) + #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +@@ -2575,7 +2576,7 @@ + #include "confdefs.h" + + int main() { +-} $ac_kw foo() { ++} $ac_kw int foo() { + ; return 0; } + EOF + if { (eval echo configure:2582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +@@ -4689,6 +4690,8 @@ + #line 4690 "configure" + #include "confdefs.h" + ++extern int ${x_direct_test_function}(); ++ + int main() { + ${x_direct_test_function}() + ; return 0; } +@@ -6008,6 +6011,7 @@ + #line 6009 "configure" + #include "confdefs.h" + #include ++#include + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) + #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +diff -ur gtk+-1.2.10.orig/gdk/gdkinput.c gtk+-1.2.10/gdk/gdkinput.c +--- gtk+-1.2.10.orig/gdk/gdkinput.c 2000-01-27 22:10:44.000000000 +0100 ++++ gtk+-1.2.10/gdk/gdkinput.c 2019-09-09 22:37:05.956183052 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include "config.h" + #include "gdk.h" + #include "gdkx.h" diff --git a/gtk+.spec b/gtk+.spec index 54e3154..7109d91 100644 --- a/gtk+.spec +++ b/gtk+.spec @@ -2,7 +2,7 @@ Summary: The GIMP ToolKit Name: gtk+ Epoch: 1 Version: 1.2.10 -Release: 91%{?dist} +Release: 92%{?dist} License: LGPLv2+ URL: http://www.gtk.org/ Source0: http://download.gimp.org/pub/gtk/v1.2/gtk+-%{version}.tar.gz @@ -74,6 +74,8 @@ Patch35: gtk+-1.2.10-unused-deps.patch Patch36: gtk+-1.2.10-autotools.patch # Use format strings properly Patch37: gtk+-1.2.10-format.patch +# C99 compiler support. +Patch38: gtk+-1.2.10-c99.patch BuildRequires: coreutils BuildRequires: gettext @@ -140,6 +142,7 @@ Libraries, header files and documentation for developing GTK+ %patch35 -p1 -b .unused-deps %patch36 -b .autotools %patch37 -b .format +%patch38 -p1 -b .c99 # The original config.{guess,sub} do not work on x86_64, aarch64 etc. # @@ -237,6 +240,9 @@ make check LIBTOOL=/usr/bin/libtool %{_mandir}/man1/gtk-config.1* %changelog +* Mon Sep 9 2019 Florian Weimer - 1:1.2.10-92 +- Fix building in C99 mode + * Thu Jul 25 2019 Fedora Release Engineering - 1:1.2.10-91 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild