Summary of changes:
dc9652d... Drop two patches that have been fixed upstream (*)
(*) This commit already existed in another branch; no separate mail sent
commit dc9652df2681e2707601423c07d519eabe72c644
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Fri Mar 29 15:18:27 2013 +0100
Drop two patches that have been fixed upstream
...rt-a-DBus-server-when-built-as-static-lib.patch | 58 --------------------
glib-build-dbus-proxy-testcase-only-on-unix.patch | 36 ------------
mingw-glib2.spec | 18 ++-----
3 files changed, 4 insertions(+), 108 deletions(-)
---
diff --git a/mingw-glib2.spec b/mingw-glib2.spec
index a101b12..bb75e96 100644
--- a/mingw-glib2.spec
+++ b/mingw-glib2.spec
@@ -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(a)gmail.com> - 2.36.0-2
+- Drop two patches that have been fixed upstream
+
* Tue Mar 26 2013 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 2.36.0-1
- Update to 2.36.0
Erik van Pienbrok wrote on Sun Mar 24 16:03:07 UTC 2013
>> I can fix the glib case, but for libgsf please file a bug at
>> http://redhat.bugzilla.com against the mingw-libgsf component so that
>> its package maintainer can fix it.
>
>An updated mingw-glib2 package which shouldn't have a DllMain in the
>static library any more can be found at
>http://koji.fedoraproject.org/koji/buildinfo?buildID=405366
>Can you try if this resolves the issue for you?
I have used your patch to successfully compile and link against a
static copy of glib, so it appears to have fixed the problem. I did
not manage to use the build you provided because of a missing symbol
(__chkstk_ms), but this is probably because I have not installed all
the Fedora packages this one depends on and am using older libraries.
(I think that __chkstk_ms was introduced in a newer version of
libgcc.)
I will raise a bug for mingw-libgsf as you suggest.
Product: Fedora
https://bugzilla.redhat.com/show_bug.cgi?id=851683
--- Comment #7 from greg.hellings(a)gmail.com ---
New Package SCM Request
=======================
Package Name: mingw-GConf2
Short Description: MinGW Windows port of the GNOME 2.x Desktop Configuration
Database System
Owners: greghellings
Branches: f18 f19
InitialCC:
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=vNeaLtIMGs&a=cc_unsubscribe