From c4b94f02bd2c4f0b8eb1d3867f4799bb5c7362bd Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Thu, 2 Aug 2018 17:32:37 +0200 Subject: [PATCH] more bugfixes --- glib-formaterror.patch | 16 +++------------- glib-ipmreqsource.patch | 11 +++++++++++ glib-valgrind.patch | 12 ++++++++++++ mingw-glib2.spec | 9 +++++++-- 4 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 glib-ipmreqsource.patch create mode 100644 glib-valgrind.patch diff --git a/glib-formaterror.patch b/glib-formaterror.patch index b7b5e5b..be0acc1 100644 --- a/glib-formaterror.patch +++ b/glib-formaterror.patch @@ -1,22 +1,12 @@ ---- glib-2.57.1/configure.ac.orig 2018-08-02 05:42:37.295076670 +0200 -+++ glib-2.57.1/configure.ac 2018-08-02 06:01:41.458209995 +0200 -@@ -3512,7 +3512,7 @@ - -Werror=declaration-after-statement \ - -Werror=missing-prototypes -Werror=implicit-function-declaration \ - -Werror=pointer-arith -Werror=init-self -Werror=format-security \ -- -Werror=format=2 -Werror=missing-include-dirs]) -+ -Werror=missing-include-dirs]) - ]) - AC_SUBST(GLIB_WARN_CFLAGS) - --- glib-2.57.1/configure.orig 2018-08-02 16:09:46.329046276 +0200 +++ glib-2.57.1/configure 2018-08-02 16:13:29.928093284 +0200 @@ -29652,7 +29652,7 @@ -Werror=declaration-after-statement \ -Werror=missing-prototypes -Werror=implicit-function-declaration \ - -Werror=pointer-arith -Werror=init-self -Werror=format-security \ +- -Werror=pointer-arith -Werror=init-self -Werror=format-security \ - -Werror=format=2 -Werror=missing-include-dirs; do -+ -Werror=missing-include-dirs; do ++ -Werror=pointer-arith -Werror=init-self -Wno-error=format-security \ ++ -Wno-error=format=2 -Werror=missing-include-dirs; do { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5 $as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; } diff --git a/glib-ipmreqsource.patch b/glib-ipmreqsource.patch new file mode 100644 index 0000000..01186a2 --- /dev/null +++ b/glib-ipmreqsource.patch @@ -0,0 +1,11 @@ +--- glib-2.57.1/configure.orig 2018-08-02 16:09:46.329046276 +0200 ++++ glib-2.57.1/configure 2018-08-02 16:13:29.928093284 +0200 +@@ -24131,7 +24131,7 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +- #include ++ #include + + int + main () diff --git a/glib-valgrind.patch b/glib-valgrind.patch new file mode 100644 index 0000000..0636822 --- /dev/null +++ b/glib-valgrind.patch @@ -0,0 +1,12 @@ +--- glib-2.57.1/glib/valgrind.h.xx 2018-08-02 17:29:39.096594952 +0200 ++++ glib-2.57.1/glib/valgrind.h 2018-08-02 17:29:49.478405545 +0200 +@@ -93,6 +93,9 @@ + + + #include ++#if HAVE_STDINT_H ++#include ++#endif + + /* Nb: this file might be included in a file compiled with -ansi. So + we can't use C++ style "//" comments nor the "asm" keyword (instead diff --git a/mingw-glib2.spec b/mingw-glib2.spec index 6f09844..7cdc9c0 100644 --- a/mingw-glib2.spec +++ b/mingw-glib2.spec @@ -53,6 +53,11 @@ Patch5: glib-prefer-constructors-over-DllMain.patch # Our GCC doesn't seem to properly understand %I64i format specifiers Patch6: glib-formaterror.patch +# https://gitlab.gnome.org/GNOME/glib/issues/1472 +Patch7: glib-ipmreqsource.patch + +Patch8: glib-valgrind.patch + %description MinGW Windows Glib2 library. @@ -102,8 +107,8 @@ Static version of the MinGW Windows GLib2 library. %build #GLib can't build static and shared libraries in one go, so we build GLib twice -MINGW_BUILDDIR_SUFFIX=_static %mingw_configure --with-python=%{__python3} --disable-shared --enable-static -MINGW_BUILDDIR_SUFFIX=_shared %mingw_configure --with-python=%{__python3} --disable-static +MINGW_BUILDDIR_SUFFIX=_static %mingw_configure --with-python=%{__python3} --disable-compile-warnings --disable-shared --enable-static +MINGW_BUILDDIR_SUFFIX=_shared %mingw_configure --with-python=%{__python3} --disable-compile-warnings --disable-static MINGW_BUILDDIR_SUFFIX=_static %mingw_make %{?_smp_mflags} V=1 MINGW_BUILDDIR_SUFFIX=_shared %mingw_make %{?_smp_mflags} V=1