commit: 8dcececc1702ebbd97dc3411bd03a3c423bc1d21 Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org> AuthorDate: Wed Jan 13 14:39:12 2021 +0000 Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org> CommitDate: Wed Jan 13 14:39:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dcececc
media-sound/aqualung: Fix bug #759385. Thanks to Toralf Förster for the report. Closes: https://bugs.gentoo.org/759385 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org> media-sound/aqualung/aqualung-1.1-r1.ebuild | 3 ++- media-sound/aqualung/aqualung-1.1-r101.ebuild | 3 ++- .../files/aqualung-1.1-var-collision.patch | 31 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/media-sound/aqualung/aqualung-1.1-r1.ebuild b/media-sound/aqualung/aqualung-1.1-r1.ebuild index c2442960c3c..0e4f24b9cf5 100644 --- a/media-sound/aqualung/aqualung-1.1-r1.ebuild +++ b/media-sound/aqualung/aqualung-1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -52,6 +52,7 @@ DEPEND=" PATCHES=( "${FILESDIR}/${P}-ifp.patch" + "${FILESDIR}/${P}-var-collision.patch" ) src_configure() { diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild b/media-sound/aqualung/aqualung-1.1-r101.ebuild index fe7a974b3a4..2390bf4b118 100644 --- a/media-sound/aqualung/aqualung-1.1-r101.ebuild +++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -54,6 +54,7 @@ DEPEND=" PATCHES=( "${FILESDIR}/${P}-ifp.patch" + "${FILESDIR}/${P}-var-collision.patch" ) src_configure() { diff --git a/media-sound/aqualung/files/aqualung-1.1-var-collision.patch b/media-sound/aqualung/files/aqualung-1.1-var-collision.patch new file mode 100644 index 00000000000..2606a0bea00 --- /dev/null +++ b/media-sound/aqualung/files/aqualung-1.1-var-collision.patch @@ -0,0 +1,31 @@ +From e49f31ba779c938fa6dd3eaf848c68735e3386f5 Mon Sep 17 00:00:00 2001 +From: Adam Sampson <[email protected]> +Date: Sun, 10 Jan 2021 22:32:04 +0000 +Subject: [PATCH] Don't call a variable "bool". + +If one of the headers happens to #include <stdbool.h>, this'll clash +with the C99 type definition. +--- + src/build_store.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/build_store.c b/src/build_store.c +index 56b0eaf..ed4bfca 100644 +--- a/src/build_store.c ++++ b/src/build_store.c +@@ -382,12 +382,12 @@ data_src_cell_toggled(GtkCellRendererToggle * cell, gchar * path, gpointer data) + data_src_gui_t * gui = (data_src_gui_t *)data; + + if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(gui->list), &iter, path)) { +- gboolean bool; ++ gboolean value; + int type; + +- gtk_tree_model_get(GTK_TREE_MODEL(gui->list), &iter, 0, &bool, 1, &type, -1); ++ gtk_tree_model_get(GTK_TREE_MODEL(gui->list), &iter, 0, &value, 1, &type, -1); + gtk_list_store_set(GTK_LIST_STORE(gui->list), &iter, +- 0, !bool && (type != DATA_SRC_CDDB || gui->model->cddb_mask), -1); ++ 0, !value && (type != DATA_SRC_CDDB || gui->model->cddb_mask), -1); + } + } +
