From 7327bd393f7ac60c47220fa4cb911175b088cabe Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Mon, 10 Oct 2022 18:42:18 -0700 Subject: [PATCH] main/*: depend on font-dejavu (MR 3521) renamed in aports@ee78772612 --- main/fbkeyboard/APKBUILD | 4 ++-- main/postmarketos-base-ui/APKBUILD | 4 ++-- main/postmarketos-ondev/APKBUILD | 4 ++-- main/postmarketos-splash/APKBUILD | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/main/fbkeyboard/APKBUILD b/main/fbkeyboard/APKBUILD index bc57c7185..9f0329f3c 100644 --- a/main/fbkeyboard/APKBUILD +++ b/main/fbkeyboard/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Ferenc Bakonyi pkgname=fbkeyboard pkgver=0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Framebuffer softkeyboard for use on devices with touchscreen input like smartphones" url="https://github.com/bakonyiferenc/fbkeyboard" arch="all" license="GPL-3.0-or-later" -depends="freetype ttf-dejavu" +depends="freetype font-dejavu" makedepends="linux-headers freetype-dev" source="fbkeyboard-$pkgver.tar.gz::https://github.com/bakonyiferenc/fbkeyboard/archive/refs/tags/$pkgver.tar.gz" options="!check" # No tests diff --git a/main/postmarketos-base-ui/APKBUILD b/main/postmarketos-base-ui/APKBUILD index 051c7476e..5621110e1 100644 --- a/main/postmarketos-base-ui/APKBUILD +++ b/main/postmarketos-base-ui/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Clayton Craft pkgname=postmarketos-base-ui pkgver=6 -pkgrel=0 +pkgrel=1 pkgdesc="Meta package for minimal postmarketOS UI base" url="https://postmarketos.org" arch="noarch" @@ -9,12 +9,12 @@ license="GPL-3.0-or-later" depends=" chrony dbus + font-dejavu haveged nftables postmarketos-artwork-icons postmarketos-base shadow - ttf-dejavu util-linux wireless-regdb wpa_supplicant diff --git a/main/postmarketos-ondev/APKBUILD b/main/postmarketos-ondev/APKBUILD index 60b160fde..85fcf4fbb 100644 --- a/main/postmarketos-ondev/APKBUILD +++ b/main/postmarketos-ondev/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Oliver Smith pkgname=postmarketos-ondev pkgver=0.8.1 -pkgrel=0 +pkgrel=1 pkgdesc="Calamares based on-device installer" url="https://postmarketos.org" # armhf blocked by qt5-qtdeclarative @@ -20,6 +20,7 @@ depends=" e2fsprogs elogind elogind-openrc + font-dejavu haveged haveged-openrc i3wm @@ -30,7 +31,6 @@ depends=" qtvirtualkeyboard-plasma tinydm tinydm-openrc - ttf-dejavu unclutter-xfixes util-linux-misc xf86-input-libinput diff --git a/main/postmarketos-splash/APKBUILD b/main/postmarketos-splash/APKBUILD index 806bf1a68..b514a5a5a 100644 --- a/main/postmarketos-splash/APKBUILD +++ b/main/postmarketos-splash/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Martijn Braam pkgname=postmarketos-splash pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Splash screen for postmarketOS" url="https://gitlab.com/postmarketos" arch="noarch" license="MIT" -depends="ttf-dejavu ttf-droid py3-pillow python3" +depends="font-dejavu ttf-droid py3-pillow python3" source="https://gitlab.com/postmarketos/postmarketos-splash/-/archive/$pkgver/postmarketos-splash-$pkgver.tar.gz config.ini https://gitlab.com/postmarketOS/artwork/raw/master/logo/pmos.ttf"