-
Notifications
You must be signed in to change notification settings - Fork 894
bazel: make GUI the default build #10413
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,6 +25,20 @@ RUN apt-get -y update \ | |
| docker-buildx-plugin \ | ||
| docker-ce \ | ||
| docker-ce-cli \ | ||
| libdbus-1-3 \ | ||
| libfontconfig1 \ | ||
| libsm6 \ | ||
| libx11-xcb1 \ | ||
| libxcb-icccm4 \ | ||
| libxcb-keysyms1 \ | ||
| libxcb-randr0 \ | ||
| libxcb-shape0 \ | ||
| libxcb-sync1 \ | ||
| libxcb-xfixes0 \ | ||
| libxcb-xkb1 \ | ||
| libxcb1-dev \ | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| libxkbcommon-x11-0 \ | ||
| libxkbcommon0 \ | ||
| openjdk-21-jre-headless \ | ||
| python3 \ | ||
| python3-yaml \ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| diff --git a/interface_libs/xcb/BUILD.bazel b/interface_libs/xcb/BUILD.bazel | ||
| index c1c5b6b6..3a659170 100644 | ||
| --- a/interface_libs/xcb/BUILD.bazel | ||
| +++ b/interface_libs/xcb/BUILD.bazel | ||
| @@ -67,10 +67,41 @@ cc_import( | ||
| system_provided = True, | ||
| ) | ||
|
|
||
| -cc_import( | ||
| - name = "xcb_cursor_ifso", | ||
| - interface_library = "libxcb-cursor.ifso", | ||
| - system_provided = True, | ||
| +# Headers-only target for xcb utility headers. Used by :xcb_cursor to | ||
| +# get xcb_renderutil.h, xcb_image.h, render.h etc. without depending on | ||
| +# the full :xcb target (which would create a circular dependency). | ||
| +cc_library( | ||
| + name = "xcb_hdrs", | ||
| + hdrs = glob(["xcb/*.h"]), | ||
| + includes = ["."], | ||
| + strip_include_prefix = ".", | ||
| +) | ||
| + | ||
| +# Build xcb-util-cursor from source instead of relying on a system-provided | ||
| +# shared library. The source is downloaded into cursor/ by patch_cmds in | ||
| +# the consumer's MODULE.bazel. This makes the Qt xcb platform plugin | ||
| +# self-contained — no host libxcb-cursor0 package required. | ||
| +cc_library( | ||
| + name = "xcb_cursor", | ||
| + srcs = [ | ||
| + "cursor/cursor.c", | ||
| + "cursor/cursor.h", | ||
| + "cursor/load_cursor.c", | ||
| + "cursor/parse_cursor_file.c", | ||
| + "cursor/shape_to_id.c", | ||
| + ], | ||
| + hdrs = ["cursor/xcb_cursor.h"], | ||
| + copts = [ | ||
| + # asprintf() is a GNU extension; glibc gates it behind _GNU_SOURCE. | ||
| + "-D_GNU_SOURCE", | ||
| + "-DXCURSORPATH='\"~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"'", | ||
| + ], | ||
| + include_prefix = "xcb", | ||
| + strip_include_prefix = "cursor", | ||
| + deps = [ | ||
| + ":xcb_hdrs", | ||
| + "@libxcb", | ||
| + ], | ||
| ) | ||
|
|
||
| cc_import( | ||
| @@ -94,7 +125,7 @@ cc_library( | ||
| deps = select({ | ||
| "@platforms//cpu:aarch64": [], | ||
| "//conditions:default": [ | ||
| - ":xcb_cursor_ifso", | ||
| + ":xcb_cursor", | ||
| ":xcb_icccm_ifso", | ||
| ":xcb_ifso", | ||
| ":xcb_image_ifso", |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
curlcommand downloads an external dependency without verifying its integrity. This poses a security risk and can lead to non-reproducible builds if the remote file changes or is compromised. It is recommended to verify the SHA256 checksum of the downloaded tarball before extraction.