[CGAL] rebuild with new Boost libraries Add a patch to be compatible with Boost-1.48.
Laurent Rineau
rineau at fedoraproject.org
Mon Nov 21 16:38:56 UTC 2011
commit a7ffbbc2bd0643a3f94af1575bfefe536fe4ae46
Author: Laurent Rineau <git>
Date: Mon Nov 21 17:38:46 2011 +0100
rebuild with new Boost libraries
Add a patch to be compatible with Boost-1.48.
CGAL-boost-1.48.patch | 28 ++++++++++++++++++++++++++++
CGAL.spec | 6 ++++++
2 files changed, 34 insertions(+), 0 deletions(-)
---
diff --git a/CGAL-boost-1.48.patch b/CGAL-boost-1.48.patch
new file mode 100644
index 0000000..0c92ca2
--- /dev/null
+++ b/CGAL-boost-1.48.patch
@@ -0,0 +1,28 @@
+diff -up CGAL-3.8/include/CGAL/Qt/GraphicsItem.h~ CGAL-3.8/include/CGAL/Qt/GraphicsItem.h
+--- CGAL-3.8/include/CGAL/Qt/GraphicsItem.h~ 2009-11-03 21:00:47.000000000 +0100
++++ CGAL-3.8/include/CGAL/Qt/GraphicsItem.h 2011-11-21 17:31:57.085425604 +0100
+@@ -24,7 +24,9 @@
+ #include <CGAL/auto_link/Qt4.h>
+ #include <QObject>
+ #include <QGraphicsItem>
+-#include <CGAL/Object.h>
++#ifndef Q_MOC_RUN
++# include <CGAL/Object.h>
++#endif
+
+
+
+diff -up CGAL-3.8/include/CGAL/Qt/GraphicsViewInput.h~ CGAL-3.8/include/CGAL/Qt/GraphicsViewInput.h
+--- CGAL-3.8/include/CGAL/Qt/GraphicsViewInput.h~ 2011-02-24 21:00:56.000000000 +0100
++++ CGAL-3.8/include/CGAL/Qt/GraphicsViewInput.h 2011-11-21 17:32:13.423711798 +0100
+@@ -23,7 +23,9 @@
+
+ #include <CGAL/auto_link/Qt4.h>
+ #include <CGAL/Object.h>
+-#include <QObject>
++#ifndef Q_MOC_RUN
++# include <QObject>
++#endif
+
+ namespace CGAL {
+ namespace Qt {
diff --git a/CGAL.spec b/CGAL.spec
index 8f33e24..1ab2bf7 100644
--- a/CGAL.spec
+++ b/CGAL.spec
@@ -20,6 +20,10 @@ URL: http://www.cgal.org/
Source0: https://gforge.inria.fr/frs/download.php/%{gforgedlnumber}/%{name}-%{version}%{alphaname}.tar.xz
Source10: CGAL-README.Fedora
+Patch0: CGAL-boost-1.48.patch
+# Patch submitted upstream. Will be merged. See:
+# https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Required devel packages.
@@ -66,6 +70,7 @@ CGAL algorithms.
%prep
%setup -q -n %{name}-%{version}%{alphaname}
+%patch0 -p1
# Fix some file permissions
chmod a-x demo/Stream_lines_2/CMakeLists.txt
@@ -137,6 +142,7 @@ rm -rf %{buildroot}
%changelog
* Mon Nov 21 2011 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 3.8-4
- rebuild with new Boost libraries
+- Add a patch to be compatible with Boost-1.48.
* Thu Oct 20 2011 Marcela Mašláňová <mmaslano at redhat.com> - 3.8-3.2
- rebuild with new gmp without compat lib
More information about the scm-commits
mailing list