Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] New package: hikari-1.1.0
@ 2020-05-05 22:58 ahesford
  2020-05-06 11:58 ` [PR PATCH] [Updated] " ahesford
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: ahesford @ 2020-05-05 22:58 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 469 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/21668

New package: hikari-1.1.0
I hope to upstream the Makefile patches so this will build properly in xbps-src without the patch. In the meantime, this allows building hikari for all archs.

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

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

From bcdf670a47a9a487f406eae08e0f685a535edd4f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 May 2020 18:52:52 -0400
Subject: [PATCH] New package: hikari-1.1.0

---
 srcpkgs/hikari/patches/Makefile.patch | 58 +++++++++++++++++++++++++++
 srcpkgs/hikari/template               | 31 ++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 srcpkgs/hikari/patches/Makefile.patch
 create mode 100644 srcpkgs/hikari/template

diff --git a/srcpkgs/hikari/patches/Makefile.patch b/srcpkgs/hikari/patches/Makefile.patch
new file mode 100644
index 00000000000..4c17dad227e
--- /dev/null
+++ b/srcpkgs/hikari/patches/Makefile.patch
@@ -0,0 +1,58 @@
+--- 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
new file mode 100644
index 00000000000..08e8d6eb793
--- /dev/null
+++ b/srcpkgs/hikari/template
@@ -0,0 +1,31 @@
+# Template file for 'hikari'
+pkgname=hikari
+version=1.1.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"
+hostmakedepends="bmake pkg-config wayland-devel"
+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"
+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=2a34ba27291024ae210a92953d35f34d7c23fea535d1ae14db9d2a4c645a2a31
+conf_files="/etc/pam.d/hikari-unlocker"
+
+pre_build() {
+	export CFLAGS_COMMON="${CFLAGS}"
+	export LDFLAGS_COMMON="${LDFLAGS}"
+	make_build_args+=" CC=$CC"
+}
+
+post_install() {
+	vlicense LICENSE
+}

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] New package: hikari-1.1.0
  2020-05-05 22:58 [PR PATCH] New package: hikari-1.1.0 ahesford
@ 2020-05-06 11:58 ` ahesford
  2020-05-06 12:01 ` ahesford
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: ahesford @ 2020-05-06 11:58 UTC (permalink / raw)
  To: ml


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

There is an updated 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/21668

New package: hikari-1.1.0
I hope to upstream the Makefile patches so this will build properly in xbps-src without the patch. In the meantime, this allows building hikari for all archs.

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

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

From 800df0e0fcd8094f6bd1e446a5e5250f2387b83b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 May 2020 18:52:52 -0400
Subject: [PATCH] New package: hikari-1.1.0

---
 srcpkgs/hikari/patches/Makefile.patch | 58 +++++++++++++++++++++++++++
 srcpkgs/hikari/template               | 35 ++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 srcpkgs/hikari/patches/Makefile.patch
 create mode 100644 srcpkgs/hikari/template

diff --git a/srcpkgs/hikari/patches/Makefile.patch b/srcpkgs/hikari/patches/Makefile.patch
new file mode 100644
index 00000000000..4c17dad227e
--- /dev/null
+++ b/srcpkgs/hikari/patches/Makefile.patch
@@ -0,0 +1,58 @@
+--- 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
new file mode 100644
index 00000000000..04eac31bd47
--- /dev/null
+++ b/srcpkgs/hikari/template
@@ -0,0 +1,35 @@
+# Template file for 'hikari'
+pkgname=hikari
+version=1.1.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"
+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"
+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=2a34ba27291024ae210a92953d35f34d7c23fea535d1ae14db9d2a4c645a2a31
+conf_files="/etc/pam.d/hikari-unlocker"
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" wayland-devel"
+fi
+
+pre_build() {
+	export CFLAGS_COMMON="${CFLAGS}"
+	export LDFLAGS_COMMON="${LDFLAGS}"
+	make_build_args+=" CC=$CC"
+}
+
+post_install() {
+	vlicense LICENSE
+}

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] New package: hikari-1.1.0
  2020-05-05 22:58 [PR PATCH] New package: hikari-1.1.0 ahesford
  2020-05-06 11:58 ` [PR PATCH] [Updated] " ahesford
