Bug 260639 - x11-toolkits/gtk30: update to 3.24.31
Summary: x11-toolkits/gtk30: update to 3.24.31
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-desktop (Team)
URL: https://gitlab.gnome.org/GNOME/gtk/-/...
Keywords: needs-qa, patch
Depends on:
Blocks:
 
Reported: 2021-12-23 13:49 UTC by Jan Beich
Modified: 2022-01-04 22:17 UTC (History)
2 users (show)

See Also:
tcberner: maintainer-feedback+
jbeich: merge-quarterly+
antoine: exp-run+

Attachments
v1 (apply via "git am") (6.96 KB, patch)
2021-12-23 13:49 UTC, Jan Beich 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jan Beich freebsd_committer freebsd_triage 2021-12-23 13:49:06 UTC 
Created attachment 230346 [details]
v1 (apply via "git am")

- Revert ports 57c50ac3760e due to patch conflict
- Drop wayland-protocols from RUN_DEPENDS per upstream
Comment 1 Jan Beich freebsd_committer freebsd_triage 2021-12-23 13:50:12 UTC 
https://gitlab.gnome.org/GNOME/gtk/-/commit/6efcbf463439 requires exp-run.
Comment 3 commit-hook freebsd_committer freebsd_triage 2021-12-31 09:53:52 UTC 
A commit in branch main references this bug:

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

commit a7668311d79c3b83888c4cfdfbbab1a4816dc955
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-12-31 09:41:04 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-12-31 09:53:01 +0000

    deskutils/maliit-framework: explicitly depend on wayland-protocols

    CMake Error at /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:230 (message):
      Could NOT find WaylandProtocols (missing: WAYLANDPROTOCOLS_PATH)
    Call Stack (most recent call first):
      /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:594 (_FPHSA_FAILURE_MESSAGE)
      cmake/FindWaylandProtocols.cmake:38 (find_package_handle_standard_args)
      CMakeLists.txt:52 (find_package)

    PR:             260639
    Reported by:    antoine (via exp-run)

 deskutils/maliit-framework/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Comment 4 commit-hook freebsd_committer freebsd_triage 2021-12-31 09:53:53 UTC 
A commit in branch main references this bug:

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

commit 7c6871757dc991da60cb4ed5b3ca613cfbf8e2b1
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-12-31 09:47:13 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-12-31 09:53:01 +0000

    x11-wm/phoc: explicitly depend on wayland-protocols

    meson.build:36:0: ERROR: Dependency "wayland-protocols" not found, tried pkgconfig

    PR:             260639
    Reported by:    antoine (via exp-run)

 x11-wm/phoc/Makefile | 1 +
 1 file changed, 1 insertion(+)
Comment 5 commit-hook freebsd_committer freebsd_triage 2021-12-31 09:53:54 UTC 
A commit in branch main references this bug:

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

commit a480caeeb628da63ed943d07597cadbd47ff166f
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-12-31 09:45:10 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-12-31 09:53:01 +0000

    x11/wcm: explicitly depend on wayland-protocols

    proto/meson.build:1:0: ERROR: Dependency "wayland-protocols" not found, tried pkgconfig

    PR:             260639
    Reported by:    antoine (via exp-run)

 x11/wcm/Makefile | 1 +
 1 file changed, 1 insertion(+)
Comment 6 commit-hook freebsd_committer freebsd_triage 2021-12-31 09:53:55 UTC 
A commit in branch main references this bug:

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

commit 64cd9b834640d880d8bb0cd083d2e4cdf365eec6
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-12-31 09:43:55 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-12-31 09:53:01 +0000

    www/webkit2-gtk3: explicitly depend on wayland-protocols

    ninja: error: '/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml', needed by 'WebKit2Gtk/DerivedSources/pointer-constraints-unstable-v1-protocol.c', missing and no known rule to make it

    PR:             260639
    Reported by:    antoine (via exp-run)

 www/webkit2-gtk3/Makefile | 1 +
 1 file changed, 1 insertion(+)
