[SCM] guayadeque/master: Drop 02-wxsqlite3_linking.patch, applied by upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cd8c6f938aa83d236f9044ab1544f3f8ee89f435
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Mar 7 11:33:21 2014 +0000

    Drop 02-wxsqlite3_linking.patch, applied by upstream.

diff --git a/debian/patches/02-wxsqlite3_linking.patch b/debian/patches/02-wxsqlite3_linking.patch
deleted file mode 100644
index 5ad2649..0000000
--- a/debian/patches/02-wxsqlite3_linking.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Description: Link binaries against the system-wide copy of wxsqlite3.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: no
----
- CMakeLists.txt     |    6 ++++++
- src/CMakeLists.txt |    9 ++-------
- src/Db.h           |    2 +-
- src/DbLibrary.h    |    2 +-
- 4 files changed, 10 insertions(+), 9 deletions(-)
-
---- guayadeque.orig/CMakeLists.txt
-+++ guayadeque/CMakeLists.txt
-@@ -46,6 +46,11 @@ IF( NOT SQLITE3_LIBRARIES )
- 	MESSAGE( FATAL_ERROR "sqlite3 not found!" )
- ENDIF( NOT SQLITE3_LIBRARIES )
- 
-+PKG_CHECK_MODULES( WXSQLITE3 wxsqlite3-2.8 )
-+IF( NOT WXSQLITE3_LIBRARIES )
-+	MESSAGE( FATAL_ERROR "wxsqlite3 not found!" )
-+ENDIF( NOT WXSQLITE3_LIBRARIES )
-+
- PKG_CHECK_MODULES( LIBCURL libcurl )
- IF( NOT LIBCURL_LIBRARIES )
- 	MESSAGE( FATAL_ERROR "libcurl not found!" )
-@@ -131,6 +136,7 @@ INCLUDE_DIRECTORIES(${Guayadeque_SOURCE_
-                         ${GSTREAMER_INCLUDE_DIRS}
- 			${GSTREAMER_CTRL_INCLUDE_DIRS}
- 			${SQLITE3_INCLUDE_DIRS}
-+			${WXSQLITE3_INCLUDE_DIRS}
- 			${LIBCURL_INCLUDE_DIRS}
- 			${LIBTAG_INCLUDE_DIRS}
-               		${LIBDBUS_INCLUDE_DIRS}
---- guayadeque.orig/src/CMakeLists.txt
-+++ guayadeque/src/CMakeLists.txt
-@@ -11,15 +11,14 @@ ENDIF( PROFILE )
- 
- INCLUDE_DIRECTORIES(
- 	${CMAKE_CURRENT_SOURCE_DIR}
--	${CMAKE_CURRENT_SOURCE_DIR}/wx
- 	${CMAKE_CURRENT_SOURCE_DIR}/wx/curl
--	${CMAKE_CURRENT_SOURCE_DIR}/wxsqlite3
-         ${CMAKE_CURRENT_SOURCE_DIR}/dbus
- 	${CMAKE_CURRENT_SOURCE_DIR}/hmac
- 	${CMAKE_CURRENT_SOURCE_DIR}/execstream
-         ${GSTREAMER_INCLUDE_DIRS}
- 	${GSTREAMER_CTRL_INCLUDE_DIRS}
-         ${SQLITE3_INCLUDE_DIRS}
-+    ${WXSQLITE3_INCLUDE_DIRS}
-         ${LIBCURL_INCLUDE_DIRS}
-         ${LIBTAG_INCLUDE_DIRS}
- 	${LIBFLAC_INCLUDE_DIRS}
-@@ -30,10 +29,6 @@ INCLUDE_DIRECTORIES(
- 	${LIBAPPINDICATOR_INCLUDE_DIRS}
- )
- 
--SET( WXSQLITE3_SOURCES
--	wxsqlite3/wxsqlite3.cpp 
--)
--
- SET( CURL_SOURCES
- 	curl/base.cpp
- 	curl/http.cpp 
-@@ -280,7 +275,6 @@ ADD_EXECUTABLE( guayadeque
- 	SmartMode.h
- 	Yahoo.cpp
- 	Yahoo.h
--	${WXSQLITE3_SOURCES}
- 	${CURL_SOURCES}
-     	${DBUS_SOURCES}
- 	${HMAC_SHA2_SOURCES}
-@@ -291,6 +285,7 @@ TARGET_LINK_LIBRARIES( guayadeque
- 	${GSTREAMER_LIBRARIES}
- 	${GSTREAMER_CTRL_LIBRARIES}
- 	${SQLITE3_LIBRARIES}
-+	${WXSQLITE3_LIBRARIES}
- 	${LIBCURL_LIBRARIES}
-         ${LIBTAG_LIBRARIES}
- 	${LIBFLAC_LIBRARIES}
---- guayadeque.orig/src/DbLibrary.h
-+++ guayadeque/src/DbLibrary.h
-@@ -34,7 +34,7 @@
- #include <wx/dynarray.h>
- 
- // wxSqlite3
--#include "wx/wxsqlite3.h"
-+#include <wx/wxsqlite3.h>
- 
- #define GU_TRACKS_QUERYSTR   wxT( "SELECT song_id, song_name, song_genreid, song_genre, song_artistid, song_artist, "\
-                "song_albumartistid, song_albumartist, song_composerid, song_composer, song_albumid, song_album, "\
---- guayadeque.orig/src/Db.h
-+++ guayadeque/src/Db.h
-@@ -28,7 +28,7 @@
- #include <wx/utils.h>
- 
- // wxSqlite3
--#include "wx/wxsqlite3.h"
-+#include <wx/wxsqlite3.h>
- 
- // -------------------------------------------------------------------------------- //
- void inline escape_query_str( wxString * Str )
diff --git a/debian/patches/series b/debian/patches/series
index 349182b..1aa664d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-02-wxsqlite3_linking.patch
 03-curl_headers_location.patch

-- 
guayadeque packaging