update to 2.56.1
This commit is contained in:
parent
1f07a83afa
commit
b5771e1a43
13
00-fix-gdbus-codegen.patch
Normal file
13
00-fix-gdbus-codegen.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/gio/gdbus-2.0/codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py
|
||||
index 9d9099f..1cfe7c1 100755
|
||||
--- a/gio/gdbus-2.0/codegen/codegen_main.py
|
||||
+++ b/gio/gdbus-2.0/codegen/codegen_main.py
|
||||
@@ -209,7 +209,7 @@ def codegen_main():
|
||||
print_error('Using --body requires --output')
|
||||
|
||||
c_file = args.output
|
||||
- header_name = os.path.splitext(c_file)[0] + '.h'
|
||||
+ header_name = os.path.splitext(os.path.basename(c_file))[0] + '.h'
|
||||
|
||||
all_ifaces = []
|
||||
for fname in args.files + args.xml_files:
|
||||
@ -1,34 +0,0 @@
|
||||
From c36872f048824248ff8348eaf66134194becaedc Mon Sep 17 00:00:00 2001
|
||||
From: Erik van Pienbroek <epienbro@fedoraproject.org>
|
||||
Date: Thu, 17 Jul 2014 21:24:28 +0200
|
||||
Subject: [PATCH 2/2] GNetworkMonitorBase: don't fail when IPv6 support is
|
||||
unavailable
|
||||
|
||||
---
|
||||
gio/gnetworkmonitorbase.c | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gio/gnetworkmonitorbase.c b/gio/gnetworkmonitorbase.c
|
||||
index f0af804..32ffc74 100644
|
||||
--- a/gio/gnetworkmonitorbase.c
|
||||
+++ b/gio/gnetworkmonitorbase.c
|
||||
@@ -100,8 +100,14 @@ g_network_monitor_base_constructed (GObject *object)
|
||||
g_object_unref (mask);
|
||||
|
||||
mask = g_inet_address_mask_new_from_string ("::/0", NULL);
|
||||
- g_network_monitor_base_add_network (monitor, mask);
|
||||
- g_object_unref (mask);
|
||||
+ if (mask)
|
||||
+ {
|
||||
+ /* On some environments (for example Windows without IPv6 support
|
||||
+ * enabled) the string "::/0" can't be processed and causes
|
||||
+ * g_inet_address_mask_new_from_string to return NULL */
|
||||
+ g_network_monitor_base_add_network (monitor, mask);
|
||||
+ g_object_unref (mask);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.0.1
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
%global __python %{__python3}
|
||||
|
||||
Name: mingw-glib2
|
||||
Version: 2.54.1
|
||||
Release: 2%{?dist}
|
||||
Version: 2.56.1
|
||||
Release: 1%{?dist}
|
||||
Summary: MinGW Windows GLib2 library
|
||||
|
||||
License: LGPLv2+
|
||||
@ -40,6 +40,10 @@ BuildRequires: gettext
|
||||
BuildRequires: glib2-devel >= 2.45.3
|
||||
BuildRequires: python3-devel
|
||||
|
||||
# Include upstream patch to fix gdbus-codegen when used with meson 0.46
|
||||
# https://gitlab.gnome.org/GNOME/glib/commit/cd1f82d8fc741a2203582c12cc21b4dacf7e1872
|
||||
Patch0: 00-fix-gdbus-codegen.patch
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=674214
|
||||
Patch1: 0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
|
||||
|
||||
@ -50,10 +54,6 @@ Patch1: 0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=698118
|
||||
Patch5: glib-prefer-constructors-over-DllMain.patch
|
||||
|
||||
# Don't segfault when IPv6 support is unavailable
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=733338
|
||||
Patch8: 0002-GNetworkMonitorBase-don-t-fail-when-IPv6-support-is-.patch
|
||||
|
||||
%description
|
||||
MinGW Windows Glib2 library.
|
||||
|
||||
@ -97,9 +97,9 @@ Static version of the MinGW Windows GLib2 library.
|
||||
|
||||
%prep
|
||||
%setup -q -n glib-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch5 -p1
|
||||
%patch8 -p1
|
||||
|
||||
%build
|
||||
#GLib can't build static and shared libraries in one go, so we build GLib twice
|
||||
@ -283,6 +283,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon May 28 2018 Thomas Sailer <t.sailer@alumni.ethz.ch> - 2.56.1-1
|
||||
- Update to 2.56.1
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.54.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (glib-2.54.1.tar.xz) = 2971feede03540f5cd2b4bd60b0c3fcbd5ad95ba96d07f6e6d3f4a6b90c31555e52f3480b51976574642fd5ab99dd557061ee5db1a1855fc601297cd74a8f1a8
|
||||
SHA512 (glib-2.56.1.tar.xz) = 7e96cc23f3fa42a41b1974ae8fa2a7b123449643f265763d464620afcb011668e2de013ed2a6e5f13b6bd1bf3ab8eab43c05bf4a8ee0d99b7808767ab4fa69f4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user