From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 533F41396D0 for ; Thu, 10 Aug 2017 23:55:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 427031FC002; Thu, 10 Aug 2017 23:55:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E9B31FC002 for ; Thu, 10 Aug 2017 23:55:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C024A341A1C for ; Thu, 10 Aug 2017 23:55:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CA323E99 for ; Thu, 10 Aug 2017 23:55:47 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1502409343.a97286de5285e5dcb4f707c5fa3b24c5a5ed8c21.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/, media-sound/mixxx/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch media-sound/mixxx/mixxx-2.0.0-r4.ebuild X-VCS-Directories: media-sound/mixxx/files/ media-sound/mixxx/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a97286de5285e5dcb4f707c5fa3b24c5a5ed8c21 X-VCS-Branch: master Date: Thu, 10 Aug 2017 23:55:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4a20048e-0368-43b9-ac34-a2029a04234a X-Archives-Hash: 7854c368ca1a8c036392f2e0955d9d57 commit: a97286de5285e5dcb4f707c5fa3b24c5a5ed8c21 Author: Lars Wendler gentoo org> AuthorDate: Thu Aug 10 23:55:26 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Aug 10 23:55:43 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a97286de media-sound/mixxx: Fixed build with recent sqlite versions (bug #622776). Package-Manager: Portage-2.3.6, Repoman-2.3.3 media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch | 14 ++++++++++++++ media-sound/mixxx/mixxx-2.0.0-r4.ebuild | 2 ++ 2 files changed, 16 insertions(+) diff --git a/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch b/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch new file mode 100644 index 00000000000..a8cb15e63c6 --- /dev/null +++ b/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/622776 + +--- mixxx-2.0.0/src/library/trackcollection.h ++++ mixxx-2.0.0/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 + #endif + + class TrackInfoObject; diff --git a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild index 3b71fc236f6..1d968f368e3 100644 --- a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild +++ b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild @@ -77,6 +77,8 @@ PATCHES=( "${FILESDIR}"/${P}-chromaprint-1.4.patch #604528 "${FILESDIR}"/${P}-gcc62.patch #595090 + "${FILESDIR}"/${PN}-2.0.0-sqlite3.patch #622776 + # The following patches were taken from sunny-overlay (bug #608430) "${FILESDIR}"/${P}-fix-formatting-of-time-durations.patch "${FILESDIR}"/${P}-eliminate-unnecessary-heap-allocation-of-qtime.patch