rpms/mingw-glib2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

more bugfixes

Browse Source
This commit is contained in:
Thomas Sailer 2018-08-02 17:32:37 +02:00
parent fe68801d11
commit c4b94f02bd
4 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glib-formaterror.patch
View File

@ -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; }

11
glib-ipmreqsource.patch Normal file
View File

@ -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 <netinet/in.h>
+ #include <ws2tcpip.h>
int
main ()

12
glib-valgrind.patch Normal file
View File

@ -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 <stdarg.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#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

9
mingw-glib2.spec
View File

@ -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