Comment 1 Nuno Teixeira 2022-07-24 19:58:03 UTC

portlint -C:
No USE_GITHUB seen but GH_ACCOUNT used

Thanks for your answer. Unless I misunderstood, I was told to use a static archive, without using USE_GITHUB in a previous version of the port.

See the discussion here
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261732#c5

Comment 3 Nuno Teixeira 2022-07-30 22:01:23 UTC

Hi,

GH_ACCOUNT variable is to use stricly with USE_GITHUB and since you using MASTER_SITES for a static non auto-generated tarball you can use:

MASTER_SITES= https://github.com/kovidgoyal/${PORTNAME}/releases/download/v${DISTVERSION}/

Cheers

Created attachment 235572 [details]
Removed GH_ACCOUNT.

Comment 5 Nuno Teixeira 2022-07-31 11:46:02 UTC

Hi,

1. add USES dep:
---
====> Running Q/A tests (stage-qa)
Warning: you need USES=desktop-file-utils
====> Checking for pkg-plist issues (check-plist)
(...)
---

2. versions 0.25.0 and 0.25.2 doesn't build on 12.3 Release (amd64,i386) as shown in logs:
https://people.freebsd.org/~eduardo/logs/kitty/

But for what I see in pkg builds at https://www.freshports.org/x11/kitty/ version 0.25.0 was built with success in quarterly for 12.3 so we could have some dependency problem.

Do you received any build errors from FreeBSD pkg builders?

Needs investigation

Comment 6 Nuno Teixeira 2022-07-31 12:55:36 UTC

(...)
short log:
---
[12/102] Compiling kitty/state.c ...
In file included from kitty/unicode-data.c:3:
kitty/data-types.h:167:15: error: expected parameter declarator
static_assert(sizeof(GPUCell) == 20, "Fix the ordering of GPUCell");
              ^
kitty/data-types.h:167:15: error: expected ')'
kitty/data-types.h:167:14: note: to match this '('
static_assert(sizeof(GPUCell) == 20, "Fix the ordering of GPUCell");
             ^
kitty/data-types.h:167:1: error: type specifier missing, defaults to 'int' [-Werror,-Wimplicit-int]
static_assert(sizeof(GPUCell) == 20, "Fix the ordering of GPUCell");
^
kitty/data-types.h:167:14: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
static_assert(sizeof(GPUCell) == 20, "Fix the ordering of GPUCell");
             ^
                                                                  void
kitty/data-types.h:174:15: error: expected parameter declarator
static_assert(sizeof(CPUCell) == 12, "Fix the ordering of CPUCell");
              ^
kitty/data-types.h:174:15: error: expected ')'
kitty/data-types.h:174:14: note: to match this '('
static_assert(sizeof(CPUCell) == 12, "Fix the ordering of CPUCell");
             ^
kitty/data-types.h:174:1: error: type specifier missing, defaults to 'int' [-Werror,-Wimplicit-int]
static_assert(sizeof(CPUCell) == 12, "Fix the ordering of CPUCell");
^
kitty/data-types.h:174:14: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
static_assert(sizeof(CPUCell) == 12, "Fix the ordering of CPUCell");
             ^
                                                                  void
8 errors generated.
 done
Compiling kitty/unicode-data.c ...
cc -MMD -DNDEBUG -DPRIMARY_VERSION=4000 -DSECONDARY_VERSION=25 -DXT_VERSION="0.25.2" -Wextra -Wfloat-conversion -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11 -pedantic-errors -Werror -O3 -fwrapv -fstack-protector-strong -pipe -fvisibility=hidden -D_FORTIFY_SOURCE=2 -fPIC -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -flto -I/usr/local/include/ -DKITTY_HAS_RS_SIG_ARGS -pthread -I/usr/local/include/libpng16 -I/usr/local/include -I/usr/local/include -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -I/usr/local/include/harfbuzz -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/python3.9 -c kitty/unicode-data.c -o build/fast_data_types-unicode-data.c.o
*** Error code 1

Stop.
make: stopped in /usr/ports/x11/kitty
---

