From a902b5a449ba3b208978f2eb97c0901b1015f8c8 Mon Sep 17 00:00:00 2001
From: patrick96
Date: Sun, 22 Dec 2019 16:52:50 +0100
Subject: [PATCH] fix(aur): Add xorgproto package as make dependency
xorgproto always was a make dependency (I think) but it was
automatically included indirectly by another dependency.
Arch recently cleaned up some xorg related packages which made xorgproto
no longer an indirect dependency of polybar which spams cmake with
messages like:
```
Package 'xproto', required by 'xau', not found
Package 'xproto', required by 'xdmcp', not found
Package 'xproto', required by 'xau', not found
Package 'xproto', required by 'xdmcp', not found
Package 'xproto', required by 'xau', not found
Package 'xproto', required by 'xdmcp', not found
Package 'xproto', required by 'xau', not found
Package 'xproto', required by 'xdmcp', not found
```
And during `make` finally completely fails the build because some
library's include directories are not honored because the xproto.pc file
cannot be found:
```
In file included from /home/patrick96/Projects/github.com/patrick96/polybar/include/cairo/utils.hpp:3,
from /home/patrick96/Projects/github.com/patrick96/polybar/src/cairo/utils.cpp:3:
/usr/include/cairo/cairo-ft.h:46:10: fatal error: ft2build.h: No such file or directory
46 | #include
| ^~~~~~~~~~~~
```
Ref: https://bugs.archlinux.org/task/64892
---
contrib/polybar-git.aur/PKGBUILD | 2 +-
contrib/polybar.aur/PKGBUILD | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/polybar-git.aur/PKGBUILD b/contrib/polybar-git.aur/PKGBUILD
index 5b94cb59..f57d4c11 100644
--- a/contrib/polybar-git.aur/PKGBUILD
+++ b/contrib/polybar-git.aur/PKGBUILD
@@ -13,7 +13,7 @@ optdepends=("i3-wm: i3 module support"
"ttf-unifont: Font used in example config"
"siji-git: Font used in example config"
"xorg-fonts-misc: Font used in example config")
-makedepends=("cmake" "git" "python" "pkg-config" "python-sphinx" "i3-wm")
+makedepends=("cmake" "git" "python" "pkg-config" "xorgproto" "python-sphinx" "i3-wm")
provides=("polybar")
conflicts=("polybar")
install="${_pkgname}.install"
diff --git a/contrib/polybar.aur/PKGBUILD b/contrib/polybar.aur/PKGBUILD
index f9b1b4da..a1921924 100644
--- a/contrib/polybar.aur/PKGBUILD
+++ b/contrib/polybar.aur/PKGBUILD
@@ -12,7 +12,7 @@ optdepends=("i3-wm: i3 module support"
"ttf-unifont: Font used in example config"
"siji-git: Font used in example config"
"xorg-fonts-misc: Font used in example config")
-makedepends=("cmake" "git" "python" "pkg-config" "python-sphinx" "i3-wm")
+makedepends=("cmake" "git" "python" "pkg-config" "xorgproto" "python-sphinx" "i3-wm")
conflicts=("polybar-git")
install="${pkgname}.install"
source=(${url}/releases/download/${pkgver}/polybar-${pkgver}.tar)