- updated to 2.64.4

diff --git a/crossmingw32-glibmm.spec b/crossmingw32-glibmm.spec
index 17f1dd94becac0adc9fa7e3ebf31786b7c105ce5..0262d411b5505fc4c09b162733c04d92bb48a320 100644 (file)
--- a/crossmingw32-glibmm.spec
+++ b/crossmingw32-glibmm.spec
@@ -2,12 +2,12 @@ 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.64.2
+Version:       2.64.4
 Release:       1
 License:       LGPL v2+
 Group:         Development/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.64/%{realname}-%{version}.tar.xz
-# Source0-md5: c5f74897edfa7e1e771bc837dd586402
+Source0:       https://download.gnome.org/sources/glibmm/2.64/%{realname}-%{version}.tar.xz
+# Source0-md5: a5d54b861f68c5fb34249d906116449b
 Patch0:                glibmm-mingw32.patch
 URL:           https://www.gtkmm.org/
 BuildRequires: autoconf >= 2.59
@@ -92,9 +92,11 @@ Biblioteka DLL glibmm dla Windows.
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
+mm-common-prepare --copy --force
 %{__libtoolize}
 %{__aclocal} -I build
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 # std-threads require at least WinXP API
 CPPFLAGS="%{rpmcppflags} -DWINVER=0x0501"
@@ -104,6 +106,7 @@ CXXFLAGS="%{rpmcxxflags} -std=gnu++11"
        --target=%{target} \
        --host=%{target} \
        --disable-fulldocs \
+       --enable-maintainer-mode \
        --disable-silent-rules \
        --enable-static
 

diff --git a/glibmm-mingw32.patch b/glibmm-mingw32.patch
index 151a5a801b3de5b2328fed50c6a8430072d794b2..50e8529f619795bcf15a598ca6bece25871938ee 100644 (file)
--- a/glibmm-mingw32.patch
+++ b/glibmm-mingw32.patch
@@ -18,9 +18,9 @@
  
  #ifndef DOXYGEN_SHOULD_SKIP_THIS
  extern "C" {
---- glibmm-2.48.1/glib/glibmm/thread.cc.orig   2016-03-31 11:13:59.000000000 +0200
-+++ glibmm-2.48.1/glib/glibmm/thread.cc        2016-06-25 07:54:44.157960991 +0200
-@@ -163,7 +163,7 @@ Thread::set_priority(ThreadPriority prio
+--- glibmm-2.64.4/glib/src/thread.ccg.orig     2020-11-21 12:09:15.168252200 +0100
++++ glibmm-2.64.4/glib/src/thread.ccg  2020-11-22 19:15:06.082376889 +0100
+@@ -147,7 +147,7 @@ Thread::set_priority(ThreadPriority prio
  ThreadPriority
  Thread::get_priority() const
  {
@@ -29,8 +29,8 @@
                                   // priority concept has been removed.
  }
  
---- glibmm-2.48.1/glib/glibmm/thread.h.orig    2016-03-31 11:13:59.000000000 +0200
-+++ glibmm-2.48.1/glib/glibmm/thread.h 2016-06-25 08:51:22.762882501 +0200
+--- glibmm-2.64.4/glib/src/thread.hg.orig      2020-11-21 12:09:15.168252200 +0100
++++ glibmm-2.64.4/glib/src/thread.hg   2020-11-22 19:13:56.779419002 +0100
 @@ -53,6 +53,7 @@
  
  /* Shadow THREAD_PRIORITY_NORMAL macro (from winbase.h).