[mingw-glib2] Drop two patches that have been fixed upstream
by Kalev Lember
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
11 years, 1 month
[mingw-cairo/f19] Update to 1.12.14
by Kalev Lember
Summary of changes:
5058e3a... Update to 1.12.14 (*)
(*) This commit already existed in another branch; no separate mail sent
11 years, 1 month
[mingw-cairo] Update to 1.12.14
by Kalev Lember
commit 5058e3a71c9348025f60878d3c735fc2738e6558
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Fri Mar 29 15:21:06 2013 +0100
Update to 1.12.14
.gitignore | 1 +
mingw-cairo.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 44dd47f..2ab790f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ cairo-1.8.10.tar.gz
/cairo-1.12.6.tar.xz
/cairo-1.12.8.tar.xz
/cairo-1.12.10.tar.xz
+/cairo-1.12.14.tar.xz
diff --git a/mingw-cairo.spec b/mingw-cairo.spec
index 47af0d6..053ccf7 100644
--- a/mingw-cairo.spec
+++ b/mingw-cairo.spec
@@ -1,8 +1,8 @@
%?mingw_package_header
Name: mingw-cairo
-Version: 1.12.10
-Release: 2%{?dist}
+Version: 1.12.14
+Release: 1%{?dist}
Summary: MinGW Windows Cairo library
License: LGPLv2 or MPLv1.1
@@ -209,6 +209,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
+* Fri Mar 29 2013 Kalev Lember <kalevlember(a)gmail.com> - 1.12.14-1
+- Update to 1.12.14
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.12.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 472932c..38df54c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bddd5c5b734ab4b9683eb0ba363070d4 cairo-1.12.10.tar.xz
+27b634113d0f52152d60ae8e2ec7daa7 cairo-1.12.14.tar.xz
11 years, 1 month
Re: "DllMain" function in static libraries (mingw32-glib2-static)
by Gavin Smith
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.
11 years, 1 month