diff --git a/glib-formaterror.patch b/glib-formaterror.patch index ecba4f7..b7b5e5b 100644 --- a/glib-formaterror.patch +++ b/glib-formaterror.patch @@ -9,3 +9,14 @@ ]) 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=format=2 -Werror=missing-include-dirs; do ++ -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-prefer-constructors-over-DllMain.patch b/glib-prefer-constructors-over-DllMain.patch index 01da75a..bd44bc8 100644 --- a/glib-prefer-constructors-over-DllMain.patch +++ b/glib-prefer-constructors-over-DllMain.patch @@ -13,10 +13,9 @@ versions using #pragma) 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/glib/glib-init.c b/glib/glib-init.c -index 0032ee8..dd6ccbf 100644 ---- a/glib/glib-init.c -+++ b/glib/glib-init.c -@@ -223,12 +223,14 @@ glib_init (void) +--- a/glib/glib-init.c 2018-08-02 16:09:46.277047195 +0200 ++++ b/glib/glib-init.c 2018-08-02 16:10:23.617387056 +0200 +@@ -275,12 +275,14 @@ #if defined (G_OS_WIN32) @@ -33,7 +32,7 @@ index 0032ee8..dd6ccbf 100644 BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, -@@ -238,11 +240,6 @@ DllMain (HINSTANCE hinstDLL, +@@ -290,11 +292,6 @@ { case DLL_PROCESS_ATTACH: glib_dll = hinstDLL; @@ -45,7 +44,7 @@ index 0032ee8..dd6ccbf 100644 break; case DLL_THREAD_DETACH: -@@ -259,7 +256,10 @@ DllMain (HINSTANCE hinstDLL, +@@ -318,7 +315,10 @@ return TRUE; } @@ -57,7 +56,7 @@ index 0032ee8..dd6ccbf 100644 #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(glib_init_ctor) -@@ -269,6 +269,12 @@ G_DEFINE_CONSTRUCTOR(glib_init_ctor) +@@ -328,6 +328,12 @@ static void glib_init_ctor (void) { @@ -70,5 +69,3 @@ index 0032ee8..dd6ccbf 100644 glib_init (); } --- -1.8.2 diff --git a/mingw-glib2.spec b/mingw-glib2.spec index 4ceeceb..6f09844 100644 --- a/mingw-glib2.spec +++ b/mingw-glib2.spec @@ -39,8 +39,6 @@ BuildRequires: gettext # Native version required for glib-genmarshal BuildRequires: glib2-devel >= 2.45.3 BuildRequires: python3-devel -BuildRequires: automake -BuildRequires: autoconf # https://bugzilla.gnome.org/show_bug.cgi?id=674214 Patch1: 0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch