From 0ec1e1dd7867c3dedcbea76c9b6e847d6b388c03 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 11 Feb 2025 00:12:38 +0000 Subject: gentoo auto-resync : 11:02:2025 - 00:12:37 --- media-sound/aumix/Manifest | 3 +- media-sound/aumix/aumix-2.9.1-r1.ebuild | 58 ++++++++++++++++++++++ media-sound/aumix/aumix-2.9.1.ebuild | 56 --------------------- .../aumix/files/aumix-2.9.1-gcc14-build-fix.patch | 53 ++++++++++++++++++++ 4 files changed, 113 insertions(+), 57 deletions(-) create mode 100644 media-sound/aumix/aumix-2.9.1-r1.ebuild delete mode 100644 media-sound/aumix/aumix-2.9.1.ebuild create mode 100644 media-sound/aumix/files/aumix-2.9.1-gcc14-build-fix.patch (limited to 'media-sound/aumix') diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest index 86f266833b4e..0711f84efcaf 100644 --- a/media-sound/aumix/Manifest +++ b/media-sound/aumix/Manifest @@ -1,6 +1,7 @@ AUX aumix-2.9.1-fno-common.patch 5798 BLAKE2B 1d3c6bf6b501b3daf4b96e1b2093b9a3d94553b4fd43fc3d02136450e805b75a8c8bc82e7ce0222179bae54126aa4e3cb148f784590de818f0593ceebf74638d SHA512 248ed0bceb2b1030930c89a1d6eace9c43338be80dae5d023bcb131a1666be21984fa2bd814945f8e5683d6e31eeb10bc2cddc6820385ce44e3ae32fdb8da3e9 +AUX aumix-2.9.1-gcc14-build-fix.patch 2392 BLAKE2B 8ead9c9e06b877707f9070e9cf34373ff4c9735562c2beb865e7261ecab31742432ead3593e1cfae94186ebf860a27694d14df51b1f0f41a99f5c81b0f08480a SHA512 e5ce64645d2ee71f9680161c4b214535146ce81bd9f1eccf5888d761c3ffa7bcf0e0242140fc23d792141cde2df0df6a80cdb34ced786cbd32577091fef37b02 AUX aumix-2.9.1-tinfo.patch 737 BLAKE2B faae7740cbdf0af61df2febed5a7901822b73682b3e294a46b901b033c87e1900e7256b073cf0e5257ec3db32218e106cf350059a0f62ba7d29992179ea98d64 SHA512 9a2e68378d7bf7920ae2004ecefb2bcffdd829cab0c09340796de4d1617f0959e2b68432c9e29f748179abcfef87c22b8a3698615eef6485e1d7e17383d3d7eb AUX aumix.rc6 1037 BLAKE2B ba9842705caa5e78c7d5886afa6c8408a50169ec79a788d49ca04a8c90bcf581dcb96f4b11c8b6004370143ee6a92d9e0b660132826b2b9e167a07a6dfe73001 SHA512 8960c6c5e61e15e981bfafff7b03aded627971c11d6c21ce9e0d953737f440885fb5dda6a9f942112697c344b4f3ad9f222e2a7cfa493a504dc75a8f4c8cf1c9 DIST aumix-2.9.1.tar.bz2 231622 BLAKE2B b96075d310b1d04bfc697a9097fd656d85705f68f1b06b1e6ee5bc0ca2b2a3614df67980d0f6e293c4d99adb9d12fae3608ac446eefd1cdf4f04de7f4a5fd1db SHA512 bd063dc9dab8455f467fbe9e4ea1baa5cef914923e66ab5a8fca1e6964cac7851e3755f054bfe41657371e221920fe9a52f9807457996244f4bcd5db4659b21d -EBUILD aumix-2.9.1.ebuild 1028 BLAKE2B df35d11c2c9486c23aea7dab018d5c62647e50d2af62a63d7a9c1a863dc41bd018a3c53d6eedab2700e2234c2a0022fe2f0cc48095e7440ef827e573e935a4a3 SHA512 3840bf6be4c25f0afdfc9bf8bd6167052a6eeae067f0a5484a823ef7507a39506f253107a9a0fe381f61d7b3d0d197abd106eedab162bdc66e6291dc5cf8e347 +EBUILD aumix-2.9.1-r1.ebuild 1099 BLAKE2B edd64fe6b2ba98709ebefe63771a78b0a436678a453aec68c597e8717e8e4bf20cd29a9b07eb12fb864eb9e632a5e095f80d3b8ce6476f0125f070de1209acf3 SHA512 14651ac020408b67542af5fb94adb370ccbe160dbb7999339c59ea97f11540565c9c751c8350c2337e62aca69d6a490974cd22d81010ec4876e584d4b2716951 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8 diff --git a/media-sound/aumix/aumix-2.9.1-r1.ebuild b/media-sound/aumix/aumix-2.9.1-r1.ebuild new file mode 100644 index 000000000000..d5b77c03df8d --- /dev/null +++ b/media-sound/aumix/aumix-2.9.1-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop + +DESCRIPTION="Aumix volume/mixer control program" +HOMEPAGE="http://jpj.net/~trevor/aumix.html" +SRC_URI="http://jpj.net/~trevor/aumix/releases/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86" +IUSE="gpm gtk nls" + +RDEPEND="sys-libs/ncurses:0= + gpm? ( sys-libs/gpm ) + gtk? ( x11-libs/gtk+:2 ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( + "${FILESDIR}"/${P}-tinfo.patch #578722 + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-gcc14-build-fix.patch +) + +src_prepare() { + default + eautoreconf #578722 +} + +src_configure() { + local myeconfargs=( + $(use_enable nls) + $(usex gtk '' --without-gtk) + $(usex gpm '' --without-gpm) + --without-sysmouse #921162 + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newinitd "${FILESDIR}"/aumix.rc6 aumix + + if use gtk; then + doicon data/aumix.xpm + make_desktop_entry aumix Aumix + fi +} diff --git a/media-sound/aumix/aumix-2.9.1.ebuild b/media-sound/aumix/aumix-2.9.1.ebuild deleted file mode 100644 index 46beffe55d85..000000000000 --- a/media-sound/aumix/aumix-2.9.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop - -DESCRIPTION="Aumix volume/mixer control program" -HOMEPAGE="http://jpj.net/~trevor/aumix.html" -SRC_URI="http://jpj.net/~trevor/aumix/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86" -IUSE="gpm gtk nls" - -RDEPEND="sys-libs/ncurses:0= - gpm? ( sys-libs/gpm ) - gtk? ( x11-libs/gtk+:2 ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -PATCHES=( - "${FILESDIR}"/${P}-tinfo.patch #578722 - "${FILESDIR}"/${P}-fno-common.patch -) - -src_prepare() { - default - eautoreconf #578722 -} - -src_configure() { - local myeconfargs=( - $(use_enable nls) - $(usex gtk '' --without-gtk) - $(usex gpm '' --without-gpm) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - newinitd "${FILESDIR}"/aumix.rc6 aumix - - if use gtk; then - doicon data/aumix.xpm - make_desktop_entry aumix Aumix - fi -} diff --git a/media-sound/aumix/files/aumix-2.9.1-gcc14-build-fix.patch b/media-sound/aumix/files/aumix-2.9.1-gcc14-build-fix.patch new file mode 100644 index 000000000000..4bae1bad9a82 --- /dev/null +++ b/media-sound/aumix/files/aumix-2.9.1-gcc14-build-fix.patch @@ -0,0 +1,53 @@ +https://bugs.gentoo.org/930028 +From: Brahmajit Das +Date: Mon, 22 Apr 2024 20:16:11 +0530 +Subject: [PATCH 1/1] Fix build with GCC 14 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC 14 enables -Wincompatible-pointer-types and a few other compiler +flags that results in build errors such as: +gtk.c:465:28: error: passing argument 1 of ‘gtk_widget_destroy’ from incompatible pointer type [-Wincompatible-pointer-types] + 465 | gtk_widget_destroy(fs); + | ^~ + | | + | GtkFileSelection * {aka struct _GtkFileSelection *} +/usr/include/gtk-2.0/gtk/gtkwidget.h:837:65: note: expected ‘GtkWidget *’ {aka ‘struct _GtkWidget *’} but argument is of type ‘GtkFileSelection *’ {aka ‘struct _GtkFileSelection *’} + 837 | void gtk_widget_destroy (GtkWidget *widget); + | ~~~~~~~~~~~~~~~~~~~~~^~~~~~ +gtk.c: In function ‘FileOKSave’: +gtk.c:473:28: error: passing argument 1 of ‘gtk_widget_destroy’ from incompatible pointer type [-Wincompatible-pointer-types] + 473 | gtk_widget_destroy(fs); + | ^~ + | | + | GtkFileSelection * {aka struct _GtkFileSelection *} + +Using GTK_WIDGET to cast the GtkFileSelection handle to GtkWidget type +helps with the error, as the funtion gtk_widget_destroy expects a +GtkWidget type data. + +Signed-off-by: Brahmajit Das +--- a/src/gtk.c ++++ b/src/gtk.c +@@ -462,7 +462,7 @@ void FileOKLoad(GtkWidget * w, GtkFileSelection * fs) + /* Get the selected filename and copy it into the global save_filename. */ + { + save_filename = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs))); +- gtk_widget_destroy(fs); ++ gtk_widget_destroy(GTK_WIDGET(fs)); + ErrorExitWarn(LoadSettings(), 'w'); + } + +@@ -470,7 +470,7 @@ void FileOKSave(GtkWidget * w, GtkFileSelection * fs) + /* Get the selected filename and copy it into the global save_filename. */ + { + save_filename = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs))); +- gtk_widget_destroy(fs); ++ gtk_widget_destroy(GTK_WIDGET(fs)); + ErrorExitWarn(SaveSettings(), 'e'); + } + +-- +2.44.0 + -- cgit v1.2.3