From 4b7d6e7a7415cf401d5a6bb78c5dfb4bb08820c0 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sun, 7 Feb 2016 15:53:23 -0600
Subject: [PATCH] gcc6 FTBFS (#1305226), update URL

---
 qt-mobility-opensource-src-1.2.2-gcc6.patch | 20 ++++++++++++++++++++
 qt-mobility.spec                            | 14 ++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 qt-mobility-opensource-src-1.2.2-gcc6.patch

diff --git a/qt-mobility-opensource-src-1.2.2-gcc6.patch b/qt-mobility-opensource-src-1.2.2-gcc6.patch
new file mode 100644
index 0000000..4494175
--- /dev/null
+++ b/qt-mobility-opensource-src-1.2.2-gcc6.patch
@@ -0,0 +1,20 @@
+diff -up qt-mobility-opensource-src-1.2.2/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp.gcc6 qt-mobility-opensource-src-1.2.2/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp
+--- qt-mobility-opensource-src-1.2.2/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp.gcc6	2014-03-25 14:26:00.000000000 -0500
++++ qt-mobility-opensource-src-1.2.2/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp	2016-02-07 14:50:45.827775718 -0600
+@@ -342,12 +342,12 @@ struct RgbFormat
+ 
+ static const RgbFormat qt_rgbColorLookup[] =
+ {
+-    { QVideoFrame::Format_RGB32 , 32, 24, 4321, 0x0000FF00, 0x00FF0000, 0xFF000000, 0x00000000 },
++    { QVideoFrame::Format_RGB32 , 32, 24, 4321, 0x0000FF00, 0x00FF0000, (int)0xFF000000, 0x00000000 },
+     { QVideoFrame::Format_RGB32 , 32, 24, 1234, 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000 },
+-    { QVideoFrame::Format_BGR32 , 32, 24, 4321, 0xFF000000, 0x00FF0000, 0x0000FF00, 0x00000000 },
++    { QVideoFrame::Format_BGR32 , 32, 24, 4321, (int)0xFF000000, 0x00FF0000, 0x0000FF00, 0x00000000 },
+     { QVideoFrame::Format_BGR32 , 32, 24, 1234, 0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000 },
+-    { QVideoFrame::Format_ARGB32, 32, 24, 4321, 0x0000FF00, 0x00FF0000, 0xFF000000, 0x000000FF },
+-    { QVideoFrame::Format_ARGB32, 32, 24, 1234, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000 },
++    { QVideoFrame::Format_ARGB32, 32, 24, 4321, 0x0000FF00, 0x00FF0000, (int)0xFF000000, 0x000000FF },
++    { QVideoFrame::Format_ARGB32, 32, 24, 1234, 0x00FF0000, 0x0000FF00, 0x000000FF, (int)0xFF000000 },
+     { QVideoFrame::Format_RGB24 , 24, 24, 4321, 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000 },
+     { QVideoFrame::Format_BGR24 , 24, 24, 4321, 0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000 },
+     { QVideoFrame::Format_RGB565, 16, 16, 1234, 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }
diff --git a/qt-mobility.spec b/qt-mobility.spec
index 51730ae..537309b 100644
--- a/qt-mobility.spec
+++ b/qt-mobility.spec
@@ -9,12 +9,12 @@
 Name:    qt-mobility
 Summary: Qt Mobility Framework
 Version: 1.2.2
-Release: 0.22.%{snap}git%{git_short}%{?dist}
+Release: 0.23.%{snap}git%{git_short}%{?dist}
 
 License: LGPLv2 with exceptions
-URL:     http://qt.digia.com/Product/Qt-Add-Ons/
+URL:     https://code.qt.io/cgit/qt-mobility/qt-mobility.git
 %if 0%{?snap:1}
-# git clone git://gitorious.org/qt-mobility/qt-mobility.git
+# git clone https://code.qt.io/qt-mobility/qt-mobility.git
 # cd qt-mobility; git archive --prefix=qt-mobility-opensource-src-%{version}/ %{git_long} | xz -9 >  qt-mobility-opensources-src-%{version}-%{git_short}.tar.xz
 Source0: qt-mobility-opensource-src-%{version}-%{git_short}.tar.xz
 %else
@@ -36,6 +36,8 @@ Patch51: qt-mobility-opensource-src-1.2.2-pkgconfig.patch
 Patch52: qt-mobility-opensource-src-1.2.2-sensors_ftbfs.patch
 # dso
 Patch53: qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch
+# gcc6 FTBFS
+Patch54: qt-mobility-opensource-src-1.2.2-gcc6.patch
 
 ## upstream patches
 
@@ -239,6 +241,7 @@ rm -r src/3rdparty/proj
 %patch51 -p1 -b .pkgconfig
 %patch52 -p1 -b .sensors_ftbfs
 %patch53 -p1 -b .pulseaudio_lib
+%patch54 -p1 -b .gcc6
 
 
 %build
@@ -259,7 +262,7 @@ PATH=%{_qt4_bindir}:$PATH; export PATH
 # consider using qmake wrapper for -qmake-exec above in that case -- rex
 %{qmake_qt4} -r
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 make %{?_smp_mflags} qch_docs
 
@@ -442,6 +445,9 @@ cp -a doc/html/* %{buildroot}%{_qt4_docdir}/html/qtmobility/
 
 
 %changelog
+* Sun Feb 07 2016 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-0.23.20140317git169da60c
+- gcc6 FTBFS (#1305226), update URL
+
 * Wed Feb 03 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.2.2-0.22.20140317git169da60c
 - use %%qmake_qt4 macro to ensure proper build flags