From 9212e1fe9afeb713b918db9b0e32b0e9e02fbbb8 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 29 Mar 2017 18:15:23 +0000
Subject: xorg-xrdb: update to 1.1.0

---
 abs/core/xorg-xrdb/PKGBUILD | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/abs/core/xorg-xrdb/PKGBUILD b/abs/core/xorg-xrdb/PKGBUILD
index 85b9266..af0f0ad 100644
--- a/abs/core/xorg-xrdb/PKGBUILD
+++ b/abs/core/xorg-xrdb/PKGBUILD
@@ -1,27 +1,31 @@
-# $Id: PKGBUILD 151003 2012-02-24 13:05:19Z allan $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xrdb
-pkgver=1.0.9
+pkgver=1.1.0
 pkgrel=2
 pkgdesc="X server resource database utility"
 arch=('i686' 'x86_64')
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 license=('custom')
-depends=('libx11' 'libxmu' 'mcpp')
+depends=('libx11' 'libxmu')
 makedepends=('xorg-util-macros')
+optdepends=('gcc: for preprocessing'
+            'mcpp: a lightweight alternative for preprocessing')
 groups=('xorg-apps' 'xorg')
-source=(http://xorg.freedesktop.org/archive/individual/app/xrdb-${pkgver}.tar.bz2)
-sha1sums=('efa5f2420411988d6a6e142934393fd272507857')
+source=(https://xorg.freedesktop.org/archive/individual/app/xrdb-${pkgver}.tar.bz2)
+sha256sums=('73827b6bbfc9d27ca287d95a1224c306d7053cd7b8156641698d7dc541ca565b')
 
 build() {
-  cd "${srcdir}/xrdb-${pkgver}"
-  ./configure --prefix=/usr --with-cpp=/usr/bin/mcpp
+  cd xrdb-${pkgver}
+  # --with-cpp=path       comma-separated list of paths to cpp command for xrdb to use at runtime
+  # mcpp is small but can fail, FS#46934
+  ./configure --prefix=/usr --with-cpp=/usr/bin/cpp,/usr/bin/mcpp
   make
 }
 
 package() {
-  cd "${srcdir}/xrdb-${pkgver}"
+  cd xrdb-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
-- 
cgit v0.12