@ 2020-05-06 12:01 ` ahesford
  2020-05-25  0:54 ` ahesford
  2020-05-31 20:00 ` [PR PATCH] [Merged]: " Piraty
  3 siblings, 0 replies; 5+ messages in thread
From: ahesford @ 2020-05-06 12:01 UTC (permalink / raw)
  To: ml


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

There is an updated 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/21668

New package: hikari-1.1.0
I hope to upstream the Makefile patches so this will build properly in xbps-src without the patch. In the meantime, this allows building hikari for all archs.

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

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

From eb5e87d06d3e8541c730a2f07361472830c464f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 May 2020 18:52:52 -0400
Subject: [PATCH] New package: hikari-1.1.0

---
 srcpkgs/hikari/patches/Makefile.patch | 58 +++++++++++++++++++++++++++
 srcpkgs/hikari/template               | 39 ++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 srcpkgs/hikari/patches/Makefile.patch
 create mode 100644 srcpkgs/hikari/template

diff --git a/srcpkgs/hikari/patches/Makefile.patch b/srcpkgs/hikari/patches/Makefile.patch
new file mode 100644
index 00000000000..4c17dad227e
--- /dev/null
+++ b/srcpkgs/hikari/patches/Makefile.patch
@@ -0,0 +1,58 @@
+--- 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
new file mode 100644
index 00000000000..d5b1a29973f
--- /dev/null
+++ b/srcpkgs/hikari/template
@@ -0,0 +1,39 @@
+# Template file for 'hikari'
+pkgname=hikari
+version=1.1.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"
+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"
+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=2a34ba27291024ae210a92953d35f34d7c23fea535d1ae14db9d2a4c645a2a31
+conf_files="/etc/pam.d/hikari-unlocker"
+
+if [ "$CROSS_BUILD" ]; then
+	# Makefile executes wayland-scanner
+	hostmakedepends+=" wayland-devel"
+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}"
+	make_build_args+=" CC=$CC"
+}
+
+post_install() {
+	vlicense LICENSE
+}

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] New package: hikari-1.1.0
  2020-05-05 22:58 [PR PATCH] New package: hikari-1.1.0 ahesford
  2020-05-06 11:58 ` [PR PATCH] [Updated] " ahesford
  2020-05-06 12:01 ` ahesford
@ 2020-05-25  0:54 ` ahesford
  2020-05-31 20:00 ` [PR PATCH] [Merged]: " Piraty
  3 siblings, 0 replies; 5+ messages in thread
From: ahesford @ 2020-05-25  0:54 UTC (permalink / raw)
  To: ml


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

There is an updated 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/21668

New package: hikari-1.1.0
I hope to upstream the Makefile patches so this will build properly in xbps-src without the patch. In the meantime, this allows building hikari for all archs.

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

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

From eddfd774e14241c145b0fb3280c51a877146722f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 May 2020 18:52:52 -0400
Subject: [PATCH] New package: hikari-1.2.1

---
 srcpkgs/hikari/patches/Makefile.patch | 58 +++++++++++++++++++++++++++
 srcpkgs/hikari/template               | 39 ++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 srcpkgs/hikari/patches/Makefile.patch
 create mode 100644 srcpkgs/hikari/template

diff --git a/srcpkgs/hikari/patches/Makefile.patch b/srcpkgs/hikari/patches/Makefile.patch
new file mode 100644
index 00000000000..4c17dad227e
--- /dev/null
+++ b/srcpkgs/hikari/patches/Makefile.patch
@@ -0,0 +1,58 @@
+--- 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
new file mode 100644
index 00000000000..dd48d8ea5ac
--- /dev/null
+++ b/srcpkgs/hikari/template
@@ -0,0 +1,39 @@
+# Template file for 'hikari'
+pkgname=hikari
+version=1.2.1
+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"
+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"
+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"
+
+if [ "$CROSS_BUILD" ]; then
+	# Makefile executes wayland-scanner
+	hostmakedepends+=" wayland-devel"
+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}"
+	make_build_args+=" CC=$CC"
+}
+
+post_install() {
+	vlicense LICENSE
+}

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Merged]: New package: hikari-1.1.0
  2020-05-05 22:58 [PR PATCH] New package: hikari-1.1.0 ahesford
                   ` (2 preceding siblings ...)
  2020-05-25  0:54 ` ahesford
@ 2020-05-31 20:00 ` Piraty
  3 siblings, 0 replies; 5+ messages in thread
From: Piraty @ 2020-05-31 20:00 UTC (permalink / raw)
  To: ml


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

There's a merged pull request on the void-packages repository

New package: hikari-1.1.0
https://github.com/void-linux/void-packages/pull/21668

Description:
I hope to upstream the Makefile patches so this will build properly in xbps-src without the patch. In the meantime, this allows building hikari for all archs.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-05 22:58 [PR PATCH] New package: hikari-1.1.0 ahesford
2020-05-06 11:58 ` [PR PATCH] [Updated] " ahesford
2020-05-06 12:01 ` ahesford
2020-05-25  0:54 ` ahesford
2020-05-31 20:00 ` [PR PATCH] [Merged]: " Piraty

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git