Skip to content

Conversation

aperezdc
Copy link
Contributor

@aperezdc aperezdc commented Dec 4, 2023

9063294

[WPE] Fix build with GLib older than 2.74
https://bugs.webkit.org/show_bug.cgi?id=265286

Unreviewed build fix.

While 271376@main attempted to fix g_io_unix_fd_list_get() being
undefined with versions of GLib older than 2.74, it still resulted
in build issues in some cases. This changes the included header
to the <gio/gunixfdlist.h> one listed in the documentation.

* Source/WebKit/WPEPlatform/wpe/drm/WPEDRMSessionLogind.cpp: Include
  gio/gunixfdlist.h as per the documentation instead of glib-unix.h.

Canonical link: https://commits.webkit.org/271511@main

df11590

Misc iOS, tvOS & watchOS macOS Linux Windows
❌ 🧪 style 🛠 ios 🛠 mac 🛠 wpe 🛠 wincairo
🛠 ios-sim 🛠 mac-AS-debug 🧪 wpe-wk2
❌ 🧪 webkitperl 🧪 ios-wk2 🧪 api-mac 🧪 api-wpe
🧪 ios-wk2-wpt 🧪 mac-wk1 🛠 gtk
🧪 api-ios 🧪 mac-wk2 🧪 gtk-wk2
🛠 tv 🧪 mac-AS-debug-wk2 🧪 api-gtk
🛠 tv-sim 🧪 mac-wk2-stress
🛠 watch
✅ 🛠 🧪 unsafe-merge 🛠 watch-sim

@aperezdc aperezdc requested review from a team and zdobersek as code owners December 4, 2023 14:08
@aperezdc aperezdc self-assigned this Dec 4, 2023
@aperezdc aperezdc added the WPE WebKit WebKit WPE component label Dec 4, 2023
@aperezdc aperezdc requested review from a team and carlosgcampos December 4, 2023 22:11
@aperezdc aperezdc added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Dec 4, 2023
https://bugs.webkit.org/show_bug.cgi?id=265286

Unreviewed build fix.

While 271376@main attempted to fix g_io_unix_fd_list_get() being
undefined with versions of GLib older than 2.74, it still resulted
in build issues in some cases. This changes the included header
to the <gio/gunixfdlist.h> one listed in the documentation.

* Source/WebKit/WPEPlatform/wpe/drm/WPEDRMSessionLogind.cpp: Include
  gio/gunixfdlist.h as per the documentation instead of glib-unix.h.

Canonical link: https://commits.webkit.org/271511@main
@webkit-commit-queue webkit-commit-queue merged commit 9063294 into WebKit:main Dec 4, 2023
@webkit-commit-queue
Copy link
Collaborator

Committed 271511@main (9063294): https://commits.webkit.org/271511@main

Reviewed commits have been landed. Closing PR #21275 and removing active labels.

@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Dec 4, 2023
@aperezdc aperezdc deleted the eng/giounixfdlist branch December 4, 2023 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

WPE WebKit WebKit WPE component

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants