Control: tags -1 patch upstream

Hi,

On 17/07/17 00:55, Adrian Bunk wrote:
> Source: mixxx
> Version: 2.0.0~dfsg-7
> Severity: serious
> Tags: buster sid
> 
> https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/mixxx.html
> 
> ...
> In file included from src/library/trackcollection.cpp:7:0:
> /usr/include/sqlite3.h:3712:16: error: using typedef-name 'sqlite3_value' 
> after 'struct'
>  typedef struct sqlite3_value sqlite3_value;
>                 ^~~~~~~~~~~~~
> In file included from src/library/trackcollection.cpp:4:0:
> src/library/trackcollection.h:38:20: note: 'sqlite3_value' has a previous 
> declaration here
>  typedef struct Mem sqlite3_value;
>                     ^~~~~~~~~~~~~
> In file included from src/library/trackcollection.cpp:7:0:
> /usr/include/sqlite3.h:3712:30: error: conflicting declaration 'typedef int 
> sqlite3_value'
>  typedef struct sqlite3_value sqlite3_value;
>                               ^~~~~~~~~~~~~
> In file included from src/library/trackcollection.cpp:4:0:
> src/library/trackcollection.h:38:20: note: previous declaration as 'typedef 
> struct Mem sqlite3_value'
>  typedef struct Mem sqlite3_value;
>                     ^~~~~~~~~~~~~
> scons: *** [lin64_build/library/trackcollection.o] Error 1

The attached patch should fix this.

Upstream appears to have completely rewritten the sqlite3 code so this
patch can't really be applied upstream.

James
--- 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;

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to