[Pkg-mpd-commits] [qmpdclient] 36/38: Use system libmpd.

Andrey Rahmatullin wrar at moszumanska.debian.org
Mon May 23 07:19:47 UTC 2016 

This is an automated email from the git hooks/post-receive script.

wrar pushed a commit to branch master
in repository qmpdclient.

commit f0e75cf7edb3cffc7ce99121c88a9aeb1fd9c89d
Author: Andrey Rakhmatullin <wrar at wrar.name>
Date:   Sat May 21 20:35:33 2016 +0500

    Use system libmpd.
---
 debian/control                               |   3 +-
 debian/patches/series                        |   1 +
 debian/patches/use-system-libmpdclient.patch | 159 +++++++++++++++++++++++++++
 3 files changed, 162 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 3a4611a..87c6f1d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: sound
 Priority: optional
 Maintainer: mpd maintainers <pkg-mpd-maintainers at lists.alioth.debian.org>
 Uploaders: Andrey Rahmatullin <wrar at debian.org>
-Build-Depends: debhelper (>= 9), cmake, libqt4-dev, libx11-dev
+# libglib2.0-dev is added because libmpd-dev needs it but doesn't depend on it, see #518429
+Build-Depends: debhelper (>= 9), cmake, libqt4-dev, libx11-dev, libglib2.0-dev, libmpd-dev
 Standards-Version: 3.9.8
 Homepage: http://bitcheese.net/wiki/QMPDClient
 Vcs-Git: https://anonscm.debian.org/git/pkg-mpd/qmpdclient.git
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8e6ea08
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-system-libmpdclient.patch
diff --git a/debian/patches/use-system-libmpdclient.patch b/debian/patches/use-system-libmpdclient.patch
new file mode 100644
index 0000000..7daa043
--- /dev/null
+++ b/debian/patches/use-system-libmpdclient.patch
@@ -0,0 +1,159 @@
+Description: Use system libmpd instead of bundled one
+Author: Andrey Rahmatullin <wrar at debian.org>
+Last-Update: 2016-05-21
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b65c2c9..5c0a232 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ cmake_minimum_required(VERSION 2.6)
+ 
+ find_package(Qt4 4.4.0 COMPONENTS QtCore QtGui QtNetwork QtXml QtXmlPatterns REQUIRED QtDBus)
++include(FindPkgConfig)
++pkg_check_modules(LIBMPD libmpd REQUIRED)
+ if(UNIX)
+ 	if(NOT MAC)
+ 		find_package(X11 REQUIRED)
+@@ -50,7 +52,6 @@ set(QMPDClient_srcs
+ 	src/idealbar.cpp
+ 	src/idealsplitter.cpp
+ 	src/lastfmsubmitter.cpp
+-	src/libmpdclient.c
+ 	src/librarypanel.cpp
+ 	src/lineedit.cpp
+ 	src/lyricsdialog.cpp
+@@ -134,7 +135,6 @@ set(QMPDClient_hdrs
+ 	src/idealbar.h
+ 	src/idealsplitter.h
+ 	src/lastfmsubmitter.h
+-	src/libmpdclient.h
+ 	src/librarypanel.h
+ 	src/lineedit.h
+ 	src/lyricsdialog.h
+@@ -296,6 +296,8 @@ if(WIN32)
+ 	target_link_libraries(qmpdclient ws2_32)
+ 	set_target_properties(qmpdclient PROPERTIES WIN32_EXECUTABLE TRUE)
+ endif()
++target_include_directories(qmpdclient PRIVATE ${LIBMPD_INCLUDE_DIRS})
++target_link_libraries(qmpdclient ${LIBMPD_LIBRARIES})
+ 
+ if(UNIX)
+ 	install(TARGETS qmpdclient DESTINATION bin)
+diff --git a/src/libmpdclient.c b/src/libmpdclient.c
+index 567d4bc..47eb6e5 100644
+--- a/src/libmpdclient.c
++++ b/src/libmpdclient.c
+@@ -35,7 +35,7 @@
+ #  define _CRT_NONSTDC_NO_DEPRECATE 1
+ #endif
+ 
+-#include "libmpdclient.h"
++#include <libmpd/libmpd.h>
+ 
+ #include <errno.h>
+ #include <ctype.h>
+diff --git a/src/mpd.cpp b/src/mpd.cpp
+index b036149..89a566e 100644
+--- a/src/mpd.cpp
++++ b/src/mpd.cpp
+@@ -17,7 +17,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  */
+ 
+-#include "libmpdclient.h"
++#include <libmpd/libmpd.h>
+ #include "mpd.h"
+ #include "mpd_p.h"
+ #include <QTimer>
+diff --git a/src/mpd_p.h b/src/mpd_p.h
+index 27876ee..62d0fa2 100644
+--- a/src/mpd_p.h
++++ b/src/mpd_p.h
+@@ -17,7 +17,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  */
+ 
+-#include "libmpdclient.h"
++#include <libmpd/libmpd.h>
+ #include "mpd.h"
+ #include "mpdcache.h"
+ #include "mpdconnection.h"
+diff --git a/src/mpdcache.cpp b/src/mpdcache.cpp
+index 90f6a3b..4ce606c 100644
+--- a/src/mpdcache.cpp
++++ b/src/mpdcache.cpp
+@@ -21,7 +21,7 @@
+ #include "aafilter.h"
+ #include "config.h"
+ #include "debug.h"
+-#include "libmpdclient.h"
++#include <libmpd/libmpd.h>
+ #include "mpdconnection.h"
+ #include "mpddirectory.h"
+ #include "mpdentities.h"
+diff --git a/src/mpdconnection.cpp b/src/mpdconnection.cpp
+index 8d61d2d..c679a79 100644
+--- a/src/mpdconnection.cpp
++++ b/src/mpdconnection.cpp
+@@ -18,7 +18,7 @@
+  */
+ 
+ #include "config.h"
+-#include "libmpdclient.h"
++#include <libmpd/libmpd.h>
+ #include "mpdconnection.h"
+ #include "mpdentities.h"
+ #include "mpdoutput.h"
+diff --git a/src/mpdoutput.cpp b/src/mpdoutput.cpp
+index c686974..58ed00e 100644
+--- a/src/mpdoutput.cpp
++++ b/src/mpdoutput.cpp
+@@ -17,7 +17,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  */
+ 
+-#include "libmpdclient.h"
++#include <libmpd/libmpd.h>
+ #include "mpdoutput.h"
+ #include <QString>
+ 
+diff --git a/src/mpdsong.cpp b/src/mpdsong.cpp
+index 2d9cd96..cc6f6a4 100644
+--- a/src/mpdsong.cpp
++++ b/src/mpdsong.cpp
+@@ -17,7 +17,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  */
+ 
+-#include "libmpdclient.h"
++#include <libmpd/libmpd.h>
+ #include "mpdsong.h"
+ #include "config.h"
+ #include "tagguesser.h"
+diff --git a/src/mpdstats.cpp b/src/mpdstats.cpp
+index 63bb2dc..82266a2 100644
+--- a/src/mpdstats.cpp
++++ b/src/mpdstats.cpp
+@@ -17,7 +17,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  */
+ 
+-#include "libmpdclient.h"
++#include <libmpd/libmpd.h>
+ #include "mpdstats.h"
+ #include <QString>
+ 
+diff --git a/src/mpdstatus.cpp b/src/mpdstatus.cpp
+index 2105964..ae9fa4e 100644
+--- a/src/mpdstatus.cpp
++++ b/src/mpdstatus.cpp
+@@ -17,7 +17,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  */
+ 
+-#include "libmpdclient.h"
++#include <libmpd/libmpd.h>
+ #include "mpdstatus.h"
+ #include <QString>
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/qmpdclient.git

More information about the Pkg-mpd-commits mailing list