[SCM] qt-gstreamer packaging branch, master, updated. debian/1.2.0-3-3-g1237a63
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Aug 9 12:58:36 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/qt-gstreamer.git;a=commitdiff;h=1ec645d
The following commit has been merged in the master branch:
commit 1ec645d682a0c2e7cf897ce168c548c9f04c0754
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Aug 9 13:00:27 2016 +0200
Add new patch: Furter-workarounds-for-build-failures-now-boost-1.61-and-.patch
---
debian/changelog | 8 ++
...ds-for-build-failures-now-boost-1.61-and-.patch | 87 ++++++++++++++++++++++
debian/patches/disable-doxygen-timestamp.patch | 16 +++-
debian/patches/find_gstconfig_properly.diff | 40 ++++++----
debian/patches/series | 1 +
.../patches/upstream_workaround_boost_ftbfs.diff | 7 +-
6 files changed, 136 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f9ed6c8..b7d4900 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qt-gstreamer (1.2.0-4~) UNRELEASED; urgency=medium
+
+ * Refresh patches.
+ * Add new patch: Furter-workarounds-for-build-failures-now-boost-1.61-
+ and-.patch
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 09 Aug 2016 13:00:44 +0200
+
qt-gstreamer (1.2.0-3) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/Furter-workarounds-for-build-failures-now-boost-1.61-and-.patch b/debian/patches/Furter-workarounds-for-build-failures-now-boost-1.61-and-.patch
new file mode 100644
index 0000000..e285b7d
--- /dev/null
+++ b/debian/patches/Furter-workarounds-for-build-failures-now-boost-1.61-and-.patch
@@ -0,0 +1,87 @@
+From: Maximiliano Curia <maxy at gnuservers.com.ar>
+Date: Tue, 9 Aug 2016 12:56:44 +0200
+Subject: Furter workarounds for build failures (now boost>=1.61 and moc)
+
+Otherwise I get the following error message:
+'usr/include/boost/type_traits/detail/has_binary_operator.hp:50:
+Parse error at "BOOST_JOIN"'.
+
+Now the header: boost/type_traits.hpp also triggers the issue.
+---
+ src/QGlib/connect.h | 2 ++
+ src/QGlib/connectimpl.h | 2 ++
+ src/QGlib/refpointer.h | 2 ++
+ src/QGlib/value.cpp | 2 ++
+ src/QGlib/value.h | 2 ++
+ 5 files changed, 10 insertions(+)
+
+diff --git a/src/QGlib/connect.h b/src/QGlib/connect.h
+index acab694..2b320f0 100644
+--- a/src/QGlib/connect.h
++++ b/src/QGlib/connect.h
+@@ -25,7 +25,9 @@
+ #include <QtCore/QSharedPointer>
+ #include <QtCore/QFlags>
+ #include <QtCore/QHash>
++#ifndef Q_MOC_RUN
+ #include <boost/type_traits.hpp>
++#endif
+ #include <boost/utility/enable_if.hpp>
+
+ namespace QGlib {
+diff --git a/src/QGlib/connectimpl.h b/src/QGlib/connectimpl.h
+index 3f40d1d..67fd60e 100644
+--- a/src/QGlib/connectimpl.h
++++ b/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 {
+diff --git a/src/QGlib/refpointer.h b/src/QGlib/refpointer.h
+index 966c0ba..67030b7 100644
+--- a/src/QGlib/refpointer.h
++++ b/src/QGlib/refpointer.h
+@@ -23,7 +23,9 @@
+ #include "type.h"
+ #include "wrap.h"
+ #include <cstddef>
++#ifndef Q_MOC_RUN
+ #include <boost/type_traits.hpp>
++#endif
+ #include <boost/utility/enable_if.hpp>
+ #include <QtCore/QHash>
+
+diff --git a/src/QGlib/value.cpp b/src/QGlib/value.cpp
+index 932ffad..2bcb71e 100644
+--- a/src/QGlib/value.cpp
++++ b/src/QGlib/value.cpp
+@@ -19,7 +19,9 @@
+ #include "value.h"
+ #include "string.h"
+ #include <cstring>
++#ifndef Q_MOC_RUN
+ #include <boost/type_traits.hpp>
++#endif
+ #include <glib-object.h>
+ #include <QtCore/QDebug>
+ #include <QtCore/QReadWriteLock>
+diff --git a/src/QGlib/value.h b/src/QGlib/value.h
+index 6d10736..e1f96f3 100644
+--- a/src/QGlib/value.h
++++ b/src/QGlib/value.h
+@@ -24,7 +24,9 @@
+ #include "refpointer.h"
+ #include "error.h"
+ #include <boost/mpl/if.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/type_traits.hpp>
++#endif
+ #include <stdexcept>
+ #include <QtCore/QString>
+ #include <QtCore/QDebug>
diff --git a/debian/patches/disable-doxygen-timestamp.patch b/debian/patches/disable-doxygen-timestamp.patch
index b2a9a29..8e874bc 100644
--- a/debian/patches/disable-doxygen-timestamp.patch
+++ b/debian/patches/disable-doxygen-timestamp.patch
@@ -1,9 +1,17 @@
-Author: Diane Trout <diane at ghic.org>
-Description: Turn off HTML_TIMESTAMP.
- This is needed to make qt-gstreamer build reproducably.
+From: Diane Trout <diane at ghic.org>
+Date: Tue, 9 Aug 2016 12:46:30 +0200
+Subject: Turn off HTML_TIMESTAMP.
+
+This is needed to make qt-gstreamer build reproducably.
+---
+ Doxyfile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Doxyfile.in b/Doxyfile.in
+index 309e494..69ed58f 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
-@@ -812,7 +812,7 @@
+@@ -812,7 +812,7 @@ HTML_STYLESHEET =
# page will contain the date and time when the page was generated. Setting
# this to NO can help when comparing the output of multiple runs.
diff --git a/debian/patches/find_gstconfig_properly.diff b/debian/patches/find_gstconfig_properly.diff
index 7371a93..56ecf79 100644
--- a/debian/patches/find_gstconfig_properly.diff
+++ b/debian/patches/find_gstconfig_properly.diff
@@ -1,22 +1,20 @@
-Description: apply gstreamer pkg-config definitions
- To ensure gstreamer builds correctly, pick up its cflags in FindGstreamer
- and apply them to the build as definitions
-Author: José Manuel Santamaría <panfaust at gmail.com>
+From: =?utf-8?q?Jos=C3=A9_Manuel_Santamar=C3=ADa?= <panfaust at gmail.com>
+Date: Tue, 9 Aug 2016 12:46:30 +0200
+Subject: apply gstreamer pkg-config definitions
+
+To ensure gstreamer builds correctly, pick up its cflags in FindGstreamer
+and apply them to the build as definitions
+
Origin: vendor, https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html
Forwarded: https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html
Reviewed-by: Harald Sitter <sitter at kde.org>
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/cmake/modules/FindGStreamer.cmake
-+++ b/cmake/modules/FindGStreamer.cmake
-@@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND)
- exec_program(${PKG_CONFIG_EXECUTABLE}
- ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION}
- OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR)
-+ set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
- endif()
-
- find_library(GSTREAMER_LIBRARY
+ CMakeLists.txt | 1 +
+ cmake/modules/FindGStreamer.cmake | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 574e31f..837c6bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,7 @@ find_package(GObject)
@@ -27,3 +25,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
include(CheckCXXSourceCompiles)
check_cxx_source_compiles("
#include <QtCore/QtGlobal>
+diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
+index dab91ac..fe6cde1 100644
+--- a/cmake/modules/FindGStreamer.cmake
++++ b/cmake/modules/FindGStreamer.cmake
+@@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND)
+ exec_program(${PKG_CONFIG_EXECUTABLE}
+ ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION}
+ OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR)
++ set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
+ endif()
+
+ find_library(GSTREAMER_LIBRARY
diff --git a/debian/patches/series b/debian/patches/series
index 42e15e2..b5666ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
disable-doxygen-timestamp.patch
find_gstconfig_properly.diff
upstream_workaround_boost_ftbfs.diff
+Furter-workarounds-for-build-failures-now-boost-1.61-and-.patch
diff --git a/debian/patches/upstream_workaround_boost_ftbfs.diff b/debian/patches/upstream_workaround_boost_ftbfs.diff
index 0a32a33..cec2f72 100644
--- a/debian/patches/upstream_workaround_boost_ftbfs.diff
+++ b/debian/patches/upstream_workaround_boost_ftbfs.diff
@@ -1,4 +1,3 @@
-From 1d2edcc9562c8826fd17b5233691f4a313ab71c7 Mon Sep 17 00:00:00 2001
From: Heiko Becker <heirecka at exherbo.org>
Date: Fri, 7 Nov 2014 00:11:02 +0100
Subject: Workaround build failures with boost>=1.57 and moc
@@ -12,6 +11,9 @@ The old workaround to define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
doesn't seem to work here.
https://bugzilla.gnome.org/show_bug.cgi?id=739752
+---
+ src/QGlib/connect.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
diff --git a/src/QGlib/connect.cpp b/src/QGlib/connect.cpp
index 9ff6fde..58a3367 100644
@@ -28,6 +30,3 @@ index 9ff6fde..58a3367 100644
#include <boost/multi_index/member.hpp>
namespace QGlib {
---
-cgit v0.10.2
-
--
qt-gstreamer packaging
More information about the pkg-kde-commits
mailing list