From b60ab9d9e7fa4a97d7c217c03be7456a4fc006ff Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.eu>
Date: Sun, 12 Aug 2018 17:41:53 +0200
Subject: [PATCH] xorg-server: fix default font directories

---
 .../patches/meson-fontrootdir.patch           | 26 +++++++++++++++++++
 srcpkgs/xorg-server/template                  |  4 +--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/xorg-server/patches/meson-fontrootdir.patch

diff --git a/srcpkgs/xorg-server/patches/meson-fontrootdir.patch b/srcpkgs/xorg-server/patches/meson-fontrootdir.patch
new file mode 100644
index 00000000000..f3a87d506b4
--- /dev/null
+++ b/srcpkgs/xorg-server/patches/meson-fontrootdir.patch
@@ -0,0 +1,26 @@
+--- meson.build.orig
++++ meson.build
+@@ -122,8 +122,11 @@
+ 
+ dfp = get_option('default_font_path')
+ if dfp == ''
+-    fontutil_dep = dependency('fontutil')
+-    fontrootdir = fontutil_dep.get_pkgconfig_variable('fontrootdir')
++    fontrootdir = get_option('font_root_dir')
++	if fontrootdir == ''
++		fontutil_dep = dependency('fontutil')
++		fontrootdir = fontutil_dep.get_pkgconfig_variable('fontrootdir')
++	endif
+     default_font_path = ','.join([
+         join_paths(fontrootdir, 'misc'),
+         join_paths(fontrootdir, 'TTF'),
+--- meson_options.txt.orig
++++ meson_options.txt
+@@ -24,6 +24,7 @@
+ option('module_dir', type: 'string', value: 'xorg/modules',
+        description: 'X.Org modules directory (absolute or relative to the directory specified by the libdir option)')
+ option('default_font_path', type: 'string')
++option('font_root_dir', type: 'string')
+ 
+ option('glx', type: 'boolean', value: true)
+ option('xdmcp', type: 'boolean', value: true)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 6ba73875b11..6f216e8298e 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,11 +1,11 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
 version=1.20.1
-revision=5
+revision=6
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
- -Dxkb_output_dir=/var/lib/xkb -Ddefault_font_path=/usr/share/fonts/X11
+ -Dxkb_output_dir=/var/lib/xkb -Dfont_root_dir=/usr/share/fonts/X11
  -Ddmx=true -Dlinux_acpi=true -Dlinux_apm=false -Dsuid_wrapper=true
  -Dsystemd_logind=false -Dxcsecurity=true -Dos_vendor=Void"
 hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip"