summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorpkfbcedkrz2022-06-01 14:51:16 -0400
committerpkfbcedkrz2022-06-01 14:51:16 -0400
commit2281aa2d14f8b4b7e9d57b192d7a5881150e8337 (patch)
tree4b75c9d1f692cb9df323b6630092a97e2895efdb
parentf2a6a62fad7ccb676b547c11cf39c7ac7dd0769a (diff)
downloadaur-xorg-fonts-100dpi-otb.tar.gz
remove conflicts to allow both pcf and otb for compatibility reasons (Qt fully supports pcf but has bugs with otb)
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 0 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5fab573a7b5..3cfcbc05b2e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,9 +11,6 @@ pkgbase = xorg-fonts-100dpi-otb
makedepends = xorg-mkfontscale
makedepends = xorg-util-macros
depends = xorg-fonts-alias-100dpi
- provides = xorg-fonts-100dpi
- conflicts = xorg-fonts-100dpi
- replaces = xorg-fonts-100dpi
source = https://gitlab.freedesktop.org//xorg/font/adobe-100dpi/-/archive/master/adobe-100dpi-master.tar.gz
source = https://gitlab.freedesktop.org//xorg/font/adobe-utopia-100dpi/-/archive/master/adobe-utopia-100dpi-master.tar.gz
source = https://gitlab.freedesktop.org//xorg/font/bh-100dpi/-/archive/master/bh-100dpi-master.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index be6c26b1a60..4c5538ee85d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,9 +12,6 @@ url="https://gitlab.freedesktop.org/"
license=('custom')
makedepends=('fonttosfnt-git' 'xorg-bdftopcf' 'xorg-font-util' 'xorg-mkfontscale' 'xorg-util-macros')
depends=('xorg-fonts-alias-100dpi')
-replaces=('xorg-fonts-100dpi')
-provides=('xorg-fonts-100dpi')
-conflicts=('xorg-fonts-100dpi')
source=(${url}/xorg/font/adobe-100dpi/-/archive/master/adobe-100dpi-master.tar.gz
${url}/xorg/font/adobe-utopia-100dpi/-/archive/master/adobe-utopia-100dpi-master.tar.gz
${url}/xorg/font/bh-100dpi/-/archive/master/bh-100dpi-master.tar.gz