patch to fix qt4 moc (kdepim 4.14.6) [release 1.57.0-4mamba;Sat Apr 11 2015]

This commit is contained in:
Silvan Calarco 2024-01-06 03:52:22 +01:00
parent 58b1b7dda2
commit 3fe3f9c130
2 changed files with 21 additions and 1 deletions

View File

@ -0,0 +1,15 @@
--- boost_1_57_0/boost/type_traits/detail/has_binary_operator.hpp.orig 2015-04-11 16:45:40.250578640 +0200
+++ boost_1_57_0/boost/type_traits/detail/has_binary_operator.hpp 2015-04-11 16:45:58.911577918 +0200
@@ -6,6 +6,7 @@
//
// See http://www.boost.org/libs/type_traits for most recent version including documentation.
+#ifndef Q_MOC_RUN
#include <boost/config.hpp>
#include <boost/type_traits/ice.hpp>
#include <boost/type_traits/integral_constant.hpp>
@@ -227,3 +228,4 @@
#endif
#include <boost/type_traits/detail/bool_trait_undef.hpp>
+#endif

View File

@ -2,7 +2,7 @@
%define pckmajver %(echo %version | cut -d. -f1-2 | tr . _) %define pckmajver %(echo %version | cut -d. -f1-2 | tr . _)
Name: libboost Name: libboost
Version: 1.57.0 Version: 1.57.0
Release: 3mamba Release: 4mamba
Summary: Free peer-reviewed portable C++ source libraries Summary: Free peer-reviewed portable C++ source libraries
Group: System/Libraries Group: System/Libraries
Vendor: openmamba Vendor: openmamba
@ -10,6 +10,7 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://boost.org/ URL: http://boost.org/
Source: http://download.sourceforge.net/sourceforge/boost/boost_%{pckver}.tar.bz2 Source: http://download.sourceforge.net/sourceforge/boost/boost_%{pckver}.tar.bz2
Patch0: libboost-1.57.0-moc-libqt4-4.8.6.patch
License: Boost Software License License: Boost Software License
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -87,6 +88,7 @@ This package contains then Boost.python3 library
%prep %prep
%setup -q -n boost_%{pckver} %setup -q -n boost_%{pckver}
%patch0 -p1
%build %build
# Build boost with python3 # Build boost with python3
@ -229,6 +231,9 @@ cp stage/lib/libboost_python-mt.* %{buildroot}%{_libdir}/
%{_libdir}/libboost_python3-mt.so.* %{_libdir}/libboost_python3-mt.so.*
%changelog %changelog
* Sat Apr 11 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.57.0-4mamba
- patch to fix qt4 moc (kdepim 4.14.6)
* Thu Feb 05 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.57.0-3mamba * Thu Feb 05 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.57.0-3mamba
- fix python3 module - fix python3 module