[mingw-glib2] Revert unintended ABI break on win64 (RHBZ #951588, GNOME BZ #697879)
by Erik van Pienbroek
commit 1608626aa1e9eaca824545ff14ebb82f4c1e0959
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Mon Apr 15 23:44:37 2013 +0200
Revert unintended ABI break on win64 (RHBZ #951588, GNOME BZ #697879)
glib-commit-b972018.patch | 24 ++++++++++++++++++++++++
mingw-glib2.spec | 13 ++++++++++++-
2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/glib-commit-b972018.patch b/glib-commit-b972018.patch
new file mode 100644
index 0000000..5914926
--- /dev/null
+++ b/glib-commit-b972018.patch
@@ -0,0 +1,24 @@
+From b972018d6c252c4afb1375e5c4e9910e79af2e70 Mon Sep 17 00:00:00 2001
+From: Marc-André Lureau <marcandre.lureau(a)gmail.com>
+Date: Mon, 15 Apr 2013 16:12:50 +0000
+Subject: win32: add back missing _utf8 symbols on x64 builds
+
+The _utf8 functions have been wrongly removed from GLib on x64.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=697879
+---
+diff --git a/glib/gutils.c b/glib/gutils.c
+index 76f6c34..0de954e 100644
+--- a/glib/gutils.c
++++ b/glib/gutils.c
+@@ -2354,7 +2354,7 @@ g_format_size_for_display (goffset size)
+ }
+ }
+
+-#if defined (G_OS_WIN32) && !defined (_WIN64)
++#if defined (G_OS_WIN32)
+
+ /* Binary compatibility versions. Not for newly compiled code. */
+
+--
+cgit v0.9.1
diff --git a/mingw-glib2.spec b/mingw-glib2.spec
index bb75e96..7706e3a 100644
--- a/mingw-glib2.spec
+++ b/mingw-glib2.spec
@@ -2,7 +2,7 @@
Name: mingw-glib2
Version: 2.36.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: MinGW Windows GLib2 library
License: LGPLv2+
@@ -54,6 +54,13 @@ Patch4: glib-formatstring.patch
# http://lists.fedoraproject.org/pipermail/fedora-mingw/2013-March/006429.html
Patch5: glib-prefer-constructors-over-DllMain.patch
+# Revert unintented ABI break on win64
+# https://bugzilla.redhat.com/show_bug.cgi?id=951588
+# https://bugzilla.gnome.org/show_bug.cgi?id=697879
+# Upstream commit b972018d6c252c4afb1375e5c4e9910e79af2e70
+Patch6: glib-commit-b972018.patch
+
+
%description
MinGW Windows Glib2 library.
@@ -99,6 +106,7 @@ Static version of the MinGW Windows GLib2 library.
%patch3 -p0
%patch4 -p0
%patch5 -p0
+%patch6 -p1
%build
@@ -277,6 +285,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
+* Mon Apr 15 2013 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 2.36.0-3
+- Revert unintended ABI break on win64 (RHBZ #951588, GNOME BZ #697879)
+
* Fri Mar 29 2013 Kalev Lember <kalevlember(a)gmail.com> - 2.36.0-2
- Drop two patches that have been fixed upstream
11 years
[mingw-libxml2] Throw off LDFLAGS and CFLAGS settings (#951472) and simplified static libraries installation
by Erik van Pienbroek
commit 53c2093a6b8477cd6509fddfa76297e978ef5346
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Sun Apr 14 16:46:42 2013 +0200
Throw off LDFLAGS and CFLAGS settings (#951472) and simplified static libraries installation
mingw-libxml2.spec | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/mingw-libxml2.spec b/mingw-libxml2.spec
index 8dc233c..cb9e11c 100644
--- a/mingw-libxml2.spec
+++ b/mingw-libxml2.spec
@@ -2,7 +2,7 @@
Name: mingw-libxml2
Version: 2.9.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: MinGW Windows libxml2 XML processing library
License: MIT
@@ -79,10 +79,11 @@ Static version of the MinGW Windows XML processing library.
%build
# LibXML2 can't build static and shared libraries in one go, so we
# build LibXML2 twice here
-export LDFLAGS="-no-undefined"
-export CFLAGS="$CFLAGS -DLIBXML_STATIC_FOR_DLL"
+MINGW32_CPPFLAGS="-DLIBXML_STATIC_FOR_DLL"
+MINGW64_CPPFLAGS="-DLIBXML_STATIC_FOR_DLL"
MINGW_BUILDDIR_SUFFIX=static %mingw_configure --without-python --with-modules --enable-static --disable-shared --with-threads=win32
-unset CFLAGS
+MINGW32_CPPFLAGS=
+MINGW64_CPPFLAGS=
MINGW_BUILDDIR_SUFFIX=shared %mingw_configure --without-python --with-modules --disable-static --enable-shared --with-threads=win32
MINGW_BUILDDIR_SUFFIX=static %mingw_make %{?_smp_mflags}
@@ -93,15 +94,9 @@ MINGW_BUILDDIR_SUFFIX=shared %mingw_make %{?_smp_mflags}
# First install all the files belonging to the shared build
MINGW_BUILDDIR_SUFFIX=shared %mingw_make_install DESTDIR=$RPM_BUILD_ROOT
-# Install all the files from the static build in a seperate folder
-# and move the static libraries to the right location
-MINGW_BUILDDIR_SUFFIX=static %mingw_make_install DESTDIR=$RPM_BUILD_ROOT/build_static
-
-mv $RPM_BUILD_ROOT/build_static%{mingw32_libdir}/*.a $RPM_BUILD_ROOT%{mingw32_libdir}
-mv $RPM_BUILD_ROOT/build_static%{mingw64_libdir}/*.a $RPM_BUILD_ROOT%{mingw64_libdir}
-
-# Drop the folder which was temporary used for installing the static bits
-rm -rf $RPM_BUILD_ROOT/build_static
+# Then manually install the static libraries to the right location
+install -m 0644 build_win32static/.libs/libxml2.a $RPM_BUILD_ROOT%{mingw32_libdir}/
+install -m 0644 build_win64static/.libs/libxml2.a $RPM_BUILD_ROOT%{mingw64_libdir}/
# Remove documentation which duplicates Fedora native.
rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
@@ -148,6 +143,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
+* Fri Apr 12 2013 Nicola Fontana <ntd(a)entidi.it> - 2.9.0-3
+- Throw off LDFLAGS and CFLAGS settings (#951472)
+- Simplified static libraries installation
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
11 years
Broken dependencies: mingw32-libpng
by Fedora Koji Build System
mingw32-libpng has broken dependencies in the epel-6 tree:
On ppc64:
mingw32-libpng-1.2.37-3.el6.noarch requires mingw32-runtime
mingw32-libpng-1.2.37-3.el6.noarch requires mingw32-filesystem >= 0:63
mingw32-libpng-1.2.37-3.el6.noarch requires mingw32(zlib1.dll)
mingw32-libpng-1.2.37-3.el6.noarch requires mingw32(msvcrt.dll)
mingw32-libpng-1.2.37-3.el6.noarch requires mingw32(kernel32.dll)
Please resolve this as soon as possible.
11 years
Broken dependencies: mingw32-libpng
by Fedora Koji Build System
mingw32-libpng has broken dependencies in the epel-6 tree:
On ppc64:
mingw32-libpng-1.2.37-3.el6.noarch requires mingw32-runtime
mingw32-libpng-1.2.37-3.el6.noarch requires mingw32-filesystem >= 0:63
mingw32-libpng-1.2.37-3.el6.noarch requires mingw32(zlib1.dll)
mingw32-libpng-1.2.37-3.el6.noarch requires mingw32(msvcrt.dll)
mingw32-libpng-1.2.37-3.el6.noarch requires mingw32(kernel32.dll)
Please resolve this as soon as possible.
11 years
[mingw-pkg-config] Update to 0.28
by Kalev Lember
commit 9a56172845367a72900ed04bc047bafc9d94e84b
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Sat Apr 13 18:26:38 2013 +0200
Update to 0.28
.gitignore | 1 +
mingw-pkg-config.spec | 7 ++++++-
sources | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2ee4a76..ade498a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/pkg-config-0.26.tar.gz
/pkg-config-0.27.tar.gz
/pkg-config-0.27.1.tar.gz
+/pkg-config-0.28.tar.gz
diff --git a/mingw-pkg-config.spec b/mingw-pkg-config.spec
index d7ef9ae..c2e12fb 100644
--- a/mingw-pkg-config.spec
+++ b/mingw-pkg-config.spec
@@ -1,5 +1,5 @@
Name: mingw-pkg-config
-Version: 0.27.1
+Version: 0.28
Release: 1%{?dist}
Summary: A tool for determining compilation options
@@ -51,6 +51,7 @@ mkdir build_win32
pushd build_win32
%configure \
--disable-shared \
+ --disable-host-tool \
--program-prefix=%{mingw32_target}- \
--with-pc-path=%{mingw32_libdir}/pkgconfig:%{mingw32_datadir}/pkgconfig
@@ -61,6 +62,7 @@ mkdir build_win64
pushd build_win64
%configure \
--disable-shared \
+ --disable-host-tool \
--program-prefix=%{mingw64_target}- \
--with-pc-path=%{mingw64_libdir}/pkgconfig:%{mingw64_datadir}/pkgconfig
@@ -89,6 +91,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/pkg-config
%changelog
+* Sat Apr 13 2013 Kalev Lember <kalevlember(a)gmail.com> - 0.28-1
+- Update to 0.28
+
* Sat Apr 13 2013 Kalev Lember <kalevlember(a)gmail.com> - 0.27.1-1
- Update to 0.27.1
diff --git a/sources b/sources
index ec06bcb..35b7de1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5392b4e3372879c5bf856173b418d6a2 pkg-config-0.27.1.tar.gz
+aa3c86e67551adc3ac865160e34a2a0d pkg-config-0.28.tar.gz
11 years
