diff options
| author | Max Shaughnessy | 2022-04-14 13:38:14 +0100 |
|---|---|---|
| committer | Max Shaughnessy | 2022-04-14 13:38:14 +0100 |
| commit | 63d82e5c9dba34b3ef902db3b21d3f155f97f581 (patch) | |
| tree | 5686eae2b4199ece3e29f6e59834c158cbe5b336 | |
| parent | 7dfbf0d5834375264c18d44ef7dda044e1a3fb56 (diff) | |
| download | aur-63d82e5c9dba34b3ef902db3b21d3f155f97f581.tar.gz | |
Multiple changes
* Add maintainers comment
* Add git to makedepends
* Fix cros-host-fonts per upstream changes
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | cros-container-guest-tools.install | 13 |
3 files changed, 23 insertions, 9 deletions
@@ -1,11 +1,12 @@ pkgbase = cros-container-guest-tools-git pkgdesc = Linux guest tools for the Crostini containers on ChromeOS - pkgver = r275.19eab9e - pkgrel = 3 + pkgver = r334.d0714026 + pkgrel = 1 url = https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools install = cros-container-guest-tools.install arch = any license = custom + makedepends = git depends = openssh depends = xdg-utils depends = xkeyboard-config @@ -37,4 +38,3 @@ pkgbase = cros-container-guest-tools-git sha1sums = f05da51a3913c5815d320c8ed536f2a7ac1fdcd5 pkgname = cros-container-guest-tools-git - @@ -1,11 +1,14 @@ +# Maintainer: Max Shaughnessy <max@mshaugh.com> + _pkgname=cros-container-guest-tools pkgname=${_pkgname}-git -pkgver=r275.19eab9e -pkgrel=3 +pkgver=r334.d0714026 +pkgrel=1 pkgdesc="Linux guest tools for the Crostini containers on ChromeOS" arch=('any') license=('custom') depends=('openssh' 'xdg-utils' 'xkeyboard-config' 'pulseaudio' 'xxd' 'packagekit' 'dbus' 'xorg-xdpyinfo' 'xorg-xrdb' 'xorg-xsetroot' 'mailcap') +makedepends=('git') install=cros-container-guest-tools.install url="https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools" source=("git+${url}" @@ -35,7 +38,7 @@ pkgver() { package() { # license - install -m644 -D ${srcdir}/${_pkgname}/LICENSE ${pkgdir}/usr/share/licenses/cros-container-guest-tools/LICENSE + install -m644 -D ${srcdir}/${_pkgname}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE # install locale fix (to override C.UTF-8 locale, set to container by termina) install -m755 -D ${srcdir}/cros-locale.sh ${pkgdir}/etc/profile.d/cros-locale.sh @@ -78,9 +81,7 @@ package() { ### cros-host-fonts - install -m644 -D ${srcdir}/${_pkgname}/cros-host-fonts/05-cros-fonts.conf ${pkgdir}/etc/fonts/conf.avail/05-cros-fonts.conf - mkdir -p ${pkgdir}/etc/fonts/conf.d/ - ln -sf ../conf.avail/05-cros-fonts.conf ${pkgdir}/etc/fonts/conf.d/05-cros-fonts.conf + install -m644 -D ${srcdir}/${_pkgname}/cros-host-fonts/usr-share-fonts-chromeos.mount ${pkgdir}/usr/lib/systemd/system/usr-share-fonts-chromeos.mount ### cros-notificationd diff --git a/cros-container-guest-tools.install b/cros-container-guest-tools.install index 7dd61b614532..3c5207d2eaef 100644 --- a/cros-container-guest-tools.install +++ b/cros-container-guest-tools.install @@ -14,6 +14,10 @@ post_install() { # workaround for https://bugs.archlinux.org/task/58701 - remove after fix ln -sf /opt/google/cros-containers/cros-adapta /usr/share/themes/CrosAdapta + # cros-host-fonts + systemctl unmask usr-share-fonts-chromeos.mount + systemctl enable usr-share-fonts-chromeos.mount --now + post_upgrade } @@ -43,6 +47,12 @@ EOF } +pre_remove() { + + # cros-host-fonts + systemctl stop usr-share-fonts-chromeos.mount +} + post_remove() { # update dconf after GTK+ theme installed @@ -59,4 +69,7 @@ post_remove() { # workaround for https://bugs.archlinux.org/task/58701 - remove after fix rm -f /usr/share/themes/CrosAdapta rm -f /usr/bin/sommelier + + # cros-host-fonts + systemctl mask usr-share-fonts-chromeos.mount } |