Drop two patches that have been fixed upstream
This commit is contained in:
Kalev Lember
parent
6005f8bc7e
commit
dc9652df26
@ -1,58 +0,0 @@
|
||||
From b3ffcafba67b01f6dcecb2525dca1c51bf218efa Mon Sep 17 00:00:00 2001
|
||||
From: Erik van Pienbroek <epienbro@fedoraproject.org>
|
||||
Date: Mon, 27 Aug 2012 22:57:01 +0200
|
||||
Subject: [PATCH] Don't start a DBus server when built as static lib
|
||||
|
||||
The new Win32 DBus server code which was recently introduced works
|
||||
by retrieving the path of the gio DLL and using rundll32.exe to
|
||||
create a new process which starts a DBus server using the gio DLL.
|
||||
|
||||
This doesn't work when GLib is built as a static library as there is no
|
||||
gio DLL available in that case. Therefore the code which tries to start
|
||||
a DBus server using the above steps doesn't have to be executed as it
|
||||
will always fail.
|
||||
|
||||
This commit makes sure that no attempt is done to start a DBus server when
|
||||
using a static compiled GLib and that a proper error message is automatically
|
||||
returned to the caller. This also fixes a compilation failure which occurs
|
||||
when GLib is compiled as static library
|
||||
---
|
||||
gio/gdbusaddress.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
|
||||
index fac22b7..8f57997 100644
|
||||
--- a/gio/gdbusaddress.c
|
||||
+++ b/gio/gdbusaddress.c
|
||||
@@ -1354,7 +1354,6 @@ get_session_address_dbus_launch (GError **error)
|
||||
{
|
||||
HANDLE autolaunch_mutex, init_mutex;
|
||||
char *address = NULL;
|
||||
- wchar_t gio_path[MAX_PATH+1+200];
|
||||
|
||||
autolaunch_mutex = acquire_mutex (DBUS_AUTOLAUNCH_MUTEX);
|
||||
|
||||
@@ -1365,8 +1364,11 @@ get_session_address_dbus_launch (GError **error)
|
||||
|
||||
release_mutex (init_mutex);
|
||||
|
||||
+#ifdef DLL_EXPORT
|
||||
+
|
||||
if (address == NULL)
|
||||
{
|
||||
+ wchar_t gio_path[MAX_PATH+1+200];
|
||||
gio_path[MAX_PATH] = 0;
|
||||
if (GetModuleFileNameW (_g_io_win32_get_module (), gio_path, MAX_PATH))
|
||||
{
|
||||
@@ -1403,6 +1405,8 @@ get_session_address_dbus_launch (GError **error)
|
||||
}
|
||||
}
|
||||
|
||||
+#endif
|
||||
+
|
||||
release_mutex (autolaunch_mutex);
|
||||
|
||||
if (address == NULL)
|
||||
--
|
||||
1.7.11.4
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From db0f0197a2e1740ec2e13cf254d0e6a968bf6db4 Mon Sep 17 00:00:00 2001
|
||||
From: "Arnel A. Borja" <kyoushuu@yahoo.com>
|
||||
Date: Thu, 13 Sep 2012 22:20:49 +0800
|
||||
Subject: [PATCH 3/4] gio/tests: Compile gdbus-proxy only when target is Unix
|
||||
|
||||
---
|
||||
gio/tests/Makefile.am | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
|
||||
index e352383..68ebcf0 100644
|
||||
--- a/gio/tests/Makefile.am
|
||||
+++ b/gio/tests/Makefile.am
|
||||
@@ -71,7 +71,6 @@ TEST_PROGS += \
|
||||
gdbus-connection-loss \
|
||||
gdbus-connection-slow \
|
||||
gdbus-names \
|
||||
- gdbus-proxy \
|
||||
gdbus-proxy-threads \
|
||||
gdbus-proxy-well-known-name \
|
||||
gdbus-introspection \
|
||||
@@ -81,6 +80,12 @@ TEST_PROGS += \
|
||||
gdbus-bz627724 \
|
||||
gmenumodel \
|
||||
$(NULL)
|
||||
+
|
||||
+if OS_UNIX
|
||||
+TEST_PROGS += \
|
||||
+ gdbus-proxy \
|
||||
+ $(NULL)
|
||||
+endif
|
||||
endif
|
||||
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
Name: mingw-glib2
|
||||
Version: 2.36.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: MinGW Windows GLib2 library
|
||||
|
||||
License: LGPLv2+
|
||||
@ -35,18 +35,9 @@ BuildRequires: gettext
|
||||
# Native version required for glib-genmarshal
|
||||
BuildRequires: glib2-devel >= 2.31.20
|
||||
|
||||
# Needed for patch2
|
||||
BuildRequires: autoconf automake libtool
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=675516
|
||||
Patch0: 0001-Don-t-start-a-DBus-server-when-built-as-static-lib.patch
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=674214
|
||||
Patch1: 0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=684145
|
||||
Patch2: glib-build-dbus-proxy-testcase-only-on-unix.patch
|
||||
|
||||
# By default g_log_default_handler always assumes that stdout and stderr
|
||||
# are file descriptors 1 and 2. On Win32 this isn't always the case as the
|
||||
# win32 API function AttachConsole can be used to dynamically attach GUI
|
||||
@ -104,15 +95,11 @@ Static version of the MinGW Windows GLib2 library.
|
||||
|
||||
%prep
|
||||
%setup -q -n glib-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p0
|
||||
%patch4 -p0
|
||||
%patch5 -p0
|
||||
|
||||
autoreconf -i --force
|
||||
|
||||
|
||||
%build
|
||||
#GLib can't build static and shared libraries in one go, so we build GLib twice
|
||||
@ -290,6 +277,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Mar 29 2013 Kalev Lember <kalevlember@gmail.com> - 2.36.0-2
|
||||
- Drop two patches that have been fixed upstream
|
||||
|
||||
* Tue Mar 26 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.36.0-1
|
||||
- Update to 2.36.0
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user