[packages/kde4-kdevplatform] - added patch to workaround problems with moc and boost
bszx
bszx at pld-linux.org
Sat Apr 18 14:38:42 CEST 2015
commit b4f058b6365597b6eb109a0044445a1d225233f1
Author: Bartek Szady <bszx at pld-linux.org>
Date: Sat Apr 18 14:36:48 2015 +0200
- added patch to workaround problems with moc and boost
kde4-kdevplatform-boost.patch | 15 +++++++++++++++
kde4-kdevplatform.spec | 5 ++++-
2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/kde4-kdevplatform.spec b/kde4-kdevplatform.spec
index 71803d8..8161d6f 100644
--- a/kde4-kdevplatform.spec
+++ b/kde4-kdevplatform.spec
@@ -12,11 +12,12 @@ Summary: KDevelop Development Platform
Summary(pl.UTF-8): KDevelop Development Platform
Name: kde4-kdevplatform
Version: 1.7.1
-Release: 1
+Release: 2
License: GPL
Group: X11/Development/Tools
Source0: ftp://ftp.kde.org/pub/kde/%{_state}/kdevelop/%{_kdevelopver}/src/%{orgname}-%{version}.tar.xz
# Source0-md5: f6c123d65ae8d5c50944d548c8bc812f
+Patch0: %{name}-boost.patch
URL: http://www.kdevelop.org/
BuildRequires: QtNetwork-devel >= %{qtver}
BuildRequires: automoc4
@@ -66,6 +67,8 @@ pisaniu własnych programów wykorzystujących kdevplatform.
%prep
%setup -q -n %{orgname}-%{version}
+%patch0 -p1
+
%build
install -d build
cd build
diff --git a/kde4-kdevplatform-boost.patch b/kde4-kdevplatform-boost.patch
new file mode 100644
index 0000000..bdbf008
--- /dev/null
+++ b/kde4-kdevplatform-boost.patch
@@ -0,0 +1,15 @@
+--- kdevplatform-1.7.1/plugins/classbrowser/documentclassesfolder.h.orig 2015-02-02 15:14:28.000000000 +0100
++++ kdevplatform-1.7.1/plugins/classbrowser/documentclassesfolder.h 2015-04-18 13:41:36.594022899 +0200
+@@ -23,9 +23,12 @@
+ #define KDEVPLATFORM_PLUGIN_DOCUMENTCLASSESFOLDER_H
+
+ #include "classmodelnode.h"
++
++#ifndef Q_MOC_RUN
+ #include <boost/multi_index_container.hpp>
+ #include <boost/multi_index/member.hpp>
+ #include <boost/multi_index/ordered_index.hpp>
++#endif
+
+ namespace ClassModelNodes
+ {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdevplatform.git/commitdiff/b4f058b6365597b6eb109a0044445a1d225233f1
More information about the pld-cvs-commit
mailing list