[gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/files/, gui-wm/hikari/
commit: bc316728b62ba034c09ed3e08beb21e0e400d256
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Dec 28 14:28:23 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Dec 28 17:00:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc316728
gui-wm/hikari: drop 2.2.2-r1
Signed-off-by: Ionen Wolkens gentoo.org>
gui-wm/hikari/Manifest | 1 -
gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch | 78
gui-wm/hikari/hikari-2.2.2-r1.ebuild | 78
gui-wm/hikari/metadata.xml | 4 --
4 files changed, 161 deletions(-)
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index f4f656fc45fd..3fc840736892 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,2 +1 @@
-DIST hikari-2.2.2.tar.gz 1019277 BLAKE2B
3cf76f0849cbc80493b6f078ec32b2a6f8e47f12ff3a015132e662dc2382f4071661126bf111550e5ab31eee69c54adaf10ec6ef64b681d7859771a180d30652
SHA512
53b1cb8b8e5fdbabcdcb5ba8af31f1cc66e89c8e94d217b7d1f89f0c733fb7969a251ef5090296b7aeca064aafc60d12878f3f2dbffa17e1fb24609e5549b4f1
DIST hikari-2.3.2.tar.gz 1022093 BLAKE2B
8e4df4377728cc1feab3509588a9f2d5138af6e3175682672eedce4ca45d5bb9b7e56568a860871b319b3ff1213468f38f0b6253927f6ab4b905dd495c05c53e
SHA512
b7485be089064dd19c4614f60066b3f7b2f322328fa771d4383db27656695746fb00ab534cc754929141c23b7556992391529e537e0522080177068f3d0e2954
diff --git a/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch
b/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch
deleted file mode 100644
index 472a9efa37df..
--- a/gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 555b770..01025b9 100644
a/Makefile
-+++ b/Makefile
-@@ -13,6 +13,7 @@ WITH_VIRTUAL_INPUT = YES
- OS != uname
- VERSION ?= "CURRENT"
- PREFIX ?= /usr/local
-+PKG_CONFIG ?= pkg-config
- ETC_PREFIX ?= ${PREFIX}
-
- OBJS = \
-@@ -78,7 +79,7 @@ OBJS += \
- xwayland_view.o
- .endif
-
--WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
-+WAYLAND_PROTOCOLS != ${PKG_CONFIG} --variable pkgdatadir wayland-protocols
-
- .PHONY: distclean clean clean-doc doc dist install uninstall
- .PATH: src
-@@ -125,31 +126,31 @@ CFLAGS += -DHAVE_VIRTUAL_INPUT=1
-
- CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
-
--WLROOTS_CFLAGS != pkg-config --cflags wlroots
--WLROOTS_LIBS != pkg-config --libs wlroots
-+WLROOTS_CFLAGS != ${PKG_CONFIG} --cflags wlroots
-+WLROOTS_LIBS != ${PKG_CONFIG} --libs wlroots
-
- WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
-
--PANGO_CFLAGS != pkg-config --cflags pangocairo
--PANGO_LIBS != pkg-config --libs pangocairo
-+PANGO_CFLAGS != ${PKG_CONFIG} --cflags pangocairo
-+PANGO_LIBS != ${PKG_CONFIG} --libs pangocairo
-
--CAIRO_CFLAGS != pkg-config --cflags cairo
--CAIRO_LIBS != pkg-config --libs cairo
-+CAIRO_CFLAGS != ${PKG_CONFIG} --cflags cairo
-+CAIRO_LIBS != ${PKG_CONFIG} --libs cairo
-
--PIXMAN_CFLAGS != pkg-config --cflags pixman-1
--PIXMAN_LIBS != pkg-config --libs pixman-1
-+PIXMAN_CFLAGS != ${PKG_CONFIG} --cflags pixman-1
-+PIXMAN_LIBS != ${PKG_CONFIG} --libs pixman-1
-
--XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon
--XKBCOMMON_LIBS != pkg-config --libs xkbcommon
-+XKBCOMMON_CFLAGS != ${PKG_CONFIG} --cflags xkbcommon
-+XKBCOMMON_LIBS != ${PKG_CONFIG} --libs xkbcommon
-
--WAYLAND_CFLAGS != pkg-config --cflags wayland-server
--WAYLAND_LIBS != pkg-config --libs wayland-server
-+WAYLAND_CFLAGS != ${PKG_CONFIG} --cflags wayland-server
-+WAYLAND_LIBS != ${PKG_CONFIG} --libs wayland-server
-
--LIBINPUT_CFLAGS != pkg-config --cflags libinput
--LIBINPUT_LIBS != pkg-config --libs libinput
-+LIBINPUT_CFLAGS != ${PKG_CONFIG} --cflags libinput
-+LIBINPUT_LIBS != ${PKG_CONFIG} --libs libinput
-
--UCL_CFLAGS != pkg-config --cflags libucl
--UCL_LIBS != pkg-config --libs libucl
-+UCL_CFLAGS != ${PKG_CONFIG} --cflags libucl
-+UCL_LIBS != ${PKG_CONFIG} --libs libucl
-
- CFLAGS += \
- ${WLROOTS_CFLAGS} \
-@@ -192,7 +193,7 @@ wlr-layer-shell-unstable-v1-protocol.h:
- wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml
${.TARGET}
-
- hikari-unlocker: hikari_unlocker.c
-- ${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker
hikari_unlocker.c -lpam
-+ ${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o hikari-unlocker
hikari_unlocker.c -lpam
-
- clean-doc:
- @test -e _darcs && echo "cleaning manpage" ||:
diff --git a/gui-wm/hikari/hikari-2.2.2-r1.ebuild
b/gui-wm/hikari/hikari-2.2.2-r1.ebuild
deleted file mode 100644
index 5db53df9ccd5..
--- a/gui-wm/hikari/hikari-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Wayland compositor inspired by CWM"
-HOMEPAGE="https://hikari.acmelabs.space/";
-SRC_URI="https://hik
[gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/files/, gui-wm/hikari/
commit: c27f3a71952d475a5bc3a150538f9f7b67835a58
Author: Aisha Tammy aisha cc>
AuthorDate: Wed Aug 26 03:57:50 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Sep 29 06:23:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c27f3a71
gui-wm/hikari: drop old version
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Aisha Tammy aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/17262
Signed-off-by: Joonas Niilola gentoo.org>
gui-wm/hikari/Manifest | 1 -
gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch | 327
gui-wm/hikari/hikari-2.0.2.ebuild | 63 -
gui-wm/hikari/metadata.xml | 1 -
4 files changed, 392 deletions(-)
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 43a82764423..d1504938d4e 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,3 +1,2 @@
-DIST hikari-2.0.2.tar.gz 1003593 BLAKE2B
89a2ec29673e7ac371a7e4f179b3dc398fbacb3daf859a9f1a53cf74aac9dc36ca33f3dc1878360fdae80ef39315a0b06d0988d897c9ce58693404fd3099d6bf
SHA512
12e6cf2f1f24a4c0b64e6c035c518bdc5dbfa094a220147c374f599df8b52a4ee4c1f3cdffe1080fe87c665841a6ca018de4a48ec65aaa5b60e9e968087d83d6
DIST hikari-2.1.1.tar.gz 1012598 BLAKE2B
189e7bd9271ed5af89f5039288334c16a33c049c504f57e05cfa11b20098650165bb655023d016a14f2b13ed94e819bece088ef8517b9114b80d6a5921000780
SHA512
6da547d957cc65ab040647209a865550b0cc2b3d79040fae507591c41e938826861e27034379c21a1b7ce18afa35dbb813e96e661f4bd1232eb932f032271dff
DIST hikari-2.1.2.tar.gz 1012670 BLAKE2B
9ce3dc08b3b9377458eba7299d5921466983c64ef7a9eb16194c4cf4dcb482af1313b9378bf733e38fd5bb0b8154553d7ab57a7e45db69932a2bb201ff29b041
SHA512
e4c1328414a2b99657fbce58139d5f6432580182ee277bc1fb8d3de1fa875675d78606dc8defd7997025caeac36f533ea9f34fca56c15a9a64dfa05c9c3e51b7
diff --git a/gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch
b/gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch
deleted file mode 100644
index 338fcd8745f..000
--- a/gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0f104d0..6a1d640 100644
a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,22 @@
-+TARGET = hikari
-+
-+DESTDIR ?=
-+
-+prefix ?= /usr/local
-+exec_prefix ?=$(prefix)
-+bindir ?= $(exec_prefix)/bin
-+sysconfdir ?= $(prefix)/etc
-+
-+PKG_CONFIG ?= pkg-config
-+
-+VERSION ?="CURRENT"
-+
-+### Upstream variables
-+PREFIX ?= $(DESTDIR)$(prefix)
-+ETC_PREFIX ?= $(DESTDIR)$(sysconfdir)
-+
- OS != uname
--VERSION ?= "CURRENT"
--PREFIX ?= /usr/local
--ETC_PREFIX ?= ${PREFIX}
-+INSTALL_GROUP != id -gn
-
- OBJS = \
- action.o \
-@@ -29,7 +44,6 @@ OBJS = \
- layout.o \
- layout_config.o \
- layout_select_mode.o \
-- main.o \
- mark.o \
- mark_assign_mode.o \
- mark_select_mode.o \
-@@ -56,116 +70,127 @@ OBJS = \
- xwayland_unmanaged_view.o \
- xwayland_view.o
-
--WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
--
--.PHONY: distclean clean clean-doc doc dist install uninstall
--.PATH: src
-+WAYLAND_PROTOCOLS != $(PKG_CONFIG) --variable pkgdatadir wayland-protocols
-
- # Allow specification of /extra/ CFLAGS and LDFLAGS
--CFLAGS += ${CFLAGS_EXTRA}
--LDFLAGS += ${LDFLAGS_EXTRA}
-+CFLAGS += $(CFLAGS_EXTRA)
-+LDFLAGS += $(LDFLAGS_EXTRA)
-
--.ifdef DEBUG
-+ifdef DEBUG
- CFLAGS += -g -O0 -fsanitize=address
--.else
-+else
- CFLAGS += -DNDEBUG
--.endif
-+endif
-
--.ifdef WITH_POSIX_C_SOURCE
-+ifdef WITH_POSIX_C_SOURCE
- CFLAGS += -D_POSIX_C_SOURCE=200809L
--.endif
-+endif
-
--.ifdef WITH_XWAYLAND
-+ifdef WITH_XWAYLAND
- CFLAGS += -DHAVE_XWAYLAND=1
--.endif
-+endif
-
--.ifdef WITH_GAMMACONTROL
-+ifdef WITH_GAMMACONTROL
- CFLAGS += -DHAVE_GAMMACONTROL=1
--.endif
-+endif
-
--.ifdef WITH_SCREENCOPY
-+ifdef WITH_SCREENCOPY
- CFLAGS += -DHAVE_SCREENCOPY=1
--.endif
-+endif
-
--.ifdef WITH_LAYERSHELL
-+ifdef WITH_LAYERSHELL
- CFLAGS += -DHAVE_LAYERSHELL=1
--.endif
-+endif
-
--.ifdef WITHOUT_SUID
-+ifdef WITHOUT_SUID
- PERMS = 555
--.else
-+else
- PERMS = 4555
--.endif
-+endif
-
--CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
-+CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=$(ETC_PREFIX)
-
--WLROOTS_CFLAGS != pkg-config --cflags wlroots
--WLROOTS_LIBS != pkg-config --libs wlroots
-+WLROOTS_CFLAGS != $(PKG_CONFIG) --cflags wlroots
-+WLROOTS_LIBS != $(PKG_CONFIG) --libs wlroots
-
- WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
-
--PANGO_CFLAGS != pkg-config --cflags pangocairo
--PANGO_LIBS != pkg-config --libs pangocairo
-+PANGO_CFLAGS != $(PKG_CONFIG) --cflags pangocairo
-+PANGO_LIBS != $(PKG_CONFIG) --libs pangocairo
-
--CAIRO_CFLAGS != pkg-config --cflags cairo
--CAIRO_LIBS != pkg-config --libs cairo
-+CAIRO_CFLAGS != $(PKG_CONFIG) --cflags cairo
-+CAIRO_LIBS != $(PKG_CONFIG) --libs cairo
-
--GLIB_CFLAGS != pkg-config --cflags glib-2.0
--GLIB_
[gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/files/, gui-wm/hikari/
commit: f7fbfed5e0f9ad844125666159b8e9ec85159c31
Author: Aisha Tammy aisha cc>
AuthorDate: Tue Aug 4 13:20:00 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Aug 15 09:29:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7fbfed5
gui-wm/hikari: update to version 2.1.1
Closes: https://bugs.gentoo.org/733646
Closes: https://bugs.gentoo.org/730550
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Aisha Tammy aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/16999
Signed-off-by: Joonas Niilola gentoo.org>
gui-wm/hikari/Manifest | 1 +
gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch | 332
gui-wm/hikari/hikari-2.1.1.ebuild | 57
gui-wm/hikari/metadata.xml | 1 +
4 files changed, 391 insertions(+)
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 4a0d036c0f8..0da13980b1b 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,2 +1,3 @@
DIST hikari-1.2.0.tar.gz 98941 BLAKE2B
0b882d483143e307d4b173560f335e85b4c5613b75c51c6b70b68df9b4f70f9a009d95cb8eda1c211f4968b5c8600e7113bca5e014cecfb1917db2acae7e6f3d
SHA512
2bd0b6032541ca63a2bd12aee9155e9b0d08e4c541ec2f837073f1498ecb39df969f8821fcbd066e44c5ddaf658e4875bea25f344226b7ea97fe008a0db4d328
DIST hikari-2.0.2.tar.gz 1003593 BLAKE2B
89a2ec29673e7ac371a7e4f179b3dc398fbacb3daf859a9f1a53cf74aac9dc36ca33f3dc1878360fdae80ef39315a0b06d0988d897c9ce58693404fd3099d6bf
SHA512
12e6cf2f1f24a4c0b64e6c035c518bdc5dbfa094a220147c374f599df8b52a4ee4c1f3cdffe1080fe87c665841a6ca018de4a48ec65aaa5b60e9e968087d83d6
+DIST hikari-2.1.1.tar.gz 1012598 BLAKE2B
189e7bd9271ed5af89f5039288334c16a33c049c504f57e05cfa11b20098650165bb655023d016a14f2b13ed94e819bece088ef8517b9114b80d6a5921000780
SHA512
6da547d957cc65ab040647209a865550b0cc2b3d79040fae507591c41e938826861e27034379c21a1b7ce18afa35dbb813e96e661f4bd1232eb932f032271dff
diff --git a/gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch
b/gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch
new file mode 100644
index 000..4fd6d468d48
--- /dev/null
+++ b/gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch
@@ -0,0 +1,332 @@
+explain steps to guide future me and other patchers
+(1) define common variables on top
+(2) remove conditions for doc and others to define VERSION
+(3) replace all ${*} by $(*)
+(4) replace pkg-config by $(PKG_CONFIG)
+(6) remove .PATH: src
+(5) remove main.c from OBJS because it is in different directory
+- we will define a separate target for it
+(6) add $(OBJS) target + main.o target and add then to the end
+of dependencies for hikari
+(7) add main.o to be cleaned-up
+(8) reorder the library orders in the $(CC) steps because gcc
+diff --git a/Makefile b/Makefile
+index cab013a..b72e74c 100644
+--- a/Makefile
b/Makefile
+@@ -1,7 +1,22 @@
++TARGET = hikari
++
++DESTDIR ?=
++
++prefix ?= /usr/local
++exec_prefix ?=$(prefix)
++bindir ?= $(exec_prefix)/bin
++sysconfdir ?= $(prefix)/etc
++
++PKG_CONFIG ?= pkg-config
++
++VERSION ?="CURRENT"
++
++### Upstream variables
++PREFIX ?= $(DESTDIR)$(prefix)
++ETC_PREFIX ?= $(DESTDIR)$(sysconfdir)
++
+ OS != uname
+-VERSION ?= "CURRENT"
+-PREFIX ?= /usr/local
+-ETC_PREFIX ?= ${PREFIX}
++INSTALL_GROUP != id -gn
+
+ OBJS = \
+ action.o \
+@@ -33,7 +48,6 @@ OBJS = \
+ layout_select_mode.o \
+ lock_indicator.o \
+ lock_mode.o \
+- main.o \
+ mark.o \
+ mark_assign_mode.o \
+ mark_select_mode.o \
+@@ -64,109 +78,124 @@ OBJS = \
+
+ WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
+
+-.PHONY: distclean clean clean-doc doc dist install uninstall
+-.PATH: src
+-
+ # Allow specification of /extra/ CFLAGS and LDFLAGS
+-CFLAGS += ${CFLAGS_EXTRA}
+-LDFLAGS += ${LDFLAGS_EXTRA}
++CFLAGS += $(CFLAGS_EXTRA)
++LDFLAGS += $(LDFLAGS_EXTRA)
+
+-.ifdef DEBUG
++ifeq ($(DEBUG),1)
+ CFLAGS += -g -O0 -fsanitize=address
+-.else
++else
+ CFLAGS += -DNDEBUG
+-.endif
++endif
+
+-.ifdef WITH_POSIX_C_SOURCE
++ifeq ($(WITH_POSIX_C_SOURCE),1)
+ CFLAGS += -D_POSIX_C_SOURCE=200809L
+-.endif
++endif
+
+-.ifdef WITH_XWAYLAND
++ifeq ($(WITH_XWAYLAND),1)
+ CFLAGS += -DHAVE_XWAYLAND=1
+-.endif
++endif
+
+-.ifdef WITH_GAMMACONTROL
++ifeq ($(WITH_GAMMACONTROL),1)
+ CFLAGS += -DHAVE_GAMMACONTROL=1
+-.endif
++endif
+
+-.ifdef WITH_SCREENCOPY
++ifeq ($(WITH_SCREENCOPY),1)
+ CFLAGS += -DHAVE_SCREENCOPY=1
+-.endif
++endif
+
+-.ifdef WITH_LAYERSHELL
++ifeq ($(WITH_LAYERSHELL),1)
+ CFLAGS += -DHAVE_LAYERSHELL=1
+-.endif
++endif
++
++ifeq ($(WITH_VIRTUAL_INPUT),1)
++CFLAGS += -DHAVE_VIRTUAL_INPUT=1
++endif
+
+-.ifdef WITHOUT_SUID
++ifeq ($(WITHOUT_SUID),1)
+ PERMS = 555
+-.else
++else
+ PERMS = 4555
+-.endif
++endif
+
+-CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
++CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=$(ETC_PREFIX)
+
+-WLROOTS_CFLAGS != pkg-config --cflags wlroots
+
[gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/files/, gui-wm/hikari/
commit: 7f7e128f4e44faf93518b84bc455945ee7f663b6
Author: Aisha Tammy aisha cc>
AuthorDate: Wed Jun 17 12:40:49 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sun Jun 28 22:21:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f7e128f
gui-wm/hikari: version bump to 2.0.2
Closes: https://bugs.gentoo.org/728642
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Aisha Tammy aisha.cc>
Signed-off-by: Aaron Bauman gentoo.org>
gui-wm/hikari/Manifest | 1 +
gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch | 327
gui-wm/hikari/hikari-2.0.2.ebuild | 63 +
3 files changed, 391 insertions(+)
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 2ef76be3063..6692154a2a9 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,2 +1,3 @@
DIST hikari-1.2.0.tar.gz 98941 BLAKE2B
0b882d483143e307d4b173560f335e85b4c5613b75c51c6b70b68df9b4f70f9a009d95cb8eda1c211f4968b5c8600e7113bca5e014cecfb1917db2acae7e6f3d
SHA512
2bd0b6032541ca63a2bd12aee9155e9b0d08e4c541ec2f837073f1498ecb39df969f8821fcbd066e44c5ddaf658e4875bea25f344226b7ea97fe008a0db4d328
DIST hikari-2.0.1.tar.gz 1003467 BLAKE2B
8a299fe1d85fac5df04f2475295250d78706c5da9c14a965ff8c7c91af36eaf5711675dc07c43c83974411719b88d483eee24ebd24a87eb1b3280a89b521a19e
SHA512
18f8f46ae38fa307b63c44011da084ee0ec4a0925ff8ea3677fda9171bfd25b42853719cea812aabee2d377e6208ddcaf69692e1fb0655110f8d1905d1be00e8
+DIST hikari-2.0.2.tar.gz 1003593 BLAKE2B
89a2ec29673e7ac371a7e4f179b3dc398fbacb3daf859a9f1a53cf74aac9dc36ca33f3dc1878360fdae80ef39315a0b06d0988d897c9ce58693404fd3099d6bf
SHA512
12e6cf2f1f24a4c0b64e6c035c518bdc5dbfa094a220147c374f599df8b52a4ee4c1f3cdffe1080fe87c665841a6ca018de4a48ec65aaa5b60e9e968087d83d6
diff --git a/gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch
b/gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch
new file mode 100644
index 000..338fcd8745f
--- /dev/null
+++ b/gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch
@@ -0,0 +1,327 @@
+diff --git a/Makefile b/Makefile
+index 0f104d0..6a1d640 100644
+--- a/Makefile
b/Makefile
+@@ -1,7 +1,22 @@
++TARGET = hikari
++
++DESTDIR ?=
++
++prefix ?= /usr/local
++exec_prefix ?=$(prefix)
++bindir ?= $(exec_prefix)/bin
++sysconfdir ?= $(prefix)/etc
++
++PKG_CONFIG ?= pkg-config
++
++VERSION ?="CURRENT"
++
++### Upstream variables
++PREFIX ?= $(DESTDIR)$(prefix)
++ETC_PREFIX ?= $(DESTDIR)$(sysconfdir)
++
+ OS != uname
+-VERSION ?= "CURRENT"
+-PREFIX ?= /usr/local
+-ETC_PREFIX ?= ${PREFIX}
++INSTALL_GROUP != id -gn
+
+ OBJS = \
+ action.o \
+@@ -29,7 +44,6 @@ OBJS = \
+ layout.o \
+ layout_config.o \
+ layout_select_mode.o \
+- main.o \
+ mark.o \
+ mark_assign_mode.o \
+ mark_select_mode.o \
+@@ -56,116 +70,127 @@ OBJS = \
+ xwayland_unmanaged_view.o \
+ xwayland_view.o
+
+-WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
+-
+-.PHONY: distclean clean clean-doc doc dist install uninstall
+-.PATH: src
++WAYLAND_PROTOCOLS != $(PKG_CONFIG) --variable pkgdatadir wayland-protocols
+
+ # Allow specification of /extra/ CFLAGS and LDFLAGS
+-CFLAGS += ${CFLAGS_EXTRA}
+-LDFLAGS += ${LDFLAGS_EXTRA}
++CFLAGS += $(CFLAGS_EXTRA)
++LDFLAGS += $(LDFLAGS_EXTRA)
+
+-.ifdef DEBUG
++ifdef DEBUG
+ CFLAGS += -g -O0 -fsanitize=address
+-.else
++else
+ CFLAGS += -DNDEBUG
+-.endif
++endif
+
+-.ifdef WITH_POSIX_C_SOURCE
++ifdef WITH_POSIX_C_SOURCE
+ CFLAGS += -D_POSIX_C_SOURCE=200809L
+-.endif
++endif
+
+-.ifdef WITH_XWAYLAND
++ifdef WITH_XWAYLAND
+ CFLAGS += -DHAVE_XWAYLAND=1
+-.endif
++endif
+
+-.ifdef WITH_GAMMACONTROL
++ifdef WITH_GAMMACONTROL
+ CFLAGS += -DHAVE_GAMMACONTROL=1
+-.endif
++endif
+
+-.ifdef WITH_SCREENCOPY
++ifdef WITH_SCREENCOPY
+ CFLAGS += -DHAVE_SCREENCOPY=1
+-.endif
++endif
+
+-.ifdef WITH_LAYERSHELL
++ifdef WITH_LAYERSHELL
+ CFLAGS += -DHAVE_LAYERSHELL=1
+-.endif
++endif
+
+-.ifdef WITHOUT_SUID
++ifdef WITHOUT_SUID
+ PERMS = 555
+-.else
++else
+ PERMS = 4555
+-.endif
++endif
+
+-CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
++CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=$(ETC_PREFIX)
+
+-WLROOTS_CFLAGS != pkg-config --cflags wlroots
+-WLROOTS_LIBS != pkg-config --libs wlroots
++WLROOTS_CFLAGS != $(PKG_CONFIG) --cflags wlroots
++WLROOTS_LIBS != $(PKG_CONFIG) --libs wlroots
+
+ WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
+
+-PANGO_CFLAGS != pkg-config --cflags pangocairo
+-PANGO_LIBS != pkg-config --libs pangocairo
++PANGO_CFLAGS != $(PKG_CONFIG) --cflags pangocairo
++PANGO_LIBS != $(PKG_CONFIG) --libs pangocairo
+
+-CAIRO_CFLAGS != pkg-config --cflags cairo
+-CAIRO_LIBS != pkg-config --libs cairo
++CAIRO_CFLAGS != $(PKG_CONFIG) --cflags cairo
++CAIRO_LIBS != $(PKG_CONFIG) --libs cairo
+
+-GLIB_CFLAGS != pkg-config --cflags glib-2.0
+-GLIB_LIBS != pkg-config --libs glib-2.0
++GLIB_CFLAGS != $(PKG_CONFIG) --cfla
