Accepting request 339837 from home:badshah400:branches:Publishing

Patch-fix builds for Factory (TW)

OBS-URL: https://build.opensuse.org/request/show/339837
OBS-URL: https://build.opensuse.org/package/show/Publishing/texmaker?expand=0&rev=73

texmaker-include-qdatastream-header.patch

@@ -0,0 +1,12 @@
+Index: texmaker-4.4.1/singleapp/qtlocalpeer.cpp
+===================================================================
+--- texmaker-4.4.1.orig/singleapp/qtlocalpeer.cpp
++++ texmaker-4.4.1/singleapp/qtlocalpeer.cpp
+@@ -42,6 +42,7 @@
+ #include "qtlocalpeer.h"
+ #include <QCoreApplication>
+ #include <QTime>
++#include <QDataStream>
+ 
+ #if defined(Q_OS_WIN)
+ #include <QLibrary>

texmaker.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 19 09:57:54 UTC 2015 - badshah400@gmail.com
+
+- Add texmaker-include-qdatastream-header.patch to include
+  the QDataStream header where appropriate; fixes build failures
+  with Qt >= 5.5 (now in Factory).
+
 -------------------------------------------------------------------
 Sat Aug 15 04:46:52 UTC 2015 - badshah400@gmail.com
 

texmaker.spec

@@ -26,6 +26,8 @@ Url:            http://www.xm1math.net/texmaker/
 Source:         http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM texmaker-correct-doc-location.patch badshah400@gmail.com -- Handle doc files in the spec file rather than placing them in %%{_datadir} during compilation
 Patch1:         texmaker-correct-doc-location.patch
+# PATCH-FIX-UPSTREAM texmaker-include-qdatastream-header.patch badshah400@gmail.com -- Include the qdatasream header to prevent build failures with Qt >= 5.5
+Patch2:         texmaker-include-qdatastream-header.patch
 BuildRequires:  fdupes
 BuildRequires:  update-desktop-files
 %if 0%{?suse_version} == 1315
@@ -58,6 +60,9 @@ under the GPL license .
 %prep
 %setup -q
 %patch1 -p1
+%if 0%{?suse_version} > 1320
+%patch2 -p1
+%endif
 
 %build
 %if 0%{?suse_version} == 1315