[SCM] sonic-visualiser/master: Patch refreshed.

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

The following commit has been merged in the master branch:
commit eb52d5a9c62017b5e83d6375822b801f5d314f79
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Sep 5 15:31:53 2017 +0200

    Patch refreshed.

diff --git a/debian/patches/01_disable-internal-dataquay.patch b/debian/patches/01_disable-internal-dataquay.patch
index 955d1dc..5b78751 100644
--- a/debian/patches/01_disable-internal-dataquay.patch
+++ b/debian/patches/01_disable-internal-dataquay.patch
@@ -1,65 +1,18 @@
 Description: Build against systemwide dataquay
 Forwarded: No
 
-Index: sonic-visualiser/sv.pro
-===================================================================
---- sonic-visualiser.orig/sv.pro
-+++ sonic-visualiser/sv.pro
-@@ -56,10 +56,10 @@ RC_FILE = icons/sv.rc
- 
- contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
- 
--MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Ldataquay -lsvapp -lsvgui -lsvcore -ldataquay
-+MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -lsvapp -lsvgui -lsvcore
- 
- linux* {
--MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic
-+MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic -ldataquay
- }
- 
- win* {
-@@ -77,8 +77,7 @@ PRE_TARGETDEPS += svapp/release/libsvapp
- !win* {
- PRE_TARGETDEPS += svapp/libsvapp.a \
-                   svgui/libsvgui.a \
--                  svcore/libsvcore.a \
--                  dataquay/libdataquay.a
-+                  svcore/libsvcore.a
- }
- 
- RESOURCES += sonic-visualiser.qrc
-Index: sonic-visualiser/sonic-visualiser.pro
-===================================================================
---- sonic-visualiser.orig/sonic-visualiser.pro
-+++ sonic-visualiser/sonic-visualiser.pro
-@@ -1,16 +1,14 @@
- TEMPLATE = subdirs
--SUBDIRS = sub_dataquay svcore svgui svapp sub_sv 
-+SUBDIRS = svcore svgui svapp sub_sv
- 
- !win* {
-     # We should build and run the tests on any platform,
-     # but doing it automatically doesn't work so well from
-     # within an IDE on Windows, so remove that from here
--    SUBDIRS += svcore/base/test svcore/data/fileio/test svcore/data/model/test
- }
- 
- sub_sv.file = sv.pro
- 
--sub_dataquay.file = dataquay/lib.pro
- 
- svgui.depends = svcore
- svapp.depends = svcore svgui
 Index: sonic-visualiser/svcore/svcore.pro
 ===================================================================
 --- sonic-visualiser.orig/svcore/svcore.pro
 +++ sonic-visualiser/svcore/svcore.pro
-@@ -36,7 +36,7 @@ QT -= gui
+@@ -13,8 +13,8 @@ QT -= gui
+ 
  TARGET = svcore
  
- DEPENDPATH += . data plugin plugin/api/alsa
--INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay
-+INCLUDEPATH += . data plugin plugin/api/alsa
+-DEPENDPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp
+-INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp
++DEPENDPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp
++INCLUDEPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp
  OBJECTS_DIR = o
  MOC_DIR = o
  

-- 
sonic-visualiser packaging