[SCM] dataquay/master: Dropping/Refreshing patches.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Tue Jul 19 07:40:58 UTC 2016
The following commit has been merged in the master branch:
commit 2d96752c4bb31af3161c518dc1ece7b34a1d3c5b
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Mon Jul 18 16:41:42 2016 +0200
Dropping/Refreshing patches.
diff --git a/debian/patches/01-build-fix.patch b/debian/patches/01-build-fix.patch
deleted file mode 100644
index a2d2cf3..0000000
--- a/debian/patches/01-build-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Patch fixing build
-Author: Chris Cannam <chris.cannam at breakfastquay.com>
-Forwarded: no
-
-Index: dataquay/tests/main.cpp
-===================================================================
---- dataquay.orig/tests/main.cpp 2012-11-15 09:21:06.534763985 +0100
-+++ dataquay/tests/main.cpp 2012-11-15 13:05:42.641588378 +0100
-@@ -42,7 +42,7 @@
- {
- int good = 0, bad = 0;
-
-- QApplication app(argc, argv);
-+ QCoreApplication app(argc, argv);
-
- Dataquay::TestBasicStore tbs;
- if (QTest::qExec(&tbs, argc, argv) == 0) ++good;
diff --git a/debian/patches/02-multiarch.patch b/debian/patches/02-multiarch.patch
index a9e5119..3c3f5bc 100644
--- a/debian/patches/02-multiarch.patch
+++ b/debian/patches/02-multiarch.patch
@@ -6,34 +6,16 @@ Forwarded: yes
lib.pro | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---- dataquay.orig/deploy/dataquay.pc.in
-+++ dataquay/deploy/dataquay.pc.in
-@@ -1,6 +1,6 @@
- prefix=%PREFIX%
-+libdir=%LIBDIR%
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
- includedir=${prefix}/include
-
- Name: dataquay
+Index: dataquay/lib.pro
+===================================================================
--- dataquay.orig/lib.pro
+++ dataquay/lib.pro
-@@ -66,12 +66,15 @@ linux* {
- isEmpty(PREFIX) {
- PREFIX = /usr/local
- }
-- target.path = $${PREFIX}/lib
-+ isEmpty(LIBDIR) {
-+ LIBDIR = /usr/lib
-+ }
-+ target.path = $${LIBDIR}
+@@ -74,7 +74,7 @@ linux* {
+ target.path = $${LIBDIR}
includes.path = $${PREFIX}/include
includes.files = dataquay
- pkgconfig.path = $${PREFIX}/lib/pkgconfig
+ pkgconfig.path = $${LIBDIR}/pkgconfig
pkgconfig.files = deploy/dataquay.pc
-- pkgconfig.extra = sed -e "'"s.%PREFIX%.$${PREFIX}."'" -e "'"s.%EXTRALIBS%.$${EXTRALIBS}."'" deploy/dataquay.pc.in > deploy/dataquay.pc
-+ pkgconfig.extra = sed -e "'"s.%PREFIX%.$${PREFIX}."'" -e "'"s.%LIBDIR%.$${LIBDIR}."'" -e "'"s.%EXTRALIBS%.$${EXTRALIBS}."'" deploy/dataquay.pc.in > deploy/dataquay.pc
+ pkgconfig.extra = sed -e "'"s.%PREFIX%.$${PREFIX}."'" -e "'"s.%LIBDIR%.$${LIBDIR}."'" -e "'"s.%EXTRALIBS%.$${EXTRALIBS}."'" deploy/dataquay.pc.in > deploy/dataquay.pc
INSTALLS += target includes pkgconfig
- }
-
diff --git a/debian/patches/03-ldflags.patch b/debian/patches/03-ldflags.patch
index db5cb95..2c3fa10 100644
--- a/debian/patches/03-ldflags.patch
+++ b/debian/patches/03-ldflags.patch
@@ -5,10 +5,12 @@ Forwarded: yes
lib.pro | 2 ++
1 file changed, 2 insertions(+)
+Index: dataquay/lib.pro
+===================================================================
--- dataquay.orig/lib.pro
+++ dataquay/lib.pro
@@ -7,6 +7,8 @@ TEMPLATE = lib
- CONFIG += warn_on
+ CONFIG += warn_on staticlib c++11
QT -= gui
+QMAKE_LFLAGS_SHLIB *= $(LDFLAGS)
diff --git a/debian/patches/04-libs.patch b/debian/patches/04-libs.patch
index 4b68b82..02162e0 100644
--- a/debian/patches/04-libs.patch
+++ b/debian/patches/04-libs.patch
@@ -5,9 +5,11 @@ Forwarded: yes
lib.pro | 1 +
1 file changed, 1 insertion(+)
+Index: dataquay/lib.pro
+===================================================================
--- dataquay.orig/lib.pro
+++ dataquay/lib.pro
-@@ -23,6 +23,7 @@ INCLUDEPATH += dataquay
+@@ -25,6 +25,7 @@ INCLUDEPATH += dataquay
!debug:DEFINES += NDEBUG
diff --git a/debian/patches/05-build_with_qt5.patch b/debian/patches/05-build_with_qt5.patch
deleted file mode 100644
index bad7797..0000000
--- a/debian/patches/05-build_with_qt5.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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 017a28c..7acec81 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-01-build-fix.patch
02-multiarch.patch
03-ldflags.patch
04-libs.patch
-05-build_with_qt5.patch
--
dataquay packaging
More information about the pkg-multimedia-commits
mailing list