[SCM] mixxx/master: Add patch from James Cowgill to fix FTBFS with newer sqlite3
mattia at users.alioth.debian.org
mattia at users.alioth.debian.org
Mon Jul 24 12:03:14 UTC 2017
The following commit has been merged in the master branch:
commit a017d4d2feb9a4228b89bec5e1b7b3e77c8bf1af
Author: Simon McVittie <smcv at debian.org>
Date: Mon Jul 24 11:08:08 2017 +0100
Add patch from James Cowgill to fix FTBFS with newer sqlite3
Closes: #868612
diff --git a/debian/patches/0009-Include-sqlite3.h-instead-of-forward-declaring-typed.patch b/debian/patches/0009-Include-sqlite3.h-instead-of-forward-declaring-typed.patch
new file mode 100644
index 0000000..868fd0e
--- /dev/null
+++ b/debian/patches/0009-Include-sqlite3.h-instead-of-forward-declaring-typed.patch
@@ -0,0 +1,26 @@
+From: James Cowgill <jcowgill at debian.org>
+Date: Mon, 17 Jul 2017 14:01:04 +0100
+Subject: Include sqlite3.h instead of forward-declaring typedefs
+
+This fixes FTBFS with libsqlite3-dev 3.19.3-3.
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=868612
+Forwarded: no, upstream appears to have rewritten the sqlite3 code
+---
+ src/library/trackcollection.h | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/library/trackcollection.h b/src/library/trackcollection.h
+index 0ce9a23..fb66ce6 100644
+--- a/src/library/trackcollection.h
++++ b/src/library/trackcollection.h
+@@ -34,8 +34,7 @@
+ #include "library/dao/libraryhashdao.h"
+
+ #ifdef __SQLITE3__
+-typedef struct sqlite3_context sqlite3_context;
+-typedef struct Mem sqlite3_value;
++#include <sqlite3.h>
+ #endif
+
+ class TrackInfoObject;
diff --git a/debian/patches/series b/debian/patches/series
index 50dd5fb..3debb98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
0006-opengles.patch
0007-fix_gcc6_issue.patch
0008-chromaprint-1.4.patch
+0009-Include-sqlite3.h-instead-of-forward-declaring-typed.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 2b024e5..2352523 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -5,3 +5,4 @@
0006-opengles.patch
0007-fix_gcc6_issue.patch
0008-chromaprint-1.4.patch
+0009-Include-sqlite3.h-instead-of-forward-declaring-typed.patch
--
mixxx packaging
More information about the pkg-multimedia-commits
mailing list