[SCM] dataquay/master: Build with qt5.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5abb89cfa3fb85f2359d193e67be52c1dba8f355
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Oct 6 22:48:52 2014 +0200

    Build with qt5.

diff --git a/debian/control b/debian/control
index 81b4714..97544a9 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Jaromír Mikeš <mira.mikes at seznam.cz>
 Build-Depends:
  debhelper (>= 9),
- libqt4-dev,
+ qtbase5-dev,
  librdf0-dev
 Standards-Version: 3.9.6
 Homepage: http://breakfastquay.com/dataquay/
diff --git a/debian/patches/05-build_with_qt5.patch b/debian/patches/05-build_with_qt5.patch
new file mode 100644
index 0000000..bad7797
--- /dev/null
+++ b/debian/patches/05-build_with_qt5.patch
@@ -0,0 +1,75 @@
+Description: Build with qt5.
+Forwarded: no
+---
+Index: dataquay/src/Node.cpp
+===================================================================
+--- dataquay.orig/src/Node.cpp
++++ dataquay/src/Node.cpp
+@@ -304,7 +304,7 @@ Node::fromVariant(const QVariant &v)
+         Node n;
+         n.type = Literal;
+         n.datatype = encodedVariantTypeURI;
+-        n.value = QString::fromAscii(qCompress(b).toBase64());        
++        n.value = QString::fromLatin1(qCompress(b).toBase64());        
+         return n;
+     }
+ }
+@@ -328,7 +328,7 @@ Node::toVariant() const
+         // Opaque encoding used for "unknown" types.  If this is
+         // encoding is in use, we must decode from it even if the type
+         // is actually known
+-        QByteArray benc = value.toAscii();
++        QByteArray benc = value.toLatin1();
+         QByteArray b = qUncompress(QByteArray::fromBase64(benc));
+         QDataStream ds(&b, QIODevice::ReadOnly);
+         QVariant v;
+Index: dataquay/src/Store.cpp
+===================================================================
+--- dataquay.orig/src/Store.cpp
++++ dataquay/src/Store.cpp
+@@ -33,14 +33,16 @@
+ 
+ #include "Store.h"
+ 
++#include <QDataStream>
++
+ QDataStream &operator<<(QDataStream &out, const Dataquay::ChangeType &ct)
+ {
+-    return (out << (int)ct);
++    return (out << (qint32)ct);
+ }
+ 
+ QDataStream &operator>>(QDataStream &in, Dataquay::ChangeType &ct)
+ {
+-    int i;
++    qint32 i;
+     in >> i;
+     ct = (Dataquay::ChangeType)i;
+     return in;
+Index: dataquay/src/objectmapper/ObjectMapperForwarder.cpp
+===================================================================
+--- dataquay.orig/src/objectmapper/ObjectMapperForwarder.cpp
++++ dataquay/src/objectmapper/ObjectMapperForwarder.cpp
+@@ -74,7 +74,7 @@ ObjectMapperForwarder::ObjectMapperForwa
+         // through the public API.
+ 
+         QString sig = QString("%1%2").arg(QSIGNAL_CODE)
+-            .arg(property.notifySignal().signature());
++            .arg(property.notifySignal().methodSignature().data());
+         QByteArray ba = sig.toLocal8Bit();
+         
+         if (!connect(o, ba.data(), this, SLOT(objectModified()))) {
+Index: dataquay/tests/TestBasicStore.h
+===================================================================
+--- dataquay.orig/tests/TestBasicStore.h
++++ dataquay/tests/TestBasicStore.h
+@@ -444,8 +444,7 @@ private slots:
+ 	    QCOMPARE(v.value, expected);
+ 
+ 	} catch (RDFUnsupportedError &e) {
+-	    QSKIP("SPARQL queries not supported by current store backend",
+-		  SkipSingle);
++	    QSKIP("SPARQL queries not supported by current store backend");
+ 	}
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1662dc3..017a28c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 01-build-fix.patch
 02-multiarch.patch
 03-ldflags.patch
-#04-libs.patch
+04-libs.patch
+05-build_with_qt5.patch
diff --git a/debian/rules b/debian/rules
index dc684a7..fa1c0fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+export QT_SELECT := qt5
+
 %:
 	dh $@
 

-- 
dataquay packaging