[mixxx] Fix sqlite typedef issue

commit 169d435dc9cf4bf7a39d99139cc9124bc41ac145 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Tue Sep 12 13:20:15 2017 +0100 Fix sqlite typedef issue mixxx.spec | 7 ++++++- remove_sqlite_typedef.patch | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) --- diff --git a/mixxx.spec b/mixxx.spec index a6bf1d8..d23070a 100644 --- a/mixxx.spec +++ b/mixxx.spec @@ -5,7 +5,7 @@ Name: mixxx Version: 2.0.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Mixxx is open source software for DJ'ing Group: Applications/Multimedia @@ -17,6 +17,7 @@ Patch1: %{name}-gcc6.patch Patch2: %{name}-arm.patch Patch3: AppData_fix.patch Patch4: fix_udev_rules.patch +Patch5: remove_sqlite_typedef.patch #Build tools @@ -76,6 +77,7 @@ controllers including MIDI devices, and more. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # TODO remove bundle libs #rm -rf lib/vamp-2.3 lib/xwax lib/gmock-1.7.0 lib/gtest-1.7.0 @@ -130,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir} %{_datadir}/appdata/%{name}.appdata.xml %changelog +* Tue Sep 12 2017 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 2.0.0-11 +- Fix sqlite typedef issue + * Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - 2.0.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/remove_sqlite_typedef.patch b/remove_sqlite_typedef.patch new file mode 100644 index 0000000..b29b255 --- /dev/null +++ b/remove_sqlite_typedef.patch @@ -0,0 +1,27 @@ +--- a/src/library/trackcollection.cpp ++++ b/src/library/trackcollection.cpp +@@ -2,10 +2,6 @@ + #include <QtDebug> + + #include "library/trackcollection.h" +- +-#ifdef __SQLITE3__ +-#include <sqlite3.h> +-#endif + + #include "library/librarytablemodel.h" + #include "library/schemamanager.h" + +--- 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; +