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

2022-10-16 Thread Ionen Wolkens 
commit: 180ac825ebfad6b0ee3b2508cb51e996faf628c9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Oct 17 00:50:38 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Oct 17 00:59:42 2022 +
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  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 
 --- 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 @@

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

2022-10-13 Thread Ionen Wolkens 
commit: 51d79df1c2c83c652ae5da230c51c149e38d4ec1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Oct 13 12:13:18 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Oct 13 12:16:34 2022 +
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  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 
 --- 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/, x11-libs/neXtaw/

2022-10-13 Thread Ionen Wolkens 
commit: bd7aa280e36e37620e378c70aed1f0c04c80969e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Oct 13 08:11:05 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Oct 13 09:06:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd7aa280

x11-libs/neXtaw: EAPI7->8, fix w/ clang16, -std=gnu89 + -fno-strict

clang16 fixes regenerates some flex/yacc files so BDEPEND on them.

Haven't looked for a proper fix wrt #864535, may be easy but
passing -fno-strict-aliasing as better-than-nothing.

Closes: https://bugs.gentoo.org/864535
Closes: https://bugs.gentoo.org/871489
Signed-off-by: Ionen Wolkens  gentoo.org>

 x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch  | 27 
 ...aw-0.15.1-r3.ebuild => neXtaw-0.15.1-r4.ebuild} | 37 +++---
 2 files changed, 52 insertions(+), 12 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
new file mode 100644
index ..a1f5bf27922c
--- /dev/null
+++ b/x11-libs/neXtaw/files/neXtaw-0.15.1-clang16.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/871489
+--- a/X11/neXtaw/XawIm.c
 b/X11/neXtaw/XawIm.c
+@@ -61,2 +61,3 @@
+ #include 
++#include 
+ #include 
+--- a/X11/neXtaw/laygram.y
 b/X11/neXtaw/laygram.y
+@@ -16,2 +16,7 @@
+ 
++%code provides {
++void yyerror(char *s);
++int yylex(void);
++}
++
+ %union {
+--- a/X11/neXtaw/laylex.l
 b/X11/neXtaw/laylex.l
+@@ -88,2 +88,3 @@
+ 
++void
+ yysetsource(s)
+@@ -94,2 +95,3 @@
+ 
++void
+ yyerror(s)

diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild 
b/x11-libs/neXtaw/neXtaw-0.15.1-r4.ebuild
similarity index 53%
rename from x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
rename to x11-libs/neXtaw/neXtaw-0.15.1-r4.ebuild
index f89f61178319..db8f5d2fd8ee 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r4.ebuild
@@ -1,34 +1,47 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit flag-o-matic
 
 DESCRIPTION="Athena Widgets with N*XTSTEP appearance"
-HOMEPAGE="http://siag.nu/neXtaw/;
-SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz;
+HOMEPAGE="https://siag.nu/neXtaw/;
+SRC_URI="https://siag.nu/pub/neXtaw/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND="
-   x11-base/xorg-proto
x11-libs/libICE
-   x11-libs/libXext
-   x11-libs/libXt
-   x11-libs/libX11
x11-libs/libSM
+   x11-libs/libX11
+   x11-libs/libXext
x11-libs/libXmu
-   x11-libs/libxkbfile
x11-libs/libXpm
-   !