commit: 2734d9ba5128272eba71ce45e0a94f511947811b Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com> AuthorDate: Thu Jan 9 14:38:15 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Feb 10 09:21:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2734d9ba
media-libs/blib: Port to C23 Fix implicit declarations and incompatible pointer types including ones masked by first compilation error. Upstream is dead. Nothing to be done there. Bug: https://bugs.gentoo.org/921126 Bug: https://bugs.gentoo.org/899808 Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/40073 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/blib/blib-1.1.7-r4.ebuild | 63 +++++++++++++++++ media-libs/blib/files/blib-1.1.7-C23.patch | 105 +++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+) diff --git a/media-libs/blib/blib-1.1.7-r4.ebuild b/media-libs/blib/blib-1.1.7-r4.ebuild new file mode 100644 index 000000000000..1c39f810fe2c --- /dev/null +++ b/media-libs/blib/blib-1.1.7-r4.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Library full of useful things to hack the Blinkenlights" +HOMEPAGE="http://www.blinkenlights.de"; +SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"; + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="aalib gtk" + +RDEPEND=" + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + aalib? ( media-libs/aalib ) + gtk? ( + app-accessibility/at-spi2-core:2 + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + x11-libs/cairo + x11-libs/gtk+:2 + x11-libs/pango + )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-deprecated.patch + "${FILESDIR}"/${P}-C23.patch +) + +src_prepare() { + default + + # drop DEPRECATED flags, bug #391105 + sed -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ + -i {blib,gfx,{,test/}modules}/Makefile.{am,in} || die + + #https://bugs.gentoo.org/899808 + eautoreconf +} + +src_configure() { + local econfargs=( + $(use_enable aalib aa) + --disable-directfb + $(use_enable gtk) + ) + + econf "${econfargs[@]}" +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/media-libs/blib/files/blib-1.1.7-C23.patch b/media-libs/blib/files/blib-1.1.7-C23.patch new file mode 100644 index 000000000000..662e1d20dc24 --- /dev/null +++ b/media-libs/blib/files/blib-1.1.7-C23.patch @@ -0,0 +1,105 @@ +https://bugs.gentoo.org/921126 +Fix for incompatible pointer types: Just upsize the size +everywhere it's used, so it fits in largest, gsize +diff -ru a/blib/bpacket.c a/blib/bpacket.c +--- a/blib/bpacket.c 2025-01-09 18:10:29.298407575 +0400 ++++ a/blib/bpacket.c 2025-01-09 18:13:09.318508466 +0400 +@@ -48,10 +48,10 @@ + gint height, + gint channels, + gint maxval, +- gint *data_size) ++ gsize *data_size) + { + BPacket *packet; +- gint size; ++ gsize size; + + g_return_val_if_fail (width > 0, NULL); + g_return_val_if_fail (height > 0, NULL); +diff -ru a/blib/bpacket.h a/blib/bpacket.h +--- a/blib/bpacket.h 2025-01-09 18:10:29.297407580 +0400 ++++ a/blib/bpacket.h 2025-01-09 18:12:22.749770123 +0400 +@@ -42,7 +42,7 @@ + gint height, + gint channels, + gint maxval, +- gint *data_size); ++ gsize *data_size); + gsize b_packet_size (BPacket *packet); + void b_packet_hton (BPacket *packet); + void b_packet_ntoh (BPacket *packet); +diff -ru a/blib/breceiver.c b/blib/breceiver.c +--- a/blib/breceiver.c 2025-01-09 18:23:21.159070702 +0400 ++++ b/blib/breceiver.c 2025-01-09 18:24:36.299648508 +0400 +@@ -354,7 +354,7 @@ + + case MAGIC_BLFRAME: + { +- gint size; ++ gsize size; + + fake = b_packet_new (18, 8, 1, 1, &size); + +Dealing with implicit declarations: autoreconf and #include "config.h" +in places where they were not included previously +diff -ru a/configure.in a/configure.in +--- a/configure.in 2025-01-09 18:10:29.297407580 +0400 ++++ a/configure.in 2025-01-09 18:15:55.400575296 +0400 +@@ -20,6 +20,8 @@ + BLIB_API_VERSION=$BLIB_MAJOR_VERSION.$BLIB_MINOR_VERSION + BLIB_VERSION=$BLIB_MAJOR_VERSION.$BLIB_MINOR_VERSION.$BLIB_MICRO_VERSION + ++AC_USE_SYSTEM_EXTENSIONS ++ + AC_SUBST(BLIB_MAJOR_VERSION) + AC_SUBST(BLIB_MINOR_VERSION) + AC_SUBST(BLIB_MICRO_VERSION) +diff -ru a/modules/bcountdown.c b/modules/bcountdown.c +--- a/modules/bcountdown.c 2025-01-09 18:23:21.161070691 +0400 ++++ b/modules/bcountdown.c 2025-01-09 18:25:27.179362628 +0400 +@@ -21,6 +21,8 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include "config.h" ++ + #include <stdlib.h> + #include <string.h> + #include <sys/time.h> +diff -ru a/modules/bdropout.c b/modules/bdropout.c +--- a/modules/bdropout.c 2025-01-09 18:23:21.161070691 +0400 ++++ b/modules/bdropout.c 2025-01-09 18:25:53.499214744 +0400 +@@ -18,6 +18,8 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include "config.h" ++ + #include <stdlib.h> + + #include <glib.h> +diff -ru a/modules/bpushline.c b/modules/bpushline.c +--- a/modules/bpushline.c 2025-01-09 18:23:21.161070691 +0400 ++++ b/modules/bpushline.c 2025-01-09 18:23:30.867016155 +0400 +@@ -18,6 +18,8 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include "config.h" ++ + #include <stdlib.h> + + #include <glib.h> +diff -ru a/modules/btetris.c b/modules/btetris.c +--- a/modules/btetris.c 2025-01-09 18:23:21.161070691 +0400 ++++ b/modules/btetris.c 2025-01-09 18:25:36.835308374 +0400 +@@ -18,6 +18,8 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include "config.h" ++ + #include <string.h> + #include <stdlib.h> + #include <unistd.h>
