Bug 265536
| Summary: | x11/swayimg: update to 1.8 | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Ghost <2khramtsov> | ||||||||||
| Component: | Individual Port(s) | Assignee: | Jan Beich <jbeich> | ||||||||||
| Status: | Closed FIXED | ||||||||||||
| Severity: | Affects Only Me | CC: | 2khramtsov, jbeich | ||||||||||
| Priority: | --- | Keywords: | needs-qa | ||||||||||
| Version: | Latest | Flags: | jbeich:
maintainer-feedback+
jbeich: merge-quarterly- |
||||||||||
| Hardware: | Any | ||||||||||||
| OS: | Any | ||||||||||||
| URL: | https://github.com/artemsen/swayimg/releases/tag/v1.8 | ||||||||||||
| Bug Depends on: | 265017 | ||||||||||||
| Bug Blocks: | |||||||||||||
| Attachments: |
|
||||||||||||
Created attachment 235579 [details]
x11/swayimg: update to 1.8 (v. 1 "git am")
Forgot to git add -p "- USE_GNOME=cairo", maybe something else. I withdraw maintainer-approval? until closer inspection. Created attachment 235580 [details] x11/swayimg: update to 1.8 (v. 1.1 "git am") - Don't bootleg libfreetype.so and libfontconfig.so via USE_GNOME=cairo: https://github.com/artemsen/swayimg/commit/a155a7bb05d3 - cairo is still used, so leave it as-is: https://github.com/artemsen/swayimg/blob/v1.8/src/formats/svg.c#L65 - maintainer-approval? restored. Created attachment 235581 [details]
x11/swayimg: update to 1.8 (v. 1.2 "git am")
- Upstreamed fixes only.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=7a53589a408a4b292fb8625175e0e6deeefa9302 commit 7a53589a408a4b292fb8625175e0e6deeefa9302 Author: Evgeniy Khramtsov <evgeniy@khramtsov.org> AuthorDate: 2022-07-31 13:47:42 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2022-07-31 17:21:39 +0000 x11/swayimg: update to 1.7 Changes: https://github.com/artemsen/swayimg/releases/tag/v1.7 PR: 265536 x11/swayimg/Makefile | 5 ++--- x11/swayimg/distinfo | 8 +++----- x11/swayimg/files/patch-meson.build (new) | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 8 deletions(-) A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c185ade7f5e411c1aba8d2e506c2fedd77eb3c0 commit 1c185ade7f5e411c1aba8d2e506c2fedd77eb3c0 Author: Evgeniy Khramtsov <evgeniy@khramtsov.org> AuthorDate: 2022-07-31 14:20:27 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2022-07-31 17:21:39 +0000 x11/swayimg: update to 1.8 Changes: https://github.com/artemsen/swayimg/releases/tag/v1.8 PR: 265536 x11/swayimg/Makefile | 17 +++++++++++------ x11/swayimg/distinfo | 12 +++++++----- x11/swayimg/files/patch-meson.build (gone) | 21 --------------------- 3 files changed, 18 insertions(+), 32 deletions(-) Thanks for the patches and upstreaming. Landed. (In reply to Evgeniy Khramtsov from comment #3) > - cairo is still used, so leave it as-is: When LIBRSVG2 option is disabled cairo is no longer used. https://github.com/artemsen/swayimg/commit/a155a7bb05d3 https://github.com/artemsen/swayimg/commit/28715d0fc822 > LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ > + libfreetype.so:print/freetype2 \ > + libfontconfig.so:x11-fonts/fontconfig \ > libjson-c.so:devel/json-c \ > libwayland-client.so:graphics/wayland \ > libxkbcommon.so:x11/libxkbcommon In my ports *_DEPENDS are sorted by port origin, not by library name. Before ports-mgmt/portfmt existed both styles were common. Comment on attachment 235578 [details] x11/swayimg: update to 1.7 (v. 1 "git am") (In reply to Evgeniy Khramtsov from comment #0) > 1.7 is transitory so there isn't a separate branch with commit for PATCHFILES. I generally use disconnected cherry-picked commits in such a case. Makes it easier to review downstream diff. > --- /dev/null > +++ b/x11/swayimg/files/patch-meson.build > @@ -0,0 +1,19 @@ > +--- meson.build.orig 2022-02-20 08:36:23 UTC > ++++ meson.build > +@@ -39,6 +39,8 @@ bash = dependency('bash-completion', required: get_op Patches should have a header with rationale or a link to upstream issue/proposal. Comment on attachment 235581 [details] x11/swayimg: update to 1.8 (v. 1.2 "git am") > Changes: https://github.com/artemsen/swayimg/compare/v1.7...v1.8 Upstream release notes are preferred as raw commit log maybe hard to read (e.g., merge commits, style noise, no "big picture"). Backporting to 2022Q3 (for /quarterly) seems to depend on newer depends epoll-shim wrappers, so maybe later (requires testing all consumers on /quarterly).
$ poudriere testport -j 130amd64 -p quarterly -b quarterly x11/swayimg
[...]
../src/window.c:343:6: error: field designator 'epoll_shim_close' does not refer to any field in type 'const struct xdg_toplevel_listener'
.close = handle_xdg_toplevel_close,
^
/usr/local/include/libepoll-shim/epoll-shim/detail/common.h:8:15: note: expanded from macro 'close'
#define close epoll_shim_close
^
1 error generated.
|
Created attachment 235578 [details] x11/swayimg: update to 1.7 (v. 1 "git am") 1.7 is transitory so there isn't a separate branch with commit for PATCHFILES. 1.8 is added to this PR shortly.