[gentoo-commits] repo/gentoo:master commit in: x11-libs/neXtaw/files/

[gentoo-commits] repo/gentoo:master commit in: x11-libs/neXtaw/files/

[Ionen Wolkens]

commit:     51d79df1c2c83c652ae5da230c51c149e38d4ec1
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 12:13:18 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 12:16:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d79df1

x11-libs/neXtaw: fix clang16 patch for non-bison yacc

Looking at bison mailing lists when don't know yacc
is a bad influence.

Fixes: bd7aa280e36e37620e378c70aed1f0c04c80969e
Closes: https://bugs.gentoo.org/876975
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch b/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch
index a1f5bf27922c..47b27d7442ae 100644
--- a/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch
+++ b/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch
@@ -7,14 +7,12 @@ https://bugs.gentoo.org/871489
  #include <X11/Xos.h>
 --- a/X11/neXtaw/laygram.y
 +++ b/X11/neXtaw/laygram.y
-@@ -16,2 +16,7 @@
+@@ -253,2 +253,5 @@
  
-+%code provides {
-+    void yyerror(char *s);
-+    int yylex(void);
-+}
++void yyerror(char *s);
++int yylex(void);
 +
- %union {
+ int yywrap ()
 --- a/X11/neXtaw/laylex.l
 +++ b/X11/neXtaw/laylex.l
 @@ -88,2 +88,3 @@

[gentoo-commits] repo/gentoo:master commit in: x11-libs/neXtaw/files/

[Ionen Wolkens]

commit:     180ac825ebfad6b0ee3b2508cb51e996faf628c9
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 00:50:38 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 00:59:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=180ac825

x11-libs/neXtaw: fix clang16 again for /both/ bison and yacc

Thought may have pushed wrong patch given had tested it with yacc,
but turns out that 1st patch worked with bison but broke dev-util/yacc,
and 2nd patch worked with yacc but broke bison (with clang16 that is),
and hadn't retried bison.

Tried with both this time, hopefully fine.

Thanks-to: Markus Peloquin
Bug: https://bugs.gentoo.org/876975
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch b/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch
index 47b27d7442ae..70059085ab3d 100644
--- a/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch
+++ b/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch
@@ -7,12 +7,12 @@ https://bugs.gentoo.org/871489
  #include <X11/Xos.h>
 --- a/X11/neXtaw/laygram.y
 +++ b/X11/neXtaw/laygram.y
-@@ -253,2 +253,5 @@
+@@ -14,2 +14,5 @@
  
 +void yyerror(char *s);
 +int yylex(void);
 +
- int yywrap ()
+ %}
 --- a/X11/neXtaw/laylex.l
 +++ b/X11/neXtaw/laylex.l
 @@ -88,2 +88,3 @@