[SCM] qtmultimedia packaging branch, master, updated. debian/5.2.1-2-2-g4739350

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=4739350

The following commit has been merged in the master branch:
commit 47393509db1005933e7c5fb39eeec1d6c5b9c176
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Apr 2 15:13:14 2014 -0300

    Workaround https://bugreports.qt-project.org/browse/QTBUG-38061
---
 debian/changelog |  4 ++++
 debian/rules     | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ae330a8..0dc7100 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtmultimedia-opensource-src (5.2.1-3) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Workaround https://bugreports.qt-project.org/browse/QTBUG-38061 in
+    kfreebsd-* by replacing linux/types.h with sys/types.h.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 02 Apr 2014 15:00:22 -0300
 
 qtmultimedia-opensource-src (5.2.1-2) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 52eef98..ee11572 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,12 +10,22 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
+# Workaround for https://bugreports.qt-project.org/browse/QTBUG-38061
+fix_types_archs := kfreebsd-amd64 kfreebsd-i386
+
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtmultimedia5-dbg
 
 override_dh_auto_configure:
 	qmake
 
+# Use sys/types.h instead of linux/types.h
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(fix_types_archs)))
+override_dh_auto_build-arch:
+	find src/ -type f -exec grep -l "linux/types.h" {} \; | xargs sed -i 's|<linux/types.h>|<sys/types.h>|'
+	dh_auto_build-arch
+endif
+
 override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs
 

-- 
qtmultimedia packaging