Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/, media-sound/mixxx/files/
Date: Thu, 10 Aug 2017 23:55:52
Message-Id: 1502409343.a97286de5285e5dcb4f707c5fa3b24c5a5ed8c21.polynomial-c@gentoo
1 commit: a97286de5285e5dcb4f707c5fa3b24c5a5ed8c21
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 10 23:55:26 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 10 23:55:43 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a97286de
7
8 media-sound/mixxx: Fixed build with recent sqlite versions (bug #622776).
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.3
11
12 media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch | 14 ++++++++++++++
13 media-sound/mixxx/mixxx-2.0.0-r4.ebuild | 2 ++
14 2 files changed, 16 insertions(+)
15
16 diff --git a/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch b/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch
17 new file mode 100644
18 index 00000000000..a8cb15e63c6
19 --- /dev/null
20 +++ b/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch
21 @@ -0,0 +1,14 @@
22 +https://bugs.gentoo.org/622776
23 +
24 +--- mixxx-2.0.0/src/library/trackcollection.h
25 ++++ mixxx-2.0.0/src/library/trackcollection.h
26 +@@ -34,8 +34,7 @@
27 + #include "library/dao/libraryhashdao.h"
28 +
29 + #ifdef __SQLITE3__
30 +-typedef struct sqlite3_context sqlite3_context;
31 +-typedef struct Mem sqlite3_value;
32 ++#include <sqlite3.h>
33 + #endif
34 +
35 + class TrackInfoObject;
36
37 diff --git a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
38 index 3b71fc236f6..1d968f368e3 100644
39 --- a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
40 +++ b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
41 @@ -77,6 +77,8 @@ PATCHES=(
42 "${FILESDIR}"/${P}-chromaprint-1.4.patch #604528
43 "${FILESDIR}"/${P}-gcc62.patch #595090
44
45 + "${FILESDIR}"/${PN}-2.0.0-sqlite3.patch #622776
46 +
47 # The following patches were taken from sunny-overlay (bug #608430)
48 "${FILESDIR}"/${P}-fix-formatting-of-time-durations.patch
49 "${FILESDIR}"/${P}-eliminate-unnecessary-heap-allocation-of-qtime.patch