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 96908138330 for ; Sat, 17 Sep 2016 13:16:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D0A8E0925; Sat, 17 Sep 2016 13:16:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BD315E0925 for ; Sat, 17 Sep 2016 13:16:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DCF8340BC1 for ; Sat, 17 Sep 2016 13:16:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BE82247C for ; Sat, 17 Sep 2016 13:16:48 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1474118195.5c43afe6861275a05aeb4d6b6e45cdbbccfef21b.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/audacity/audacity-2.1.2.ebuild media-sound/audacity/files/audacity-2.1.2-fix-c++14.patch X-VCS-Directories: media-sound/audacity/ media-sound/audacity/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 5c43afe6861275a05aeb4d6b6e45cdbbccfef21b X-VCS-Branch: master Date: Sat, 17 Sep 2016 13:16:48 +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: 207eb8d5-90b0-4d63-8c2f-005ce8b51efb X-Archives-Hash: a1d1bae2420b313e1d2ff0317ac18340 commit: 5c43afe6861275a05aeb4d6b6e45cdbbccfef21b Author: David Seifert gentoo org> AuthorDate: Sat Sep 17 13:15:50 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Sep 17 13:16:35 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c43afe6 media-sound/audacity: Allow for compiling with GCC 6 Gentoo-bug: 592448 * Patch by OpenSUSE Package-Manager: portage-2.3.0 media-sound/audacity/audacity-2.1.2.ebuild | 7 ++-- .../audacity/files/audacity-2.1.2-fix-c++14.patch | 41 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/media-sound/audacity/audacity-2.1.2.ebuild b/media-sound/audacity/audacity-2.1.2.ebuild index 0a0dd61..4331f0c 100644 --- a/media-sound/audacity/audacity-2.1.2.ebuild +++ b/media-sound/audacity/audacity-2.1.2.ebuild @@ -49,10 +49,9 @@ REQUIRED_USE="soundtouch? ( midi )" S=${WORKDIR}/${MY_P} -#src_prepare() { -# epatch "${FILESDIR}"/${P}-automagic.patch -# AT_M4DIR="${S}/m4" eautoreconf -#} +src_prepare() { + epatch "${FILESDIR}/${PN}-2.1.2-fix-c++14.patch" +} src_configure() { WX_GTK_VER="3.0" diff --git a/media-sound/audacity/files/audacity-2.1.2-fix-c++14.patch b/media-sound/audacity/files/audacity-2.1.2-fix-c++14.patch new file mode 100644 index 00000000..32bcf42 --- /dev/null +++ b/media-sound/audacity/files/audacity-2.1.2-fix-c++14.patch @@ -0,0 +1,41 @@ +Fix building with C++14, which errors out due to bool -> T* conversions +See also: https://bugs.gentoo.org/show_bug.cgi?id=592448 + +Patch by OpenSUSE + +Index: src/effects/vamp/LoadVamp.cpp +=================================================================== +--- src/effects/vamp/LoadVamp.cpp.orig ++++ src/effects/vamp/LoadVamp.cpp +@@ -266,7 +266,7 @@ Plugin *VampEffectsModule::FindPlugin(co + Plugin *vp = PluginLoader::getInstance()->loadPlugin(key, 48000); // rate doesn't matter here + if (!vp) + { +- return false; ++ return NULL; + } + + // We limit the listed plugin outputs to those whose results can +Index: src/import/ImportFLAC.cpp +=================================================================== +--- src/import/ImportFLAC.cpp.orig ++++ src/import/ImportFLAC.cpp +@@ -296,7 +296,7 @@ ImportFileHandle *FLACImportPlugin::Open + int cnt; + wxFile binaryFile; + if (!binaryFile.Open(filename)) { +- return false; // File not found ++ return NULL; // File not found + } + + #ifdef USE_LIBID3TAG +@@ -313,7 +313,7 @@ ImportFileHandle *FLACImportPlugin::Open + + if (cnt == wxInvalidOffset || strncmp(buf, FLAC_HEADER, 4) != 0) { + // File is not a FLAC file +- return false; ++ return NULL; + } + + // Open the file for import +