| 1 |
commit: 97005ea03343f6c8f21db00712f8fe7f9288a53d |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 4 01:38:12 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 4 01:46:00 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97005ea0 |
| 7 |
|
| 8 |
games-arcade/xbill: fix build w/ upcoming clang16 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/874624 |
| 11 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 12 |
|
| 13 |
games-arcade/xbill/files/xbill-2.1-clang16.patch | 44 ++++++++++++++++++++++ |
| 14 |
.../{xbill-2.1-r4.ebuild => xbill-2.1-r5.ebuild} | 3 +- |
| 15 |
2 files changed, 46 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/games-arcade/xbill/files/xbill-2.1-clang16.patch b/games-arcade/xbill/files/xbill-2.1-clang16.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..ee31ec657e4e |
| 20 |
--- /dev/null |
| 21 |
+++ b/games-arcade/xbill/files/xbill-2.1-clang16.patch |
| 22 |
@@ -0,0 +1,44 @@ |
| 23 |
+Drop -I. to prevent <strings.h> from including ./strings.h |
| 24 |
+https://bugs.gentoo.org/874624 |
| 25 |
+--- a/Bucket.c |
| 26 |
++++ b/Bucket.c |
| 27 |
+@@ -1,2 +1,2 @@ |
| 28 |
+-#include <util.h> |
| 29 |
++#include "util.h" |
| 30 |
+ |
| 31 |
+--- a/Game.c |
| 32 |
++++ b/Game.c |
| 33 |
+@@ -4,2 +4,3 @@ |
| 34 |
+ #include <string.h> |
| 35 |
++#include <strings.h> |
| 36 |
+ #include <time.h> |
| 37 |
+--- a/Makefile.in |
| 38 |
++++ b/Makefile.in |
| 39 |
+@@ -22,3 +22,3 @@ |
| 40 |
+ |
| 41 |
+-ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) -I$(srcdir) |
| 42 |
++ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) |
| 43 |
+ ALL_LDFLAGS = $(CFLAGS) $(LDFLAGS) |
| 44 |
+--- a/UI.c |
| 45 |
++++ b/UI.c |
| 46 |
+@@ -3,2 +3,3 @@ |
| 47 |
+ #include <string.h> |
| 48 |
++#include <strings.h> |
| 49 |
+ |
| 50 |
+--- a/gtk.c |
| 51 |
++++ b/gtk.c |
| 52 |
+@@ -370,3 +370,3 @@ |
| 53 |
+ gtk_signal_connect_object(GTK_OBJECT(menu_item), "activate", |
| 54 |
+- gtk_ui_popup_dialog, (gpointer) dialog); |
| 55 |
++ GTK_SIGNAL_FUNC(gtk_ui_popup_dialog), (gpointer) dialog); |
| 56 |
+ return (menu_item); |
| 57 |
+@@ -592,3 +592,3 @@ |
| 58 |
+ CreateDialog(DIALOG_PAUSEGAME, 0, icon, "Continue", NULL); |
| 59 |
+- CreateEnterText(DIALOG_WARPLEVEL, warp_apply); |
| 60 |
++ CreateEnterText(DIALOG_WARPLEVEL, GTK_SIGNAL_FUNC(warp_apply)); |
| 61 |
+ CreateDialog(DIALOG_HIGHSCORE, 0, NULL, NULL, NULL); |
| 62 |
+@@ -602,3 +602,3 @@ |
| 63 |
+ CreateDialog(DIALOG_ENDGAME, 0, NULL, "Nuts!", NULL); |
| 64 |
+- CreateEnterText(DIALOG_ENTERNAME, enter_name); |
| 65 |
++ CreateEnterText(DIALOG_ENTERNAME, GTK_SIGNAL_FUNC(enter_name)); |
| 66 |
+ } |
| 67 |
|
| 68 |
diff --git a/games-arcade/xbill/xbill-2.1-r4.ebuild b/games-arcade/xbill/xbill-2.1-r5.ebuild |
| 69 |
similarity index 92% |
| 70 |
rename from games-arcade/xbill/xbill-2.1-r4.ebuild |
| 71 |
rename to games-arcade/xbill/xbill-2.1-r5.ebuild |
| 72 |
index cbd5ae78dd07..2f21efed00bd 100644 |
| 73 |
--- a/games-arcade/xbill/xbill-2.1-r4.ebuild |
| 74 |
+++ b/games-arcade/xbill/xbill-2.1-r5.ebuild |
| 75 |
@@ -1,4 +1,4 @@ |
| 76 |
-# Copyright 1999-2021 Gentoo Authors |
| 77 |
+# Copyright 1999-2022 Gentoo Authors |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
EAPI=7 |
| 81 |
@@ -24,6 +24,7 @@ BDEPEND="virtual/pkgconfig" |
| 82 |
PATCHES=( |
| 83 |
"${FILESDIR}"/${P}-gtk2.patch |
| 84 |
"${FILESDIR}"/${P}-gentoo.patch |
| 85 |
+ "${FILESDIR}"/${P}-clang16.patch |
| 86 |
) |
| 87 |
|
| 88 |
src_prepare() { |
Archives