[mingw-gtk3] Update to 3.4.4
Kalev Lember
kalev at fedoraproject.org
Mon Jul 16 20:42:55 UTC 2012
commit 417a0d5e5dca3eac97d1208e87cfffa50b9c7312
Author: Kalev Lember <kalevlember at gmail.com>
Date: Mon Jul 16 22:39:50 2012 +0300
Update to 3.4.4
... and apply a build fix backported from git master.
...configure.ac-isnan-and-isinf-are-macros-n.patch | 52 ++++++++++++++++++++
mingw-gtk3.spec | 13 +++++-
sources | 2 +-
3 files changed, 65 insertions(+), 2 deletions(-)
---
diff --git a/0001-Bug-676087-configure.ac-isnan-and-isinf-are-macros-n.patch b/0001-Bug-676087-configure.ac-isnan-and-isinf-are-macros-n.patch
new file mode 100644
index 0000000..a8231ef
--- /dev/null
+++ b/0001-Bug-676087-configure.ac-isnan-and-isinf-are-macros-n.patch
@@ -0,0 +1,52 @@
+From d6aee922bb5da8254fafdf605951cf5b0150537d Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa at alpinelinux.org>
+Date: Tue, 15 May 2012 13:09:24 +0200
+Subject: [PATCH] Bug 676087-configure.ac: isnan() and isinf() are macros, not
+ functions
+
+The isnan() and isinf() are C99 macros not functions so use
+AC_CHECK_DECL instead of AC_CHECK_FUNCS for those.
+---
+ configure.ac | 3 ++-
+ gdk/fallback-c89.c | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 857d015..c801dd2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -751,7 +751,8 @@ AC_TYPE_UID_T
+
+ # Check for round(), rint(), isnan(), isinf() and nearbyint()
+ AC_CHECK_LIB(m,round,,)
+-AC_CHECK_FUNCS(round rint isnan isinf nearbyint)
++AC_CHECK_FUNCS(round rint nearbyint)
++AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])
+
+ # Checks for gdkspawn
+ AC_CHECK_HEADERS(crt_externs.h)
+diff --git a/gdk/fallback-c89.c b/gdk/fallback-c89.c
+index 35dea77..b150044 100644
+--- a/gdk/fallback-c89.c
++++ b/gdk/fallback-c89.c
+@@ -19,7 +19,7 @@
+
+ #include <float.h>
+
+-#ifndef HAVE_ISNAN
++#ifndef HAVE_DECL_ISNAN
+ /* it seems of the supported compilers only
+ * MSVC does not have isnan(), but it does
+ * have _isnan() which does the same as isnan()
+@@ -31,7 +31,7 @@ isnan (double x)
+ }
+ #endif
+
+-#ifndef HAVE_ISINF
++#ifndef HAVE_DECL_ISINF
+ /* Unfortunately MSVC does not have finite()
+ * but it does have _finite() which is the same
+ * as finite() except when x is a NaN
+--
+1.7.10.4
+
diff --git a/mingw-gtk3.spec b/mingw-gtk3.spec
index 943bec9..fc7a7e6 100644
--- a/mingw-gtk3.spec
+++ b/mingw-gtk3.spec
@@ -5,7 +5,7 @@
%define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
Name: mingw-gtk3
-Version: 3.4.2
+Version: 3.4.4
Release: 1%{?dist}
Summary: MinGW Windows GTK+ library
@@ -15,6 +15,8 @@ URL: http://www.gtk.org
Source0: http://download.gnome.org/sources/gtk+/%{release_version}/gtk+-%{version}.tar.xz
# wine gtk-query-immodules-3.0.exe > gtk.immodules
Source1: gtk.immodules
+# Build fix backported from git master
+Patch0: 0001-Bug-676087-configure.ac-isnan-and-isinf-are-macros-n.patch
BuildArch: noarch
@@ -53,6 +55,10 @@ BuildRequires: gtk2
# Native one for gdk-pixbuf-csource
BuildRequires: gdk-pixbuf2-devel
+# Needed to run autoreconf for patch0
+BuildRequires: autoconf automake libtool
+BuildRequires: gobject-introspection-devel
+
%description
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable for
@@ -97,6 +103,7 @@ This package contains the MinGW Windows cross compiled GTK+ 3 library.
%prep
%setup -q -n gtk+-%{version}
+%patch0 -p1 -b .isnan
%build
@@ -242,6 +249,10 @@ fi
%changelog
+* Sun Jul 15 2012 Kalev Lember <kalevlember at gmail.com> - 3.4.4-1
+- Update to 3.4.4
+- Apply a build fix backported from git master
+
* Sun May 06 2012 Kalev Lember <kalevlember at gmail.com> - 3.4.2-1
- Update to 3.4.2
- Drop an upstreamed patch
diff --git a/sources b/sources
index e25dcf0..9541027 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e20443fbaa3ba3e9cbd2fc44d6be121 gtk+-3.4.2.tar.xz
+1b2cf29502a6394e8d4b30f7f5bb9131 gtk+-3.4.4.tar.xz
More information about the scm-commits
mailing list