Attachment #166920 for bug #207144

View | Details | Raw Unified | Return to bug 207144
Collapse All | Expand All

Lines 26-32 Link Here

(-)Makefile (-1 / +1 lines)
26	PLIST_SUB= SHLIB_VER="${PORTVERSION}"	26	PLIST_SUB= SHLIB_VER="${PORTVERSION}"
27		27
28	post-patch:	28	post-patch:
29	${REINPLACE_CMD} -e 's\|$${CMAKE_INSTALL_LIBDIR}/pkgconfig\|libdata/pkgconfig\|' \	29	@${REINPLACE_CMD} -e 's\|$${CMAKE_INSTALL_LIBDIR}/pkgconfig\|libdata/pkgconfig\|' \
30	${WRKSRC}/CMakeLists.txt	30	${WRKSRC}/CMakeLists.txt
31		31
32	.include <bsd.port.mk>	32	.include <bsd.port.mk>




--- src/QGlib/connect.cpp.orig	2014-07-08 18:38:36 UTC
+++ src/QGlib/connect.cpp
@@ -20,10 +20,12 @@
 #include <glib-object.h>
 #include <QtCore/QHash>
 #include <QtCore/QMutex>
+#ifndef Q_MOC_RUN
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
 #include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/member.hpp>
+#endif
 
 namespace QGlib {
 namespace Private {




--- src/QGlib/connect.h.orig	2014-07-08 18:38:36 UTC
+++ src/QGlib/connect.h
@@ -25,8 +25,11 @@
 #include <QtCore/QSharedPointer>
 #include <QtCore/QFlags>
 #include <QtCore/QHash>
+
+#ifndef Q_MOC_RUN
 #include <boost/type_traits.hpp>
 #include <boost/utility/enable_if.hpp>
+#endif
 
 namespace QGlib {
 




--- src/QGlib/connectimpl.h.orig	2014-07-08 18:38:36 UTC
+++ src/QGlib/connectimpl.h
@@ -26,7 +26,9 @@
 # include "refpointer.h"
 # include <QtCore/QList>
 # include <stdexcept>
+#ifndef Q_MOC_RUN
 # include <boost/type_traits.hpp>
+#endif
 
 
 namespace QGlib {




--- src/QGlib/global.h.orig	2014-07-08 18:38:36 UTC
+++ src/QGlib/global.h
@@ -23,7 +23,9 @@
 #endif
 
 #include <QtCore/QtGlobal>
+#ifndef Q_MOC_RUN
 #include <boost/config.hpp>
+#endif
 
 /* defined by cmake when building this library */
 #if defined(QtGLib_EXPORTS) || defined(Qt5GLib_EXPORTS)




--- src/QGlib/refpointer.h.orig	2014-07-08 18:38:36 UTC
+++ src/QGlib/refpointer.h
@@ -23,8 +23,10 @@
 #include "type.h"
 #include "wrap.h"
 #include <cstddef>
+#ifndef Q_MOC_RUN
 #include <boost/type_traits.hpp>
 #include <boost/utility/enable_if.hpp>
+#endif
 #include <QtCore/QHash>
 
 namespace QGlib {




--- src/QGlib/type.h.orig	2014-07-08 18:38:36 UTC
+++ src/QGlib/type.h
@@ -21,7 +21,9 @@
 
 #include "global.h"
 #include <QtCore/QList>
+#ifndef Q_MOC_RUN
 #include <boost/mpl/if.hpp>
+#endif
 
 /*
  * This is a re-definition of GType inside the QGlib::Private namespace.




--- src/QGlib/value.h.orig	2014-07-08 18:38:36 UTC
+++ src/QGlib/value.h
@@ -23,8 +23,10 @@
 #include "type.h"
 #include "refpointer.h"
 #include "error.h"
+#ifndef Q_MOC_RUN
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits.hpp>
+#endif
 #include <stdexcept>
 #include <QtCore/QString>
 #include <QtCore/QDebug>

Return to bug 207144

Line 0 Link Here

(-)files/patch-src_QGlib_connect.cpp (+15 lines)
	1	--- src/QGlib/connect.cpp.orig 2014-07-08 18:38:36 UTC
	2	+++ src/QGlib/connect.cpp
	3	@@ -20,10 +20,12 @@
	4	#include <glib-object.h>
	5	#include <QtCore/QHash>
	6	#include <QtCore/QMutex>
	7	+#ifndef Q_MOC_RUN
	8	#include <boost/multi_index_container.hpp>
	9	#include <boost/multi_index/sequenced_index.hpp>
	10	#include <boost/multi_index/ordered_index.hpp>
	11	#include <boost/multi_index/member.hpp>
	12	+#endif
	13
	14	namespace QGlib {
	15	namespace Private {

Line 0 Link Here

(-)files/patch-src_QGlib_connect.h (+14 lines)
	1	--- src/QGlib/connect.h.orig 2014-07-08 18:38:36 UTC
	2	+++ src/QGlib/connect.h
	3	@@ -25,8 +25,11 @@
	4	#include <QtCore/QSharedPointer>
	5	#include <QtCore/QFlags>
	6	#include <QtCore/QHash>
	7	+
	8	+#ifndef Q_MOC_RUN
	9	#include <boost/type_traits.hpp>
	10	#include <boost/utility/enable_if.hpp>
	11	+#endif
	12
	13	namespace QGlib {
	14

Line 0 Link Here

(-)files/patch-src_QGlib_connectimpl.h (+12 lines)
	1	--- src/QGlib/connectimpl.h.orig 2014-07-08 18:38:36 UTC
	2	+++ src/QGlib/connectimpl.h
	3	@@ -26,7 +26,9 @@
	4	# include "refpointer.h"
	5	# include <QtCore/QList>
	6	# include <stdexcept>
	7	+#ifndef Q_MOC_RUN
	8	# include <boost/type_traits.hpp>
	9	+#endif
	10
	11
	12	namespace QGlib {

Line 0 Link Here

(-)files/patch-src_QGlib_global.h (+12 lines)
	1	--- src/QGlib/global.h.orig 2014-07-08 18:38:36 UTC
	2	+++ src/QGlib/global.h
	3	@@ -23,7 +23,9 @@
	4	#endif
	5
	6	#include <QtCore/QtGlobal>
	7	+#ifndef Q_MOC_RUN
	8	#include <boost/config.hpp>
	9	+#endif
	10
	11	/* defined by cmake when building this library */
	12	#if defined(QtGLib_EXPORTS) \|\| defined(Qt5GLib_EXPORTS)

Line 0 Link Here

(-)files/patch-src_QGlib_refpointer.h (+13 lines)
	1	--- src/QGlib/refpointer.h.orig 2014-07-08 18:38:36 UTC
	2	+++ src/QGlib/refpointer.h
	3	@@ -23,8 +23,10 @@
	4	#include "type.h"
	5	#include "wrap.h"
	6	#include <cstddef>
	7	+#ifndef Q_MOC_RUN
	8	#include <boost/type_traits.hpp>
	9	#include <boost/utility/enable_if.hpp>
	10	+#endif
	11	#include <QtCore/QHash>
	12
	13	namespace QGlib {

Line 0 Link Here

(-)files/patch-src_QGlib_type.h (+12 lines)
	1	--- src/QGlib/type.h.orig 2014-07-08 18:38:36 UTC
	2	+++ src/QGlib/type.h
	3	@@ -21,7 +21,9 @@
	4
	5	#include "global.h"
	6	#include <QtCore/QList>
	7	+#ifndef Q_MOC_RUN
	8	#include <boost/mpl/if.hpp>
	9	+#endif
	10
	11	/*
	12	* This is a re-definition of GType inside the QGlib::Private namespace.

Line 0 Link Here

(-)files/patch-src_QGlib_value.h (+13 lines)
	1	--- src/QGlib/value.h.orig 2014-07-08 18:38:36 UTC
	2	+++ src/QGlib/value.h
	3	@@ -23,8 +23,10 @@
	4	#include "type.h"
	5	#include "refpointer.h"
	6	#include "error.h"
	7	+#ifndef Q_MOC_RUN
	8	#include <boost/mpl/if.hpp>
	9	#include <boost/type_traits.hpp>
	10	+#endif
	11	#include <stdexcept>
	12	#include <QtCore/QString>
	13	#include <QtCore/QDebug>