- updated to 2.40.0

- removed obsolete win32 patch

diff --git a/crossmingw32-glibmm.spec b/crossmingw32-glibmm.spec
index 41defb5c24d5d72ef908eba76792abd69ba94679..517b033ce8a9df660b9bafe93b9a62ef7adea63e 100644 (file)
--- a/crossmingw32-glibmm.spec
+++ b/crossmingw32-glibmm.spec
@@ -2,18 +2,17 @@ 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.38.1
+Version:       2.40.0
 Release:       1
 License:       LGPL v2+
 Group:         Development/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.36/%{realname}-%{version}.tar.xz
-# Source0-md5: 50d86a77398cd473ff13c4c9382e39bd
-Patch0:                glibmm-win32.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.40/%{realname}-%{version}.tar.xz
+# Source0-md5: f62754f4f5c9030f8ff43c7ed20556c2
 URL:           http://www.gtkmm.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.11
 BuildRequires: crossmingw32-gcc-c++
-BuildRequires: crossmingw32-glib2 >= 2.38.0
+BuildRequires: crossmingw32-glib2 >= 2.40.0
 BuildRequires: crossmingw32-libsigc++ >= 2.2.10
 BuildRequires: libtool >= 2:2.0
 BuildRequires: m4
@@ -21,7 +20,7 @@ BuildRequires:        mm-common >= 0.9.6
 BuildRequires: pkgconfig >= 1:0.15
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
-Requires:      crossmingw32-glib2 >= 2.38.0
+Requires:      crossmingw32-glib2 >= 2.40.0
 Requires:      crossmingw32-libsigc++ >= 2.2.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -71,7 +70,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.38.0
+Requires:      crossmingw32-glib2-dll >= 2.40.0
 Requires:      crossmingw32-libsigc++-dll >= 2.2.10
 Requires:      wine
 
@@ -83,7 +82,6 @@ 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
deleted file mode 100644 (file)
index b68d72c..0000000
--- a/glibmm-win32.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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;
- }
- 
-+#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
- 
- bool content_type_can_be_executable(const Glib::ustring& type)
- {