Control: tags 868612 + patch pending I've prepared an NMU for mixxx (versioned as 2.0.0~dfsg-7.1) incorporating the patch from James Cowgill for #868612 and the pending change from pkg-multimedia git, and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer.
The changes can also be fetched from the 'nmu' branch in this git repository: https://anonscm.debian.org/git/users/smcv/mixxx.git Regards, S
diffstat for mixxx-2.0.0~dfsg mixxx-2.0.0~dfsg changelog | 13 +++++ control | 1 patches/0009-Include-sqlite3.h-instead-of-forward-declaring-typed.patch | 26 ++++++++++ patches/series | 1 patches/ubuntu.series | 1 5 files changed, 41 insertions(+), 1 deletion(-) diff -Nru mixxx-2.0.0~dfsg/debian/changelog mixxx-2.0.0~dfsg/debian/changelog --- mixxx-2.0.0~dfsg/debian/changelog 2017-01-11 20:04:24.000000000 +0000 +++ mixxx-2.0.0~dfsg/debian/changelog 2017-07-24 11:08:10.000000000 +0100 @@ -1,3 +1,16 @@ +mixxx (2.0.0~dfsg-7.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Sebastian Ramacher ] + * Remove used B-D on libaudiofile-dev + + [ Simon McVittie ] + * Add patch from James Cowgill to fix FTBFS with newer sqlite3 + (Closes: #868612) + + -- Simon McVittie <s...@debian.org> Mon, 24 Jul 2017 11:08:10 +0100 + mixxx (2.0.0~dfsg-7) unstable; urgency=medium * Team upload. diff -Nru mixxx-2.0.0~dfsg/debian/control mixxx-2.0.0~dfsg/debian/control --- mixxx-2.0.0~dfsg/debian/control 2017-01-11 19:47:04.000000000 +0000 +++ mixxx-2.0.0~dfsg/debian/control 2017-07-24 11:08:10.000000000 +0100 @@ -11,7 +11,6 @@ chrpath, debhelper (>= 9), docbook-to-man, - libaudiofile-dev, libchromaprint-dev, libexpat-dev, libfftw3-dev, diff -Nru mixxx-2.0.0~dfsg/debian/patches/0009-Include-sqlite3.h-instead-of-forward-declaring-typed.patch mixxx-2.0.0~dfsg/debian/patches/0009-Include-sqlite3.h-instead-of-forward-declaring-typed.patch --- mixxx-2.0.0~dfsg/debian/patches/0009-Include-sqlite3.h-instead-of-forward-declaring-typed.patch 1970-01-01 01:00:00.000000000 +0100 +++ mixxx-2.0.0~dfsg/debian/patches/0009-Include-sqlite3.h-instead-of-forward-declaring-typed.patch 2017-07-24 11:08:10.000000000 +0100 @@ -0,0 +1,26 @@ +From: James Cowgill <jcowg...@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 -Nru mixxx-2.0.0~dfsg/debian/patches/series mixxx-2.0.0~dfsg/debian/patches/series --- mixxx-2.0.0~dfsg/debian/patches/series 2017-01-11 19:55:53.000000000 +0000 +++ mixxx-2.0.0~dfsg/debian/patches/series 2017-07-24 11:08:10.000000000 +0100 @@ -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 -Nru mixxx-2.0.0~dfsg/debian/patches/ubuntu.series mixxx-2.0.0~dfsg/debian/patches/ubuntu.series --- mixxx-2.0.0~dfsg/debian/patches/ubuntu.series 2017-01-11 19:56:01.000000000 +0000 +++ mixxx-2.0.0~dfsg/debian/patches/ubuntu.series 2017-07-24 11:08:10.000000000 +0100 @@ -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
_______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
