Hello community,
here is the log from the commit of package qt-gstreamer for openSUSE:Factory
checked in at 2012-04-20 15:19:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt-gstreamer (Old)
and /work/SRC/openSUSE:Factory/.qt-gstreamer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt-gstreamer", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt-gstreamer/qt-gstreamer.changes
2012-01-25 11:09:25.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qt-gstreamer.new/qt-gstreamer.changes
2012-04-20 15:19:55.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Apr 18 20:19:05 UTC 2012 - cgiboude...@gmx.com
+
+- add boost148_buildfix.diff
+Workaround for QTBUG-22829
+
+
+-------------------------------------------------------------------
New:
----
boost148_buildfix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt-gstreamer.spec ++++++
--- /var/tmp/diff_new_pack.ybIvvx/_old 2012-04-20 15:19:57.000000000 +0200
+++ /var/tmp/diff_new_pack.ybIvvx/_new 2012-04-20 15:19:57.000000000 +0200
@@ -35,6 +35,8 @@
# PATCH-FIX-UPSTREAM qt-gstreamer-glib2.patch bgo#653266 idoen...@suse.de --
Fix compilation with new glib2
Patch1: qt-gstreamer-glib2.patch
Patch2: fix-build.diff
+# PATCH-FIX-UPSTREAM boost148_buildfix.diff george.kiagiada...@collabora.com
-- Workaround build issues with boost 1.48
+Patch3: boost148_buildfix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -55,9 +57,9 @@
%package -n libQtGStreamer-0_10-devel
Summary: Include files and libraries mandatory for development
Group: Development/Libraries/C and C++
-Requires: libQtGStreamer-0_10-0 = %version
-Requires: gstreamer-0_10-plugins-base-devel
Requires: boost-devel
+Requires: gstreamer-0_10-plugins-base-devel
+Requires: libQtGStreamer-0_10-0 = %version
%description -n libQtGStreamer-0_10-devel
GStreamer is a streaming-media framework, based on graphs of filters
@@ -116,6 +118,7 @@
%patch0
%patch1
%patch2
+%patch3 -p1
%build
%cmake_kde4 -d build -- -DQTGSTREAMER_STATIC=OFF
++++++ boost148_buildfix.diff ++++++
>From 2cc5399d70d4d6caf8d05df9ca51f5448d545b67 Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiada...@collabora.com>
Date: Fri, 03 Feb 2012 15:55:08 +0000
Subject: Workaround build issues with boost 1.48
---
diff --git a/src/QGlib/global.h b/src/QGlib/global.h
index 314ed02..e73474b 100644
--- a/src/QGlib/global.h
+++ b/src/QGlib/global.h
@@ -17,6 +17,11 @@
#ifndef QGLIB_GLOBAL_H
#define QGLIB_GLOBAL_H
+// workaround for https://bugreports.qt-project.org/browse/QTBUG-22829
+#if defined(Q_MOC_RUN) && !defined(BOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
+#endif
+
#include <QtCore/QtGlobal>
#include <boost/config.hpp>
diff --git a/src/QGst/Ui/global.h b/src/QGst/Ui/global.h
index cba1806..85c55ea 100644
--- a/src/QGst/Ui/global.h
+++ b/src/QGst/Ui/global.h
@@ -18,6 +18,11 @@
#ifndef QTGSTREAMERUI_EXPORT_H
#define QTGSTREAMERUI_EXPORT_H
+// workaround for https://bugreports.qt-project.org/browse/QTBUG-22829
+#if defined(Q_MOC_RUN) && !defined(BOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
+#endif
+
#include <QtCore/QtGlobal>
/* defined by cmake when building this library */
diff --git a/src/QGst/Utils/global.h b/src/QGst/Utils/global.h
index ed598e6..871c778 100644
--- a/src/QGst/Utils/global.h
+++ b/src/QGst/Utils/global.h
@@ -18,6 +18,11 @@
#ifndef QGST_UTILS_GLOBAL_H
#define QGST_UTILS_GLOBAL_H
+// workaround for https://bugreports.qt-project.org/browse/QTBUG-22829
+#if defined(Q_MOC_RUN) && !defined(BOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
+#endif
+
#include <QtCore/QtGlobal>
/* defined by cmake when building this library */
diff --git a/src/QGst/global.h b/src/QGst/global.h
index ae64cfd..cadf3a4 100644
--- a/src/QGst/global.h
+++ b/src/QGst/global.h
@@ -17,6 +17,11 @@
#ifndef QGST_GLOBAL_H
#define QGST_GLOBAL_H
+// workaround for https://bugreports.qt-project.org/browse/QTBUG-22829
+#if defined(Q_MOC_RUN) && !defined(BOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
+#endif
+
#include "../QGlib/type.h"
#include <QtCore/QtGlobal>
#include <QtCore/QDate>
--
cgit v0.9.0.2-2-gbebe
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