Yes, I have received the warnings. 
On my machine, with 13.1 and poudriere, I had the same issue but the jail in poudriere was somewhat not in sync. Removing and re-creating the jail solved the issue on my machine.

A temporary fix is to replace "static_assert" with "_Static_assert". I’m not sure if that is the propery way to fix this...

Comment 8 Nuno Teixeira 2022-07-31 16:17:08 UTC

(In reply to Alexis Praga from comment #7)
Where to replace it?

(In reply to Nuno Teixeira from comment #8)
All static_assert in kitty/data-types.h .

However, I’m not sure why it built before...

Edit: the static_asserts were introduced after 0.25.0.

Relevant commit : https://github.com/kovidgoyal/kitty/commit/2b3be147e6ecd08286cb0630b7af4f767a031b16

Comment 11 Nuno Teixeira 2022-07-31 18:46:36 UTC

(In reply to Alexis Praga from comment #10)
we are facing 2 different build problems starting at 0.25.0:
---
23/102] Compiling kitty/glfw-wrapper.c ...
glfw/window.c:177:27: error: no member named 'epoll_shim_close' in 'struct _GLFWwindow::(anonymous at glfw/internal.h:442:5)'
        window->callbacks.close((GLFWwindow*) window);
        ~~~~~~~~~~~~~~~~~ ^
/usr/local/include/libepoll-shim/epoll-shim/detail/common.h:18:20: note: expanded from macro 'close'
#define close(...) epoll_shim_close(__VA_ARGS__)
                   ^
1 error generated.
 done
Compiling [wayland] glfw/window.c ...
cc -MMD -DNDEBUG -D_GLFW_WAYLAND -D_GLFW_BUILD_DLL -Wextra -Wfloat-conversion -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11 -pedantic-errors -Werror -O3 -fwrapv -fstack-protector-strong -pipe -fvisibility=hidden -D_FORTIFY_SOURCE=2 -fPIC -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -flto -I/usr/local/include/ -DKITTY_HAS_RS_SIG_ARGS -fPIC -pthread -I/usr/local/include -I/usr/local/include/libepoll-shim -I/usr/local/include -I/usr/local/include/libepoll-shim -I/usr/local/include -I/usr/local/include/dbus-1.0 -I/usr/local/lib/dbus-1.0/include -c glfw/window.c -o build/glfw-wayland-window.c.o
*** Error code 1
---

Indeed. It looks like someone has been working on a similar issue : https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265024
I’ve added a comment to the other bug report.

I wonder where you get the `-I/usr/local/include/libepoll-shim` arguments from. Is it from `graphics/wayland`? This include directory shouldn't really be exposed by them since Wayland's usage of `libepoll-shim` is an internal implementation detail.

Usually, having this include directory there isn't too bad as long as one doesn't include `<sys/epoll.h>`/`<sys/signalfd.h>`... but it looks like kitty does checks like `#if __has_include(<sys/signalfd.h>)`, creating an implicit dependency on `libepoll-shim`.

So I think in your case the proper fix is to remove the `-I/usr/local/include/libepoll-shim` compiler arguments.

Comment 14 Hans Petter Selasky 2022-08-01 11:16:30 UTC

See chunks here for how to properly fix the epoll shim!

https://cgit.freebsd.org/ports/commit/?id=04db4ece5bdc66c75c8c4ff557e20a06c99e8bf0

--HPS

Comment 15 Nuno Teixeira 2022-08-01 13:21:22 UTC

Created attachment 235603 [details]
kitty-0.25.0: 12.3R(amd64,i386) build fix

 - add LIB_DEPENDS= libepoll-shim-interpose.so:devel/libepoll-shim
 - add +CPPFLAGS+= `pkg-config --cflags epoll-shim-interpose`
       +LDFLAGS+=  `pkg-config --libs epoll-shim-interpose`

thanks @hselasky

Comment 16 Nuno Teixeira 2022-08-01 13:34:44 UTC

Created attachment 235604 [details]
kitty-0.25.2: doesn's build on 12.3R (amd64,i386)

Let's test 0.25.0 and commit it as it fixes 12.3R builds and then look for a solution for 0.25.2 version

Created attachment 235611 [details]
kitty-0.25.2: doesn's build on 12.3R (amd64,i386) corrected

Comment 18 commit-hook 2022-08-01 22:13:01 UTC

A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3cc557e6e51a495df1723777c9509925b4da5a8c

commit 3cc557e6e51a495df1723777c9509925b4da5a8c
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2022-08-01 22:03:08 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-08-01 22:03:08 +0000

    x11/kitty: Fix 12.3R (amd64,i386) build

     - add  LIB_DEPENDS= libepoll-shim-interpose.so:devel/libepoll-shim
            CPPFLAGS+= `pkg-config --cflags epoll-shim-interpose`
            LDFLAGS+= `pkg-config --libs epoll-shim-interpose`

     - add missing USES= desktop-file-utils

    PR:             265393

 x11/kitty/Makefile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

Comment 19 Nuno Teixeira 2022-08-01 22:19:18 UTC

What about opening an issue about 0.25.2 build failure?

Comment 20 Nuno Teixeira 2022-08-13 20:32:04 UTC

(In reply to Alexis Praga from comment #9)

Hello Alexis,

It seams that you are right about static_assert fixes it.
I didn't tested at that time don't know why, and today someone have fixed same situation: https://bugs.freebsd.org/bugzilla/attachment.cgi?id=235882&action=diff

I think you can open an issue at upstream so they fixed it in next release as they did on https://github.com/Cyan4973/xxHash/pull/670

Cheers and thanks and sorry for delay.

Comment 21 commit-hook 2022-08-13 20:34:52 UTC

A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=719265f06019d4c9da29853124f356ddeaf52dd7

commit 719265f06019d4c9da29853124f356ddeaf52dd7
Author:     Alexis Praga <alexis.praga@free.fr>
AuthorDate: 2022-08-13 20:33:05 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-08-13 20:34:21 +0000

    x11/kitty: Update to 0.25.2

    ChangeLog:      https://sw.kovidgoyal.net/kitty/changelog/#id1
    PR:             265393

 x11/kitty/Makefile                             |  3 +--
 x11/kitty/distinfo                             |  6 +++---
 x11/kitty/files/patch-kitty_child.py (gone)    | 11 -----------
 x11/kitty/files/patch-kitty_data-types.h (new) | 19 +++++++++++++++++++
 x11/kitty/pkg-plist                            |  8 ++++++++
 5 files changed, 31 insertions(+), 16 deletions(-)

Comment 22 Nuno Teixeira 2022-08-13 20:36:05 UTC

==> use _Static_assert instead, which is directly part of the C11 language

Committed, thank you!

Hi Nuno,

I'm re-opening this because the patch for static_assert does not seem to be needed anymore. At least, it works on a recent git tree inside Poudriere.
Could you confirm this ?

Thanks,

Created attachment 236033 [details]
Removing patch for static_assert

Comment 25 Nuno Teixeira 2022-08-21 09:59:18 UTC

(In reply to Alexis Praga from comment #23)

Hi Alexis,

We can't remove patch as we are at latest release 0.25.2 [2022-06-07] and that change will be included on next release.
When next release come, then we can remove uneeded patch since it's upstream included.

Cheers

Thanks Nuno for answering so quickly.

Actually, nothing has been done upstream ! Something may have changed elsewhere in FreeBSD but according to my test, the patch is no longer needed.

If you confirm that, we may not need to wait for next release.

Comment 27 Nuno Teixeira 2022-08-21 11:58:43 UTC

(In reply to Alexis Praga from comment #26)

Did you test on 12.3 Release?

---
build started at Sun Aug 21 10:53:45 WEST 2022
port directory: /usr/ports/x11/kitty
package name: kitty-0.25.2
building for: FreeBSD 123amd64-devel 12.3-RELEASE-p5 FreeBSD 12.3-RELEASE-p5 amd64
maintained by: alexis.praga@free.fr
Makefile ident:
Poudriere version: 3.3.7_1
Host OSVERSION: 1400066
Jail OSVERSION: 1203000
(...)
[12/102] Compiling kitty/state.c ...
In file included from kitty/parser.c:10:
kitty/data-types.h:167:15: error: expected parameter declarator
static_assert(sizeof(GPUCell) == 20, "Fix the ordering of GPUCell");
              ^
kitty/data-types.h:167:15: error: expected ')'
kitty/data-types.h:167:14: note: to match this '('
static_assert(sizeof(GPUCell) == 20, "Fix the ordering of GPUCell");
             ^
kitty/data-types.h:167:1: error: type specifier missing, defaults to 'int' [-Werror,-Wimplicit-int]
static_assert(sizeof(GPUCell) == 20, "Fix the ordering of GPUCell");
^
kitty/data-types.h:167:14: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
static_assert(sizeof(GPUCell) == 20, "Fix the ordering of GPUCell");
             ^
                                                                  void
kitty/data-types.h:174:15: error: expected parameter declarator
static_assert(sizeof(CPUCell) == 12, "Fix the ordering of CPUCell");
              ^
kitty/data-types.h:174:15: error: expected ')'
kitty/data-types.h:174:14: note: to match this '('
static_assert(sizeof(CPUCell) == 12, "Fix the ordering of CPUCell");
             ^
kitty/data-types.h:174:1: error: type specifier missing, defaults to 'int' [-Werror,-Wimplicit-int]
static_assert(sizeof(CPUCell) == 12, "Fix the ordering of CPUCell");
^
kitty/data-types.h:174:14: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
static_assert(sizeof(CPUCell) == 12, "Fix the ordering of CPUCell");
             ^
                                                                  void
8 errors generated.
 done
Compiling kitty/parser.c ...
cc -MMD -DNDEBUG -DEPOLL_SHIM_DISABLE_WRAPPER_MACROS -I/usr/local/include/libepoll-shim -DPRIMARY_VERSION=4000 -DSECONDARY_VERSION=25 -DXT_VERSION="0.25.2" -Wextra -Wfloat-conversion -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11 -pedantic-errors -Werror -O3 -fwrapv -fstack-protector-strong -pipe -fvisibility=hidden -D_FORTIFY_SOURCE=2 -fPIC -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -flto -I/usr/local/include/ -DKITTY_HAS_RS_SIG_ARGS -pthread -I/usr/local/include/libpng16 -I/usr/local/include -I/usr/local/include -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -I/usr/local/include/harfbuzz -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/python3.9 -c kitty/parser.c -o build/fast_data_types-parser.c.o
*** Error code 1

Stop.
make: stopped in /usr/ports/x11/kitty
build of x11/kitty | kitty-0.25.2 ended at Sun Aug 21 10:54:13 WEST 2022
build time: 00:00:28
!!! build failure encountered !!!
---

Good catch, I did not test on 12.3. It looks like 13.1 does not have this issue (and does not need the patch).

Upstream does not want to patch as it should be done on our end. See discussion here : https://github.com/kovidgoyal/kitty/pull/5398

So you can close the issue and we'll leave the patch...

Comment 29 Nuno Teixeira 2022-08-21 14:45:47 UTC

(In reply to Alexis Praga from comment #28)

I'm on it and sent an example to upstream to look, at issue that you sent me.

Cheers

Comment 30 commit-hook 2022-08-22 22:18:20 UTC

A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=adf824b09c349ee00ac25189c2f98e3fc2c48953

commit adf824b09c349ee00ac25189c2f98e3fc2c48953
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2022-08-22 22:11:38 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-08-22 22:18:00 +0000

    x11/kitty: Use upstream patch fix build on 12.x Release

     - Use upstream patch instead of workaround fix
       https://github.com/kovidgoyal/kitty/pull/5398
     - Bump PORTREVISION

    PR:             265393
    MFH:            2022Q3

 x11/kitty/Makefile                                   |  6 ++++++
 x11/kitty/files/extra-patch-kitty_data-types.h (new) | 13 +++++++++++++
 x11/kitty/files/patch-kitty_data-types.h (gone)      | 19 -------------------
 3 files changed, 19 insertions(+), 19 deletions(-)

Comment 31 commit-hook 2022-08-22 22:27:22 UTC

A commit in branch 2022Q3 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9051f0ba8e211de002a1571417ea6cc302c9db44

commit 9051f0ba8e211de002a1571417ea6cc302c9db44
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2022-08-22 22:11:38 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-08-22 22:25:45 +0000

    x11/kitty: Use upstream patch fix build on 12.x Release

     - Use upstream patch instead of workaround fix
       https://github.com/kovidgoyal/kitty/pull/5398
     - Bump PORTREVISION

    PR:             265393
    MFH:            2022Q3
    (cherry picked from commit adf824b09c349ee00ac25189c2f98e3fc2c48953)

 x11/kitty/Makefile                                   |  8 +++++++-
 x11/kitty/files/extra-patch-kitty_data-types.h (new) | 13 +++++++++++++
 x11/kitty/files/patch-kitty_child.py (gone)          | 11 -----------
 3 files changed, 20 insertions(+), 12 deletions(-)

Comment 32 Nuno Teixeira 2022-08-22 22:30:33 UTC

extra patch will be needed until 12.x is official release since upstream didn't included it.

Committed, thanks!

Comment 33 commit-hook 2022-09-08 10:55:07 UTC

A commit in branch 2022Q3 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7c2d326ef37a0d491892e6ad2322978ceb804c4c

commit 7c2d326ef37a0d491892e6ad2322978ceb804c4c
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2022-08-22 22:11:38 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-09-08 10:54:02 +0000

    x11/kitty: Use upstream patch fix build on 12.x Release

     - Use upstream patch instead of workaround fix
       https://github.com/kovidgoyal/kitty/pull/5398
     - Bump PORTREVISION

    PR:             265393
    MFH:            2022Q3
    (cherry picked from commit adf824b09c349ee00ac25189c2f98e3fc2c48953)

 x11/kitty/Makefile                                   |  6 ++++++
 x11/kitty/files/extra-patch-kitty_data-types.h (new) | 13 +++++++++++++
 x11/kitty/files/patch-kitty_data-types.h (gone)      | 19 -------------------
 3 files changed, 19 insertions(+), 19 deletions(-)

Comment 34 commit-hook 2022-09-08 10:55:08 UTC

A commit in branch 2022Q3 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3fcb653641a362989362bd78322ac5e339312ae5

commit 3fcb653641a362989362bd78322ac5e339312ae5
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2022-08-01 22:03:08 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-09-08 10:52:36 +0000

    x11/kitty: Fix 12.3R (amd64,i386) build

     - add  LIB_DEPENDS= libepoll-shim-interpose.so:devel/libepoll-shim
            CPPFLAGS+= `pkg-config --cflags epoll-shim-interpose`
            LDFLAGS+= `pkg-config --libs epoll-shim-interpose`

     - add missing USES= desktop-file-utils

    PR:             265393
    (cherry picked from commit 3cc557e6e51a495df1723777c9509925b4da5a8c)

 x11/kitty/Makefile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

Comment 35 commit-hook 2022-09-08 10:55:09 UTC

A commit in branch 2022Q3 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aa52daa6e0d4c254baed51d32f3d66749a05c4b6

commit aa52daa6e0d4c254baed51d32f3d66749a05c4b6
Author:     Alexis Praga <alexis.praga@free.fr>
AuthorDate: 2022-08-13 20:33:05 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-09-08 10:53:18 +0000

    x11/kitty: Update to 0.25.2

    ChangeLog:      https://sw.kovidgoyal.net/kitty/changelog/#id1
    PR:             265393
    (cherry picked from commit 719265f06019d4c9da29853124f356ddeaf52dd7)

 x11/kitty/Makefile                             |  3 +--
 x11/kitty/distinfo                             |  6 +++---
 x11/kitty/files/patch-kitty_child.py (gone)    | 11 -----------
 x11/kitty/files/patch-kitty_data-types.h (new) | 19 +++++++++++++++++++
 x11/kitty/pkg-plist                            |  8 ++++++++
 5 files changed, 31 insertions(+), 16 deletions(-)