[PR PATCH] hikari: update to 2.0.0.

[PR PATCH] hikari: update to 2.0.0.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages hikari
https://github.com/void-linux/void-packages/pull/22498

hikari: update to 2.0.0.


A patch file from https://github.com/void-linux/void-packages/pull/22498.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hikari-22498.patch --]
[-- Type: text/x-diff, Size: 5407 bytes --]

From 6542685f75169f8d7b181b52edd713665d75f9d1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Jun 2020 10:38:18 -0400
Subject: [PATCH] hikari: update to 2.0.0.

---
 srcpkgs/hikari/patches/Makefile.patch | 58 ---------------------------
 srcpkgs/hikari/template               | 28 +++++++------
 2 files changed, 16 insertions(+), 70 deletions(-)
 delete mode 100644 srcpkgs/hikari/patches/Makefile.patch

diff --git a/srcpkgs/hikari/patches/Makefile.patch b/srcpkgs/hikari/patches/Makefile.patch
deleted file mode 100644
index 4c17dad227e..00000000000
--- a/srcpkgs/hikari/patches/Makefile.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- Makefile.orig	2020-05-05 18:42:58.044009729 -0400
-+++ Makefile	2020-05-05 18:44:57.613239379 -0400
-@@ -75,6 +75,14 @@
- .PHONY: distclean clean clean-doc doc dist install uninstall
- .PATH: src
- 
-+.ifdef CFLAGS_COMMON
-+CFLAGS += ${CFLAGS_COMMON}
-+.endif
-+
-+.ifdef LDFLAGS_COMMON
-+LDFLAGS += ${LDFLAGS_COMMON}
-+.endif
-+
- .ifdef DEBUG
- CFLAGS += -g -O0 -fsanitize=address
- .else
-@@ -160,7 +168,7 @@
- 	echo "#define HIKARI_VERSION \"${VERSION}\"" >> version.h
- 
- hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h ${OBJS}
--	${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} ${LIBS} ${OBJS} -o ${.TARGET}
-+	${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o ${.TARGET} ${OBJS} ${LIBS}
- 
- xdg-shell-protocol.h:
- 	wayland-scanner server-header ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml ${.TARGET}
-@@ -169,7 +177,7 @@
- 	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
- 
- hikari-unlocker: hikari_unlocker.c
--	${CC} -lpam hikari_unlocker.c -o hikari-unlocker
-+	${CC} ${LDFLAGS} ${CFLAGS} -o hikari-unlocker hikari_unlocker.c -lpam
- 
- clean-doc:
- 	@test -e _darcs && echo "cleaning manpage" ||:
-@@ -216,14 +224,14 @@
- dist: distclean hikari-${VERSION}.tar.gz
- 
- install: hikari hikari-unlocker share/man/man1/hikari.1
--	mkdir -p ${PREFIX}/bin
--	mkdir -p ${PREFIX}/share/man/man1
--	mkdir -p ${PREFIX}/share/examples/hikari
--	mkdir -p ${ETC_PREFIX}/pam.d
--	install -m 4555 -g ${INSTALL_GROUP} hikari hikari-unlocker ${PREFIX}/bin
--	install -m 644 -g ${INSTALL_GROUP} share/man/man1/hikari.1 ${PREFIX}/share/man/man1
--	install -m 644 -g ${INSTALL_GROUP} share/examples/hikari/hikari.conf ${PREFIX}/share/examples/hikari
--	install -m 644 -g ${INSTALL_GROUP} pam.d/hikari-unlocker.${OS} ${ETC_PREFIX}/pam.d/hikari-unlocker
-+	mkdir -p ${DESTDIR}/${PREFIX}/bin
-+	mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1
-+	mkdir -p ${DESTDIR}/${PREFIX}/share/examples/hikari
-+	mkdir -p ${DESTDIR}/${ETC_PREFIX}/pam.d
-+	install -m 4555 hikari hikari-unlocker ${DESTDIR}/${PREFIX}/bin
-+	install -m 644 share/man/man1/hikari.1 ${DESTDIR}/${PREFIX}/share/man/man1
-+	install -m 644 share/examples/hikari/hikari.conf ${DESTDIR}/${PREFIX}/share/examples/hikari
-+	install -m 644 pam.d/hikari-unlocker.${OS} ${DESTDIR}/${ETC_PREFIX}/pam.d/hikari-unlocker
- 
- uninstall:
- 	-rm ${PREFIX}/bin/hikari
diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index dd48d8ea5ac..e31ebe62048 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -1,24 +1,24 @@
 # Template file for 'hikari'
 pkgname=hikari
-version=1.2.1
+version=2.0.0
 revision=1
 build_style=gnu-makefile
 make_cmd=bmake
 make_use_env=yes
 make_build_args="WITH_POSIX_C_SOURCE=YES WITH_XWAYLAND=YES
-	WITH_SCREENCOPY=YES WITH_GAMMACONTROL=YES WITH_LAYERSHELL=YES"
-make_install_args="ETC_PREFIX=/etc"
+ WITH_SCREENCOPY=YES WITH_GAMMACONTROL=YES WITH_LAYERSHELL=YES ETC_PREFIX="
+make_install_args="ETC_PREFIX="
 hostmakedepends="bmake pkg-config"
 makedepends="wlroots-devel pango-devel cairo-devel pam-devel glib-devel
-	libinput-devel xcb-util-errors-devel xcb-util-wm-devel
-	libucl-devel libxkbcommon-devel pixman-devel libevdev-devel"
+ libinput-devel xcb-util-errors-devel xcb-util-wm-devel libucl-devel
+ libxkbcommon-devel pixman-devel libevdev-devel"
 short_desc="Stacking Wayland compositor with tiling features"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://hikari.acmelabs.space"
 distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz"
-checksum=f361ec9a367c03a9e678a8d04361426f6982e661719b9e6a3e742572eae0a8e5
-conf_files="/etc/pam.d/hikari-unlocker"
+checksum=0230bd89c90da1082e7d59bd991118e0b76c621ee55d21506893866a44adb5fe
+conf_files="/etc/pam.d/hikari-unlocker /etc/hikari/hikari.conf"
 
 if [ "$CROSS_BUILD" ]; then
 	# Makefile executes wayland-scanner
@@ -26,11 +26,15 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 pre_build() {
-	# Relying on CFLAGS and LDFLAGS in the environment or command line
-	# would clobber additions the Makefile adds to find libs and headers;
-	# move those to *_COMMON and patch Makefile to append those flags
-	export CFLAGS_COMMON="${CFLAGS}"
-	export LDFLAGS_COMMON="${LDFLAGS}"
+	# The hikari Makefile appends to the CFLAGS and LDFLAGS variables;
+	# bmake ignores these appends altogether when passing variables on the
+	# command line (i.e., when make_use_env is undefined), but it ignores
+	# the values in the environment when make_use_env=yes. The _EXTRA
+	# variables provided in the Makefile allow us to force the right flags.
+	export CFLAGS_EXTRA="${CFLAGS}"
+	export LDFLAGS_EXTRA="${LDFLAGS}"
+
+	# bmake tends to ignore CC in the environment
 	make_build_args+=" CC=$CC"
 }