commit 15f7ed638a17649ef08eadcdb3775a39f5a9e22e
Author: Jakub Bogusz <[email protected]>
Date: Sat Jun 25 09:48:14 2016 +0200
- updated to 2.48.1
- added mingw32 patch, use meganz mingw-std-threads for std::mutex
crossmingw32-glibmm.spec | 24 ++++++++++++++----------
glibmm-mingw32.patch | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 10 deletions(-)
---
diff --git a/crossmingw32-glibmm.spec b/crossmingw32-glibmm.spec
index 400f6f9..cd298e1 100644
--- a/crossmingw32-glibmm.spec
+++ b/crossmingw32-glibmm.spec
@@ -2,27 +2,30 @@ 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.46.3
+Version: 2.48.1
Release: 1
License: LGPL v2+
Group: Development/Libraries
-Source0:
http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.46/%{realname}-%{version}.tar.xz
-# Source0-md5: 6879e56997aed47816fafe9a7a822a87
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.48/%{realname}-%{version}.tar.xz
+# Source0-md5: f08b2c7f09b984b0df05f0bf4d20ad11
+Patch0: glibmm-mingw32.patch
URL: http://www.gtkmm.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.11
BuildRequires: crossmingw32-gcc-c++ >= 1:4.6
-BuildRequires: crossmingw32-glib2 >= 2.46.0
-BuildRequires: crossmingw32-libsigc++ >= 2.6.0
+BuildRequires: crossmingw32-glib2 >= 2.48.0
+BuildRequires: crossmingw32-libsigc++ >= 2.8.0
+BuildRequires: crossmingw32-std-threads
BuildRequires: libtool >= 2:2.0
BuildRequires: m4
-BuildRequires: mm-common >= 0.9.8
+BuildRequires: mm-common >= 0.9.10
BuildRequires: pkgconfig >= 1:0.15
BuildRequires: tar >= 1:1.22
BuildRequires: xz
Requires: crossmingw32-gcc-c++ >= 1:4.6
-Requires: crossmingw32-glib2 >= 2.46.0
-Requires: crossmingw32-libsigc++ >= 2.6.0
+Requires: crossmingw32-glib2 >= 2.48.0
+Requires: crossmingw32-libsigc++ >= 2.8.0
+Requires: crossmingw32-std-threads
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define no_install_post_strip 1
@@ -71,8 +74,8 @@ 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.46.0
-Requires: crossmingw32-libsigc++-dll >= 2.6.0
+Requires: crossmingw32-glib2-dll >= 2.48.0
+Requires: crossmingw32-libsigc++-dll >= 2.8.0
Requires: wine
%description dll
@@ -83,6 +86,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-mingw32.patch b/glibmm-mingw32.patch
new file mode 100644
index 0000000..151a5a8
--- /dev/null
+++ b/glibmm-mingw32.patch
@@ -0,0 +1,41 @@
+--- glibmm-2.48.1/glib/glibmm/dispatcher.cc.orig 2016-03-28
21:50:50.000000000 +0200
++++ glibmm-2.48.1/glib/glibmm/dispatcher.cc 2016-06-25 08:53:41.508797517
+0200
+@@ -36,6 +36,7 @@
+ #include <direct.h>
+ #include <list>
+ #include <mutex>
++#include <std-threads/mingw.mutex.h>
+ #else
+ #include <unistd.h>
+ #endif
+--- glibmm-2.48.1/glib/glibmm/objectbase.h.orig 2016-03-31
11:39:07.000000000 +0200
++++ glibmm-2.48.1/glib/glibmm/objectbase.h 2016-06-25 08:50:30.876496926
+0200
+@@ -31,6 +31,7 @@
+ #include <map> // Needed until the next ABI break.
+ #include <memory> // Not used by ObjectBase any more, but user code may rely
on it being here.
+ #include <mutex>
++#include <std-threads/mingw.mutex.h>
+
+ #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
+ ThreadPriority
+ Thread::get_priority() const
+ {
+- return THREAD_PRIORITY_NORMAL; // An appropriate result now that this is
deprecated because the
++ return Glib::THREAD_PRIORITY_NORMAL; // An appropriate result now that this
is deprecated because the
+ // 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
+@@ -53,6 +53,7 @@
+
+ /* Shadow THREAD_PRIORITY_NORMAL macro (from winbase.h).
+ */
++#include <windows.h> // ensure it's included before shadowing, not after
+ #if defined(THREAD_PRIORITY_NORMAL) &&
!defined(GLIBMM_MACRO_SHADOW_THREAD_PRIORITY_NORMAL)
+ enum { GLIBMM_MACRO_DEFINITION_THREAD_PRIORITY_NORMAL =
THREAD_PRIORITY_NORMAL };
+ #undef THREAD_PRIORITY_NORMAL
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-glibmm.git/commitdiff/15f7ed638a17649ef08eadcdb3775a39f5a9e22e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
