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

Update to 2.46.0

Browse Source
This commit is contained in:
Kalev Lember 2015-09-22 23:40:47 +02:00
parent 3c56a7c3b4
commit c5f600d20d
4 changed files with 5 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-gdbus-Add-a-missing-include.patch
View File

@ -1,26 +0,0 @@
From 02f9e84709b4e4756f3e512dede3430f3538fbf5 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Sat, 22 Aug 2015 23:13:33 +0200
Subject: [PATCH] gdbus: Add a missing include
This fixes the build on non-unix platforms, such as win32 where
gunixfdlist.h is not included.
---
gio/gdbusmethodinvocation.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c
index c5224be..91a7e39 100644
--- a/gio/gdbusmethodinvocation.c
+++ b/gio/gdbusmethodinvocation.c
@@ -29,6 +29,7 @@
#include "gdbusintrospection.h"
#include "gdbuserror.h"
#include "gdbusprivate.h"
+#include "gioerror.h"
#ifdef G_OS_UNIX
#include "gunixfdlist.h"
--
2.5.0

38
glib-win64-compile.patch
View File

@ -1,41 +1,3 @@
--- gio/gwin32appinfo.c.orig 2015-07-02 15:24:05.477775270 +0200
+++ gio/gwin32appinfo.c 2015-07-02 15:41:07.799486302 +0200
@@ -3095,7 +3095,7 @@
}
}
- g_debug ("%u undefhandled extensions\n", unhandled_exts);
+ g_debug ("%" G_GSIZE_FORMAT "u undefhandled extensions\n", unhandled_exts);
unhandled_exts= 0;
g_hash_table_iter_init (&sup_iter, extensions);
while (g_hash_table_iter_next (&sup_iter,
@@ -3109,7 +3109,7 @@
unhandled_exts += 1;
}
}
- g_debug ("%u undefhandled extensions\n", unhandled_exts);
+ g_debug ("%" G_GSIZE_FORMAT "u undefhandled extensions\n", unhandled_exts);
}
static void
@@ -3382,7 +3382,7 @@
static void
g_win32_appinfo_init (void)
{
- static gboolean initialized = FALSE;
+ static gsize initialized;
if (g_once_init_enter (&initialized))
{
@@ -3415,7 +3415,7 @@
update_registry_data ();
- g_once_init_leave (&initialized, TRUE);
+ g_once_init_leave (&initialized, 1);
}
if ((url_associations_key && g_win32_registry_key_has_changed (url_associations_key)) ||
--- gio/glocalfile.c.orig 2015-07-02 15:56:37.156751108 +0200
+++ gio/glocalfile.c 2015-07-02 15:56:58.187344740 +0200
@@ -2682,7 +2682,7 @@

9
mingw-glib2.spec
View File

@ -1,7 +1,7 @@
%?mingw_package_header
Name: mingw-glib2
Version: 2.45.6
Version: 2.46.0
Release: 1%{?dist}
Summary: MinGW Windows GLib2 library
@ -35,9 +35,6 @@ BuildRequires: gettext
# Native version required for glib-genmarshal
BuildRequires: glib2-devel >= 2.45.3
# Backported from upstream
Patch0: 0001-gdbus-Add-a-missing-include.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=674214
Patch1: 0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
@ -104,7 +101,6 @@ Static version of the MinGW Windows GLib2 library.
%prep
%setup -q -n glib-%{version}
%patch0 -p1
%patch1 -p1
%patch3 -p0
%patch5 -p1
@ -289,6 +285,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
* Tue Sep 22 2015 Kalev Lember <klember@redhat.com> - 2.46.0-1
- Update to 2.46.0
* Sat Aug 22 2015 Kalev Lember <klember@redhat.com> - 2.45.6-1
- Update to 2.45.6

2
sources
View File

@ -1 +1 @@
d6c3aef029c872c0b21109ec01efadec glib-2.45.6.tar.xz
6d58f9d70893a63e75c2b7df79375ee7 glib-2.46.0.tar.xz