Skip to content

chromium-ozone-wayland: Stop depending on the system's wayland-scanne…#278

Merged
rakuco merged 1 commit into
OSSystems:masterfrom
OnkelUlla:oz-wl-wayland-scanner
Jun 27, 2019
Merged

chromium-ozone-wayland: Stop depending on the system's wayland-scanne…#278
rakuco merged 1 commit into
OSSystems:masterfrom
OnkelUlla:oz-wl-wayland-scanner

Conversation

@OnkelUlla
Copy link
Copy Markdown
Contributor

…r binary

This commit re-applies the changes of the commit given below to the current
chromium-ozone-wayland recipe as they got lost in the meantime.

| commit cd88d7b
| Author: Raphael Kubo da Costa raphael.kubo.da.costa@intel.com
| Date: Thu May 2 12:08:54 2019 +0200
|
| chromium-ozone-wayland: Stop depending on the system's wayland-scanner
| binary
|
| So far, we were using Chromium's default GN path for the system
| wayland-scanner binary, "/usr/bin/wayland-scanner", which may not be present
| at all and which should never be used anyway. Instead, we now point to the
| version built by the wayland-native recipe.
|
| Doing so of course requires depending on wayland-native in the first place,
| and that requires adding back REQUIRED_DISTRO_FEATURES and a DEPENDS block
| that got removed with no explanation when the recipe was updated to
| M72 (commit 97876fa, "chromium: Update to 72.0.3626.81").
|
| Fixes #241
|
| Signed-off-by: Raphael Kubo da Costa raphael.kubo.da.costa@intel.com

Fixes: 1f363e2 ("chromium: Update to 74.0.3729.131")
Signed-off-by: Ulrich Ölmann u.oelmann@pengutronix.de

…r binary

This commit re-applies the changes of the commit given below to the current
chromium-ozone-wayland recipe as they got lost in the meantime.

| commit cd88d7b
| Author: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
| Date:   Thu May 2 12:08:54 2019 +0200
|
|     chromium-ozone-wayland: Stop depending on the system's wayland-scanner
|     binary
|
|     So far, we were using Chromium's default GN path for the system
|     wayland-scanner binary, "/usr/bin/wayland-scanner", which may not be present
|     at all and which should never be used anyway. Instead, we now point to the
|     version built by the wayland-native recipe.
|
|     Doing so of course requires depending on wayland-native in the first place,
|     and that requires adding back REQUIRED_DISTRO_FEATURES and a DEPENDS block
|     that got removed with no explanation when the recipe was updated to
|     M72 (commit 97876fa, "chromium: Update to 72.0.3626.81").
|
|     Fixes OSSystems#241
|
|     Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>

Fixes: 1f363e2 ("chromium: Update to 74.0.3729.131")
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
Copy link
Copy Markdown
Collaborator

@rakuco rakuco left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thank you for noticing this had broken again

@rakuco rakuco merged commit dee8a80 into OSSystems:master Jun 27, 2019
@OnkelUlla OnkelUlla deleted the oz-wl-wayland-scanner branch June 27, 2019 19:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

chromium-ozone-wayland: Dependency on host system's wayland-scanner binary

2 participants