diff options
-rw-r--r-- | .SRCINFO | 5 | ||||
-rw-r--r-- | PKGBUILD | 7 | ||||
-rw-r--r-- | cros-container-guest-tools.install | 9 | ||||
-rw-r--r--[-rwxr-xr-x] | cros-locale.sh | 2 |
4 files changed, 8 insertions, 15 deletions
@@ -1,7 +1,7 @@ pkgbase = cros-container-guest-tools-git pkgdesc = Guest tools for the Crostini containers on ChromeOS - pkgver = r44.45e9b92 - pkgrel = 7 + pkgver = r46.8f9ecbd + pkgrel = 1 url = https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools install = cros-container-guest-tools.install arch = any @@ -9,6 +9,7 @@ pkgbase = cros-container-guest-tools-git optdepends = xdg-utils: for setting default-web-browser to ChromeOS host via garcon bridge optdepends = xorg-apps: for XWayland functionality optdepends = wayland: for Wayland functionality + optdepends = qt5-wayland: Qt5 Wayland backend source = git+https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools source = cros-sftp-conditions.conf source = cros-garcon-conditions.conf @@ -1,7 +1,7 @@ _pkgname=cros-container-guest-tools pkgname=${_pkgname}-git -pkgver=r44.45e9b92 -pkgrel=7 +pkgver=r46.8f9ecbd +pkgrel=1 pkgdesc="Guest tools for the Crostini containers on ChromeOS" arch=('any') license=('custom') @@ -10,6 +10,7 @@ optdepends=( 'xdg-utils: for setting default-web-browser to ChromeOS host via garcon bridge' 'xorg-apps: for XWayland functionality' 'wayland: for Wayland functionality' + 'qt5-wayland: Qt5 Wayland backend' ) install=cros-container-guest-tools.install url="https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools" @@ -17,7 +18,7 @@ source=("git+${url}" 'cros-sftp-conditions.conf' 'cros-garcon-conditions.conf' ' sha1sums=('SKIP' '0827ce6d673949a995be2d69d4974ddd9bdf16f1' 'd326cd35dcf150f9f9c8c7d6336425ec08ad2433' - 'b5a315f5b8f474a31dc3576efa3ef19881ec80d6') + '8586cf72dacdcca82022519467065f70fe4a3294') pkgver() { cd ${srcdir}/${_pkgname} diff --git a/cros-container-guest-tools.install b/cros-container-guest-tools.install index ae81511055c0..1e601ca8404c 100644 --- a/cros-container-guest-tools.install +++ b/cros-container-guest-tools.install @@ -17,10 +17,6 @@ post_install() { xdg-settings set default-web-browser garcon_host_browser.desktop fi - # TODO(crbug.com/835959): Remove this once we fix mesa. - mkdir -p /usr/lib64/dri - ln -sf /opt/google/cros-containers/lib/swrast_dri.so /usr/lib64/dri/swrast_dri.so - cat << EOF (!) This package is permanently work in progress until Crostini @@ -47,9 +43,4 @@ post_remove() { rm /usr/share/themes/CrosAdapta rm /usr/bin/sommelier - # TODO(crbug.com/835959): Remove this once we fix mesa. - rm /usr/lib64/dri/swrast_dri.so - rmdir /usr/lib64/dri 2>/dev/null - rmdir /usr/lib64 2>/dev/null - } diff --git a/cros-locale.sh b/cros-locale.sh index 2165bf38dc85..ff24e766f441 100755..100644 --- a/cros-locale.sh +++ b/cros-locale.sh @@ -1,6 +1,6 @@ #!/bin/sh -# termina force debian-specifi C.UTF-8 locale inside the container when +# termina force debian-specific C.UTF-8 locale inside the container when # launched via the Terminal app. We want to override this and set locate # defined inside container itself if [ "$LANG" = "C.UTF-8" ]; then |