Comment 7 Antoine Brodin freebsd_committer freebsd_triage 2022-01-04 13:56:04 UTC 
Exp-run looks fine
Comment 8 Tobias C. Berner freebsd_committer freebsd_triage 2022-01-04 14:59:35 UTC 
Ship it.
Comment 9 commit-hook freebsd_committer freebsd_triage 2022-01-04 17:49:21 UTC 
A commit in branch main references this bug:

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

commit 4e21a388ba0b9df041d963c3810c73689b0ec9f2
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-12-20 18:29:04 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-01-04 17:48:27 +0000

    x11-toolkits/gtk30: update to 3.24.31

    Changes:        https://gitlab.gnome.org/GNOME/gtk/-/compare/3.24.30...3.24.31
    PR:             260639
    Exp-run by:     antoine
    Approved by:    tcberner

 x11-toolkits/gtk30/Makefile                        | 11 ++--
 x11-toolkits/gtk30/distinfo                        |  6 +--
 ...ze-changed-before-hiding-a-surface.patch (gone) | 59 ----------------------
 ...-wl_output-globals-not-bound-by-us.patch (gone) | 34 -------------
 4 files changed, 6 insertions(+), 104 deletions(-)
Comment 10 commit-hook freebsd_committer freebsd_triage 2022-01-04 17:57:23 UTC 
A commit in branch main references this bug:

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

commit 31195e7a14b54c4adaf12696875e9a022549bf60
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-01-04 17:56:40 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-01-04 17:56:40 +0000

    x11-toolkits/gtk-layer-shell: silence gtk3 warning after 4e21a388ba0b

    $ nwg-dock
    [...]
    ** (<unknown>:4483): WARNING **: gtk-layer-shell v0.6.0 may not work on GTK v3.24.31. If you experience crashes, check https://github.com/wmww/gtk-layer-shell/blob/master/compatibility.md

    PR:             260639

 x11-toolkits/gtk-layer-shell/Makefile             |  2 +-
 x11-toolkits/gtk-layer-shell/files/patch-gtk-priv | 50 ++++++++++++++---------
 2 files changed, 31 insertions(+), 21 deletions(-)
Comment 11 commit-hook freebsd_committer freebsd_triage 2022-01-04 22:17:02 UTC 
A commit in branch 2022Q1 references this bug:

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

commit ba478786152c46e7a31f00240b10d5daa4f99851
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-01-04 17:56:40 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-01-04 22:16:06 +0000

    x11-toolkits/gtk-layer-shell: silence gtk3 warning after 4e21a388ba0b

    $ nwg-dock
    [...]
    ** (<unknown>:4483): WARNING **: gtk-layer-shell v0.6.0 may not work on GTK v3.24.31. If you experience crashes, check https://github.com/wmww/gtk-layer-shell/blob/master/compatibility.md

    PR:             260639
    (cherry picked from commit 31195e7a14b54c4adaf12696875e9a022549bf60)

 x11-toolkits/gtk-layer-shell/Makefile             |  2 +-
 x11-toolkits/gtk-layer-shell/files/patch-gtk-priv | 50 ++++++++++++++---------
 2 files changed, 31 insertions(+), 21 deletions(-)
Comment 12 commit-hook freebsd_committer freebsd_triage 2022-01-04 22:17:03 UTC 
A commit in branch 2022Q1 references this bug:

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

commit 4568eab9e21814579831ad4d12773c2f63d775d3
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-12-20 18:29:04 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-01-04 22:16:01 +0000

    x11-toolkits/gtk30: update to 3.24.31

    Changes:        https://gitlab.gnome.org/GNOME/gtk/-/compare/3.24.30...3.24.31
    PR:             260639
    Exp-run by:     antoine
    Approved by:    tcberner

    (cherry picked from commit 4e21a388ba0b9df041d963c3810c73689b0ec9f2)

 x11-toolkits/gtk30/Makefile                        | 11 ++--
 x11-toolkits/gtk30/distinfo                        |  6 +--
 ...ze-changed-before-hiding-a-surface.patch (gone) | 59 ----------------------
 ...-wl_output-globals-not-bound-by-us.patch (gone) | 34 -------------
 4 files changed, 6 insertions(+), 104 deletions(-)