Hello community,

here is the log from the commit of package texmaker for openSUSE:Factory 
checked in at 2015-10-25 19:13:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texmaker (Old)
 and      /work/SRC/openSUSE:Factory/.texmaker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "texmaker"

Changes:
--------
--- /work/SRC/openSUSE:Factory/texmaker/texmaker.changes        2015-08-15 
11:39:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.texmaker.new/texmaker.changes   2015-10-25 
19:13:11.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Oct 19 09:57:54 UTC 2015 - badshah...@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).
+
+-------------------------------------------------------------------

New:
----
  texmaker-include-qdatastream-header.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ texmaker.spec ++++++
--- /var/tmp/diff_new_pack.A6WndU/_old  2015-10-25 19:13:12.000000000 +0100
+++ /var/tmp/diff_new_pack.A6WndU/_new  2015-10-25 19:13:12.000000000 +0100
@@ -26,6 +26,8 @@
 Source:         http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM texmaker-correct-doc-location.patch badshah...@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 
badshah...@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 @@
 %prep
 %setup -q
 %patch1 -p1
+%if 0%{?suse_version} > 1320
+%patch2 -p1
+%endif
 
 %build
 %if 0%{?suse_version} == 1315

++++++ texmaker-include-qdatastream-header.patch ++++++
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>

Reply via email to