diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-01-02 00:39:01 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-01-02 00:39:01 +0000 |
| commit | d3e6a3ebd735009198e2f1ab1692a19ea3a67144 (patch) | |
| tree | 66d75dd0c583006650ab7cf1c3d4351a183ddd7a | |
| parent | faf51b8eb2b23f8991ad1f20a0be6caa803ce48f (diff) | |
| download | packages-d3e6a3ebd735009198e2f1ab1692a19ea3a67144.tar.gz packages-d3e6a3ebd735009198e2f1ab1692a19ea3a67144.tar.bz2 packages-d3e6a3ebd735009198e2f1ab1692a19ea3a67144.tar.xz packages-d3e6a3ebd735009198e2f1ab1692a19ea3a67144.zip | |
user/xorg-server: fix default font path (thanks, alpine)
| -rw-r--r-- | user/xorg-server/APKBUILD | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index 928b86a42..181bbde15 100644 --- a/user/xorg-server/APKBUILD +++ b/user/xorg-server/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorg-server pkgver=1.20.3 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org X11 server" url="https://www.X.Org/" arch="all" @@ -59,13 +59,9 @@ prepare() { build() { cd "$builddir" - # xorg modules does not work with the -z now and it seems like we - # cannot pass over the linker flag to .so files. so we tweak the - # gcc specs. export CFLAGS="$CFLAGS -D_GNU_SOURCE" [ "$CLIBC" == musl ] && export CFLAGS="$CFLAGS -D__gid_t=gid_t -D__uid_t=uid_t" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" - _fontroot="/usr/share/fonts" ./configure \ --build=$CBUILD \ @@ -73,8 +69,6 @@ build() { --prefix=/usr \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ - --with-fontrootdir=$_fontroot \ - --with-default-font-path=${_fontroot}/misc,${_fontroot}/100dpi:unscaled,${_fontroot}/75dpi:unscaled,${_fontroot}/TTF,${_fontroot}/Type1,${_fontroot}/truetype \ --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ --without-systemd-daemon \ |