- updated to 2.34.1 (2.34.0 was broken on win32)

- added win32 patch (disable one unix-specific func wrapper)

diff --git a/crossmingw32-glibmm.spec b/crossmingw32-glibmm.spec
index 3ba9c406920508faafddd3abaabb14f77b5670f8..09dbe2d9e2ae0a6f0eef14a0c97c0c9412f33d44 100644 (file)
--- a/crossmingw32-glibmm.spec
+++ b/crossmingw32-glibmm.spec
@@ -2,25 +2,26 @@ Summary:      A C++ interface for glib library - cross MinGW32 version
 Summary(pl.UTF-8):     Interfejs C++ dla biblioteki glib - wersja skrośna MinGW32
 %define                realname        glibmm
 Name:          crossmingw32-%{realname}
-Version:       2.32.1
+Version:       2.34.1
 Release:       1
 License:       LGPL v2+
 Group:         Development/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.32/%{realname}-%{version}.tar.xz
-# Source0-md5: 8e5dd06610bd205f4c9cbc11453c0010
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.34/%{realname}-%{version}.tar.xz
+# Source0-md5: 25dccf8e95abcde034a002b450a43125
+Patch0:                glibmm-win32.patch
 URL:           http://www.gtkmm.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.11
 BuildRequires: crossmingw32-gcc-c++
-BuildRequires: crossmingw32-glib2 >= 2.32.0
+BuildRequires: crossmingw32-glib2 >= 2.34.0
 BuildRequires: crossmingw32-libsigc++ >= 2.2.10
-BuildRequires: libtool >= 2:1.5
+BuildRequires: libtool >= 2:2.0
 BuildRequires: m4
-BuildRequires: mm-common >= 0.9.5
+BuildRequires: mm-common >= 0.9.6
 BuildRequires: pkgconfig >= 1:0.15
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
-Requires:      crossmingw32-glib2 >= 2.32.0
+Requires:      crossmingw32-glib2 >= 2.34.0
 Requires:      crossmingw32-libsigc++ >= 2.2.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -66,7 +67,7 @@ Statyczna biblioteka glibmm (wersja skrośna MinGW32).
 Summary:       DLL glibmm library for Windows
 Summary(pl.UTF-8):     Biblioteka DLL glibmm dla Windows
 Group:         Applications/Emulators
-Requires:      crossmingw32-glib2-dll >= 2.32.0
+Requires:      crossmingw32-glib2-dll >= 2.34.0
 Requires:      crossmingw32-libsigc++-dll >= 2.2.10
 Requires:      wine
 
@@ -78,6 +79,7 @@ Biblioteka DLL glibmm dla Windows.
 
 %prep
 %setup -q -n %{realname}-%{version}
+%patch0 -p1
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig

diff --git a/glibmm-win32.patch b/glibmm-win32.patch
index 1f70ea03708259fa2d078c6d40be1d6bacbd0d16..b68d72c9f21560d4341cc04473baceb20bf3fc1d 100644 (file)
--- a/glibmm-win32.patch
+++ b/glibmm-win32.patch
@@ -1,14 +1,18 @@
---- glibmm-2.20.0/tools/extra_defs_gen/Makefile.am.orig        2008-11-16 05:04:58.000000000 +0100
-+++ glibmm-2.20.0/tools/extra_defs_gen/Makefile.am     2009-04-11 20:45:38.321713807 +0200
-@@ -24,7 +24,11 @@
- INCLUDES = $(GLIBMM_CFLAGS) $(GIOMM_CFLAGS)
- LIBS = $(GLIBMM_LIBS) $(GIOMM_LIBS)
+--- glibmm-2.34.1/gio/giomm/contenttype.cc.orig        2012-10-06 14:28:36.000000000 +0200
++++ glibmm-2.34.1/gio/giomm/contenttype.cc     2012-11-06 16:54:11.439593123 +0100
+@@ -56,6 +56,7 @@
+   return retvalue;
+ }
  
-+if PLATFORM_WIN32
-+noinst_PROGRAMS = generate_extra_defs
-+else
- noinst_PROGRAMS = generate_extra_defs generate_defs_gio
-+endif
++#ifndef G_OS_WIN32
+ Glib::RefPtr<Gio::Icon> content_type_get_symbolic_icon(const Glib::ustring& type)
+ {
+   Glib::RefPtr<Icon> retvalue = Glib::wrap(g_content_type_get_symbolic_icon(type.c_str()));
+@@ -63,6 +64,7 @@
+     retvalue->reference(); //The function does not do a ref for us.
+   return retvalue;
+ }
++#endif
  
- generate_extra_defs_SOURCES = generate_defs_glib.cc
- generate_extra_defs_LDADD = libglibmm_generate_extra_defs-2.4.la
+ bool content_type_can_be_executable(const Glib::ustring& type)
+ {