summaryrefslogtreecommitdiff
path: root/gui-wm
diff options
context:
space:
mode:
Diffstat (limited to 'gui-wm')
-rw-r--r--gui-wm/Manifest.gzbin722 -> 718 bytes
-rw-r--r--gui-wm/hikari/Manifest10
-rw-r--r--gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch315
-rw-r--r--gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch327
-rw-r--r--gui-wm/hikari/hikari-1.2.0.ebuild55
-rw-r--r--gui-wm/hikari/hikari-2.0.2.ebuild63
-rw-r--r--gui-wm/hikari/hikari-2.1.2.ebuild59
-rw-r--r--gui-wm/hikari/metadata.xml1
8 files changed, 62 insertions, 768 deletions
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index ebc0cf23d52b..345dfc9c817f 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
Binary files differ
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index bb03a62ca5c5..4fdcebf9057e 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,10 +1,6 @@
-AUX hikari-1.2.0-gnu-make.patch 9378 BLAKE2B 77cb4dce472803167db411114f3259a21d15f46e0427d5c0ecfd59611440581120b6a1488c619ab0b85d8a97312878b59e6f7228392b5a41a740c52c8cc70fde SHA512 15fcdb0a4bcbcb846ce0cb8abb2b7980ff2f6aae191b592b254805a99149f63f65af572e848b9f7a19820b11fd4cd4dce8e6de5ea24e2fc2bac42a81ad98380d
-AUX hikari-2.0.2-gnu-make.patch 10167 BLAKE2B 01b068ecb4921ff57238bac80079bbc399a292c5a22b62b85846f316a5961d7ea7724f9d4a95a3db1e8a4f8394b9f46b44f7fe5b7f4b193c3b4091fc42035cca SHA512 1e1d2a10d2d70bb5561e84007a0393b5ce5e99036caa27b7590877caf61895521cf3aa82aa7864797a7c6d77e5f30d058ec5feece455f259f9323c4d0387fc96
AUX hikari-2.1.1-gnu-make.patch 10450 BLAKE2B a956a4c49d95d99d84147a083f56e23a2e6a995fdeb79994c556eca4df364167fae58bddb824ceef1ff952442f9591e198effaf9daffc997a11f7ae8dc7e903b SHA512 033d6a3b200eaa1bdedbe6b7cb110207046e535dd43a0ac6628c2dadf7f23e3ce9d63c7101cbf5d217ac43483f31baaeb459464a69a92d120963c96a290caa5f
-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
-EBUILD hikari-1.2.0.ebuild 1081 BLAKE2B ff23f482966cb8b8487bbe001618d9fcfffc6eb4e2e76e49a8160e5859eeb5240432be3f0ff3ad2d796ac441e0bb4cf0a71dedbb1c701b6d470b26c68d4b578c SHA512 78676b87836d736bc6c7cf8f905e5d74b93c6739117089694db827307d1ecaa362c93399c3c73e5ce8a1035129b6acebe471bbf595ce35f9f496e1992abefc2b
-EBUILD hikari-2.0.2.ebuild 1266 BLAKE2B 6a4010e117e93d65079736dffb07cedcf4074152b9ed60783a910ceb2c4bcafa79e62b4420008decb879d53d8b18d597a2fe407c5e7f64e97cc72bd61345657b SHA512 f371790d40e13c191b9deffa805f0929a3ea61a597b89d0fcffc950ac468511165d29ad4e0505ced4c6c2e3855ff092e31696a2da5b31b9aff9280161ac067d3
+DIST hikari-2.1.2.tar.gz 1012670 BLAKE2B 9ce3dc08b3b9377458eba7299d5921466983c64ef7a9eb16194c4cf4dcb482af1313b9378bf733e38fd5bb0b8154553d7ab57a7e45db69932a2bb201ff29b041 SHA512 e4c1328414a2b99657fbce58139d5f6432580182ee277bc1fb8d3de1fa875675d78606dc8defd7997025caeac36f533ea9f34fca56c15a9a64dfa05c9c3e51b7
EBUILD hikari-2.1.1.ebuild 1243 BLAKE2B a7661734f9a46267934ad187a1bed2d028f23044b681c5cac6318f1674c2e8745c26c43edcc6f0f40e3a2ce8c1cd2be0b8aa2e65b7605b8bd63da9a45feb36a1 SHA512 048270c859405fc622772444eb84d1b06a781c80b9c4d454bdcaefb41d2537bdee991753bcf1c6151b9ee2012ad9391bb3098b7b949ec03ea07ab3e0439f4062
-MISC metadata.xml 1075 BLAKE2B 685e0168c0d88f9fd253552e20447e197d2c96354c094ae010cbf0ec5db9021f49cc8b69d9c124e43edb468ee749ac43d79e8cb84abda00e3bffa64360bdc9bb SHA512 625e3432e116a91897ad9ca661500a259e445abbd845f7b78716727fb8f680ecc78d86c41b0939b9495d9ecdcd541404eba58735b445f44f628bfd84581a4567
+EBUILD hikari-2.1.2.ebuild 1217 BLAKE2B fa3af4a381bb04eeb41069c54a37752c56d0938925c7b2b45b09f4caa81358346d8181626a8857d273fcc0ec2d913a4569b269e71fa29f1d2a1f1ed934b8e36f SHA512 9bc1adad3cebd4905a21bbda269d755a9c545e4a4fe747d2a99bd32e2c88f07942e35daa371d3b065585139c1d626fea4c929974907308859638f36d9fd28ead
+MISC metadata.xml 1015 BLAKE2B cf0b1938d20d91676068e3fe8d5556da68afc6c3d5c1f56da1a8b18b60d3ed932c43b084cd2fd99cf5c0f713f6684da5b907a650f7f37d671d12b15de894624a SHA512 fe3983cb19d30846c315db699947be49e5ca046a320ecd56dbde122ebd5380d896210ea3fbbb860f164bc4140e7199d0cc26b067dfcab6f492932b31fdaf593c
diff --git a/gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch b/gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch
deleted file mode 100644
index 01a9b87c4ce2..000000000000
--- a/gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch
+++ /dev/null
@@ -1,315 +0,0 @@
-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 11fc449..d73c4e0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,24 +1,22 @@
--.ifmake doc || dist
--.ifndef VERSION
--.error please specify VERSION
--.endif
--.endif
--
--VERSION ?= "darcs"
--
--.ifmake install || uninstall
--.ifndef PREFIX
--.error please specify PREFIX
--.endif
-+TARGET = hikari
-+
-+DESTDIR ?=
-+
-+prefix ?= /usr/local
-+exec_prefix ?= $(prefix)
-+bindir ?= $(exec_prefix)/bin
-+sysconfdir ?= $(prefix)/etc
-+
-+PKG_CONFIG ?= pkg-config
-+
-+VERSION ?= "darcs"
-+
-+### Upstream variables
-+PREFIX ?= $(prefix)
-+ETC_PREFIX ?= $(sysconfdir)
-+
- OS != uname
- INSTALL_GROUP != id -gn
--.endif
--
--.ifmake install || uninstall
--.ifndef ETC_PREFIX
--.error please specify ETC_PREFIX
--.endif
--.endif
-
- OBJS = \
- action.o \
-@@ -45,7 +43,6 @@ OBJS = \
- layout.o \
- layout_config.o \
- layout_select_mode.o \
-- main.o \
- mark.o \
- mark_assign_mode.o \
- mark_select_mode.o \
-@@ -72,106 +69,117 @@ 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
-
--.ifdef DEBUG
--CFLAGS += -g -O0 -fsanitize=address
--.else
--CFLAGS += -DNDEBUG
--.endif
-+ifeq ($(DEBUG),1)
-+ CFLAGS += -g -O0 -fsanitize=address
-+else
-+ CFLAGS += -DNDEBUG
-+endif
-
--.ifdef WITH_POSIX_C_SOURCE
--CFLAGS += -D_POSIX_C_SOURCE=200809L
--.endif
-+ifeq ($(WITH_POSIX_C_SOURCE),1)
-+ CFLAGS += -D_POSIX_C_SOURCE=200809L
-+endif
-
--.ifdef WITH_XWAYLAND
--CFLAGS += -DHAVE_XWAYLAND=1
--.endif
-+ifeq ($(WITH_XWAYLAND),1)
-+ CFLAGS += -DHAVE_XWAYLAND=1
-+endif
-
--.ifdef WITH_GAMMACONTROL
--CFLAGS += -DHAVE_GAMMACONTROL=1
--.endif
-+ifeq ($(WITH_GAMMACONTROL),1)
-+ CFLAGS += -DHAVE_GAMMACONTROL=1
-+endif
-
--.ifdef WITH_SCREENCOPY
--CFLAGS += -DHAVE_SCREENCOPY=1
--.endif
-+ifeq ($(WITH_SCREENCOPY),1)
-+ CFLAGS += -DHAVE_SCREENCOPY=1
-+endif
-
--.ifdef WITH_LAYERSHELL
--CFLAGS += -DHAVE_LAYERSHELL=1
--.endif
-+ifeq ($(WITH_LAYERSHELL),1)
-+ CFLAGS += -DHAVE_LAYERSHELL=1
-+endif
-
- CFLAGS += -Wall -I. -Iinclude
-
--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) --cflags glib-2.0
-+GLIB_LIBS != $(PKG_CONFIG) --libs glib-2.0
-
--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} \
-- ${PANGO_CFLAGS} \
-- ${CAIRO_CFLAGS} \
-- ${GLIB_CFLAGS} \
-- ${PIXMAN_CFLAGS} \
-- ${XKBCOMMON_CFLAGS} \
-- ${WAYLAND_CFLAGS} \
-- ${LIBINPUT_CFLAGS} \
-- ${UCL_CFLAGS}
-+ $(WLROOTS_CFLAGS) \
-+ $(PANGO_CFLAGS) \
-+ $(CAIRO_CFLAGS) \
-+ $(GLIB_CFLAGS) \
-+ $(PIXMAN_CFLAGS) \
-+ $(XKBCOMMON_CFLAGS) \
-+ $(WAYLAND_CFLAGS) \
-+ $(LIBINPUT_CFLAGS) \
-+ $(UCL_CFLAGS)
-
- LIBS = \
-- ${WLROOTS_LIBS} \
-- ${PANGO_LIBS} \
-- ${CAIRO_LIBS} \
-- ${GLIB_LIBS} \
-- ${PIXMAN_LIBS} \
-- ${XKBCOMMON_LIBS} \
-- ${WAYLAND_LIBS} \
-- ${LIBINPUT_LIBS} \
-- ${UCL_LIBS}
--
--all: hikari hikari-unlocker
-+ $(WLROOTS_LIBS) \
-+ $(PANGO_LIBS) \
-+ $(CAIRO_LIBS) \
-+ $(GLIB_LIBS) \
-+ $(PIXMAN_LIBS) \
-+ $(XKBCOMMON_LIBS) \
-+ $(WAYLAND_LIBS) \
-+ $(LIBINPUT_LIBS) \
-+ $(UCL_LIBS)
-+
-+.PHONY: distclean clean clean-doc doc dist install uninstall
-+
-+all: hikari hikari-unlocker doc
-
- version.h:
-- echo "#define HIKARI_VERSION \"${VERSION}\"" >> version.h
-+ 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}
-+$(OBJS): %.o: src/%.c
-+ $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-+
-+main.o:
-+ $(CC) $(CFLAGS) $(INCLUDES) -c main.c -o main.o
-
- xdg-shell-protocol.h:
-- wayland-scanner server-header ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml ${.TARGET}
-+ wayland-scanner server-header $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml xdg-shell-protocol.h
-
- wlr-layer-shell-unstable-v1-protocol.h:
-- wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
-+ wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml wlr-layer-shell-unstable-v1-protocol.h
-+
-+hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h $(OBJS) main.o
-+ $(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) $(OBJS) main.o $(LIBS) -o $(TARGET)
-
- hikari-unlocker: hikari_unlocker.c
-- ${CC} -lpam hikari_unlocker.c -o hikari-unlocker
-+ $(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) hikari_unlocker.c -lpam $(LIBS) -o hikari-unlocker
-+
-+share/man/man1/hikari.1:
-+ pandoc -M title:"HIKARI(1) $(VERSION) | hikari - Wayland Compositor" -s \
-+ --to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
-+
-+doc: share/man/man1/hikari.1
-
- clean-doc:
- @test -e _darcs && echo "cleaning manpage" ||:
-@@ -183,20 +191,15 @@ clean: clean-doc
- @rm xdg-shell-protocol.h 2> /dev/null ||:
- @rm wlr-layer-shell-unstable-v1-protocol.h 2> /dev/null ||:
- @echo "cleaning object files"
-- @rm ${OBJS} 2> /dev/null ||:
-+ @rm $(OBJS) 2> /dev/null ||:
-+ @rm main.o 2> /dev/null ||:
- @echo "cleaning executables"
- @rm hikari 2> /dev/null ||:
- @rm hikari-unlocker 2> /dev/null ||:
-
--share/man/man1/hikari.1:
-- pandoc -M title:"HIKARI(1) ${VERSION} | hikari - Wayland Compositor" -s \
-- --to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
--
--doc: share/man/man1/hikari.1
--
--hikari-${VERSION}.tar.gz: version.h share/man/man1/hikari.1
-+hikari-$(VERSION).tar.gz: version.h share/man/man1/hikari.1
- @darcs revert
-- @tar -s "#^#hikari-${VERSION}/#" -czf hikari-${VERSION}.tar.gz \
-+ @tar -s "#^#hikari-$(VERSION)/#" -czf hikari-$(VERSION).tar.gz \
- version.h \
- main.c \
- hikari_unlocker.c \
-@@ -215,22 +218,22 @@ distclean: clean-doc
- @test -e _darcs && echo "cleaning version.h" ||:
- @test -e _darcs && rm version.h ||:
-
--dist: distclean hikari-${VERSION}.tar.gz
-+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 $(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
-
- uninstall:
-- -rm ${PREFIX}/bin/hikari
-- -rm ${PREFIX}/bin/hikari-unlocker
-- -rm ${PREFIX}/share/examples/hikari/hikari.conf
-- -rmdir ${PREFIX}/share/examples/hikari
-- -rm ${PREFIX}/share/man/man1/hikari.1
-- -rm ${ETC_PREFIX}/pam.d/hikari-unlocker
-+ -rm $(PREFIX)/bin/hikari
-+ -rm $(PREFIX)/bin/hikari-unlocker
-+ -rm $(PREFIX)/share/examples/hikari/hikari.conf
-+ -rmdir $(PREFIX)/share/examples/hikari
-+ -rm $(PREFIX)/share/man/man1/hikari.1
-+ -rm $(ETC_PREFIX)/pam.d/hikari-unlocker
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 338fcd8745ff..000000000000
--- 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_LIBS != pkg-config --libs glib-2.0
-+GLIB_CFLAGS != $(PKG_CONFIG) --cflags glib-2.0
-+GLIB_LIBS != $(PKG_CONFIG) --libs glib-2.0
-
--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} \
-- ${PANGO_CFLAGS} \
-- ${CAIRO_CFLAGS} \
-- ${GLIB_CFLAGS} \
-- ${PIXMAN_CFLAGS} \
-- ${XKBCOMMON_CFLAGS} \
-- ${WAYLAND_CFLAGS} \
-- ${LIBINPUT_CFLAGS} \
-- ${UCL_CFLAGS}
-+ $(WLROOTS_CFLAGS) \
-+ $(PANGO_CFLAGS) \
-+ $(CAIRO_CFLAGS) \
-+ $(GLIB_CFLAGS) \
-+ $(PIXMAN_CFLAGS) \
-+ $(XKBCOMMON_CFLAGS) \
-+ $(WAYLAND_CFLAGS) \
-+ $(LIBINPUT_CFLAGS) \
-+ $(UCL_CFLAGS)
-
- LIBS = \
-- ${WLROOTS_LIBS} \
-- ${PANGO_LIBS} \
-- ${CAIRO_LIBS} \
-- ${GLIB_LIBS} \
-- ${PIXMAN_LIBS} \
-- ${XKBCOMMON_LIBS} \
-- ${WAYLAND_LIBS} \
-- ${LIBINPUT_LIBS} \
-- ${UCL_LIBS}
-+ $(WLROOTS_LIBS) \
-+ $(PANGO_LIBS) \
-+ $(CAIRO_LIBS) \
-+ $(GLIB_LIBS) \
-+ $(PIXMAN_LIBS) \
-+ $(XKBCOMMON_LIBS) \
-+ $(WAYLAND_LIBS) \
-+ $(LIBINPUT_LIBS) \
-+ $(UCL_LIBS)
-
--all: hikari hikari-unlocker
-+.PHONY: distclean clean clean-doc doc dist install uninstall
-
- version.h:
-- echo "#define HIKARI_VERSION \"${VERSION}\"" >> version.h
-+ 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} -o ${.TARGET} ${OBJS} ${LIBS}
-+$(OBJS): %.o: src/%.c
-+ $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-+
-+main.o:
-+ $(CC) $(CFLAGS) $(INCLUDES) -c main.c -o main.o
-
- xdg-shell-protocol.h:
-- wayland-scanner server-header ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml ${.TARGET}
-+ wayland-scanner server-header $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml xdg-shell-protocol.h
-
- wlr-layer-shell-unstable-v1-protocol.h:
-- wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
-+ wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml wlr-layer-shell-unstable-v1-protocol.h
-+
-+hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h $(OBJS) main.o
-+ $(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) $(OBJS) main.o $(LIBS) -o $(TARGET)
-
- hikari-unlocker: hikari_unlocker.c
-- ${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam
-+ $(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) hikari_unlocker.c -lpam $(LIBS) -o hikari-unlocker
-+
-+share/man/man1/hikari.1:
-+ pandoc -M title:"HIKARI(1) $(VERSION) | hikari - Wayland Compositor" -s \
-+ --to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
-+
-+doc: share/man/man1/hikari.1
-+
-+all: hikari hikari-unlocker
-
- clean-doc:
- @test -e _darcs && echo "cleaning manpage" ||:
-@@ -177,66 +202,37 @@ clean: clean-doc
- @rm xdg-shell-protocol.h 2> /dev/null ||:
- @rm wlr-layer-shell-unstable-v1-protocol.h 2> /dev/null ||:
- @echo "cleaning object files"
-- @rm ${OBJS} 2> /dev/null ||:
-+ @rm $(OBJS) 2> /dev/null ||:
-+ @rm main.o 2> /dev/null ||:
- @echo "cleaning executables"
- @rm hikari 2> /dev/null ||:
- @rm hikari-unlocker 2> /dev/null ||:
-
--share/man/man1/hikari.1:
-- pandoc -M title:"HIKARI(1) ${VERSION} | hikari - Wayland Compositor" -s \
-- --to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
--
--doc: share/man/man1/hikari.1
--
--hikari-${VERSION}.tar.gz: version.h share/man/man1/hikari.1
-- @darcs revert
-- @tar -s "#^#hikari-${VERSION}/#" -czf hikari-${VERSION}.tar.gz \
-- version.h \
-- main.c \
-- hikari_unlocker.c \
-- include/hikari/*.h \
-- src/*.c \
-- protocol/*.xml \
-- Makefile \
-- LICENSE \
-- README.md \
-- CHANGELOG.md \
-- share/man/man1/hikari.md \
-- share/man/man1/hikari.1 \
-- share/backgrounds/hikari/hikari_wallpaper.png \
-- share/wayland-sessions/hikari.desktop \
-- etc/hikari/hikari.conf \
-- etc/pam.d/hikari-unlocker.*
--
--distclean: clean-doc
-- @test -e _darcs && echo "cleaning version.h" ||:
-- @test -e _darcs && rm version.h ||:
--
--dist: distclean hikari-${VERSION}.tar.gz
--
--install: hikari hikari-unlocker share/man/man1/hikari.1
-- mkdir -p ${DESTDIR}/${PREFIX}/bin
-- mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1
-- mkdir -p ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
-- mkdir -p ${DESTDIR}/${PREFIX}/share/wayland-sessions
-- mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/hikari
-- mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/pam.d
-- sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
-- chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
-- install -m ${PERMS} hikari ${DESTDIR}/${PREFIX}/bin
-- install -m 4555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
-- install -m 644 share/man/man1/hikari.1 ${DESTDIR}/${PREFIX}/share/man/man1
-- install -m 644 share/backgrounds/hikari/hikari_wallpaper.png ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
-- install -m 644 share/wayland-sessions/hikari.desktop ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
-- install -m 644 etc/pam.d/hikari-unlocker.${OS} ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
-+install-doc:
-+ install -m 644 share/man/man1/hikari.1 $(PREFIX)/share/man/man1
-+
-+install:
-+ mkdir -p $(PREFIX)/bin
-+ mkdir -p $(PREFIX)/share/man/man1
-+ mkdir -p $(PREFIX)/share/backgrounds/hikari
-+ mkdir -p $(PREFIX)/share/wayland-sessions
-+ mkdir -p $(ETC_PREFIX)/etc/hikari
-+ mkdir -p $(ETC_PREFIX)/etc/pam.d
-+ sed "s,PREFIX,$(prefix)," etc/hikari/hikari.conf > $(ETC_PREFIX)/etc/hikari/hikari.conf
-+ chmod 644 $(ETC_PREFIX)/etc/hikari/hikari.conf
-+ install -m $(PERMS) hikari $(PREFIX)/bin
-+ install -m 4555 hikari-unlocker $(PREFIX)/bin
-+ install -m 644 share/backgrounds/hikari/hikari_wallpaper.png $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png
-+ install -m 644 share/wayland-sessions/hikari.desktop $(PREFIX)/share/wayland-sessions/hikari.desktop
-+ install -m 644 etc/pam.d/hikari-unlocker.$(OS) $(ETC_PREFIX)/etc/pam.d/hikari-unlocker
-
- uninstall:
-- -rm ${DESTDIR}/${PREFIX}/bin/hikari
-- -rm ${DESTDIR}/${PREFIX}/bin/hikari-unlocker
-- -rm ${DESTDIR}/${PREFIX}/share/man/man1/hikari.1
-- -rm ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
-- -rm ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
-- -rm ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
-- -rm ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
-- -rmdir ${DESTDIR}/${ETC_PREFIX}/etc/hikari
-- -rmdir ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
-+ -rm $(PREFIX)/bin/hikari
-+ -rm $(PREFIX)/bin/hikari-unlocker
-+ -rm $(PREFIX)/share/man/man1/hikari.1
-+ -rm $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png
-+ -rm $(PREFIX)/share/wayland-sessions/hikari.desktop
-+ -rm $(ETC_PREFIX)/etc/pam.d/hikari-unlocker
-+ -rm $(ETC_PREFIX)/etc/hikari/hikari.conf
-+ -rmdir $(ETC_PREFIX)/etc/hikari
-+ -rmdir $(PREFIX)/share/backgrounds/hikari
diff --git a/gui-wm/hikari/hikari-1.2.0.ebuild b/gui-wm/hikari/hikari-1.2.0.ebuild
deleted file mode 100644
index 7297d36915d0..000000000000
--- a/gui-wm/hikari/hikari-1.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="wayland compositor inspired by CWM"
-HOMEPAGE="https://hikari.acmelabs.space/"
-SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gamma layershell screencopy +X"
-
-DEPEND="
- dev-libs/glib
- dev-libs/libinput:=
- dev-libs/libucl
- gui-libs/wlroots
- x11-libs/cairo:=[X,svg]
- x11-libs/pango:=[X]
- x11-libs/pixman
- x11-libs/libxkbcommon:=[X]
-"
-
-RDEPEND="
- ${DEPEND}
- x11-misc/xkeyboard-config
-"
-
-BDEPEND="
- ${DEPEND}
- app-text/pandoc
- virtual/pkgconfig
- dev-libs/wayland-protocols
-"
-
-# keep this as others OS's are using this as reference
-PATCHES=(
- "${FILESDIR}/${P}-gnu-make.patch"
-)
-
-src_compile() {
- emake VERSION="{PV}" \
- WITH_POSIX_C_SOURCE=1 \
- WITH_GAMMACONTROL=$(usex gamma 1 0) \
- WITH_LAYERSHELL=$(usex layershell 1 0) \
- WITH_SCREENCOPY=$(usex screencopy 1 0) \
- WITH_XWAYLAND=$(usex X 1 0) \
- all
-}
-
-src_install() {
- emake PREFIX=${D}/usr ETC_PREFIX=${D}/etc install
-}
diff --git a/gui-wm/hikari/hikari-2.0.2.ebuild b/gui-wm/hikari/hikari-2.0.2.ebuild
deleted file mode 100644
index 45ebbda8ca0d..000000000000
--- a/gui-wm/hikari/hikari-2.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="wayland compositor inspired by CWM"
-HOMEPAGE="https://hikari.acmelabs.space/"
-SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gamma layershell +man screencopy +X"
-
-DEPEND="
- dev-libs/glib
- dev-libs/libinput:=
- dev-libs/libucl
- gui-libs/wlroots
- media-libs/libglvnd
- x11-libs/cairo:=[X,svg]
- x11-libs/pango:=[X]
- x11-libs/pixman
- x11-libs/libxkbcommon:=[X]
- sys-libs/pam
-"
-
-RDEPEND="
- ${DEPEND}
- x11-misc/xkeyboard-config
-"
-
-BDEPEND="
- ${DEPEND}
- virtual/pkgconfig
- dev-libs/wayland-protocols
- man? ( app-text/pandoc )
-"
-
-# keep this as others OS's are using this as reference
-PATCHES=(
- "${FILESDIR}/${P}-gnu-make.patch"
-)
-
-src_compile() {
- emake VERSION="{PV}" \
- WITH_POSIX_C_SOURCE=1 \
- WITH_GAMMACONTROL=$(usex gamma 1 0) \
- WITH_LAYERSHELL=$(usex layershell 1 0) \
- WITH_SCREENCOPY=$(usex screencopy 1 0) \
- WITH_XWAYLAND=$(usex X 1 0) \
- all
- if use man; then
- emake doc
- fi
-}
-
-src_install() {
- emake PREFIX="${D}/usr" ETC_PREFIX="${D}" prefix="${SYSROOT}/usr" install
- if use man; then
- emake PREFIX="${D}/usr" ETC_PREFIX="${D}" install-doc
- fi
-}
diff --git a/gui-wm/hikari/hikari-2.1.2.ebuild b/gui-wm/hikari/hikari-2.1.2.ebuild
new file mode 100644
index 000000000000..54f522c053ac
--- /dev/null
+++ b/gui-wm/hikari/hikari-2.1.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing
+
+DESCRIPTION="Wayland compositor inspired by CWM"
+HOMEPAGE="https://hikari.acmelabs.space/"
+SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="gamma layershell screencopy suid virtual-io +X"
+
+DEPEND="
+ dev-libs/libinput:=
+ dev-libs/libucl
+ >=gui-libs/wlroots-0.11.0[X?]
+ media-libs/libglvnd
+ x11-libs/cairo[X?,svg]
+ x11-libs/libxkbcommon[X?]
+ x11-libs/pango[X?]
+ x11-libs/pixman
+ sys-libs/pam
+"
+
+RDEPEND="
+ ${DEPEND}
+ x11-misc/xkeyboard-config
+"
+
+BDEPEND="
+ dev-libs/wayland-protocols
+ sys-devel/bmake
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ export MAKE=bmake
+}
+
+src_compile() {
+ ${MAKE} -j$(makeopts_jobs) VERSION="{PV}" \
+ -DWITH_POSIX_C_SOURCE \
+ $(usex gamma -DWITH_GAMMACONTROL "") \
+ $(usex layershell -DWITH_LAYERSHELL "") \
+ $(usex screencopy -DWITH_SCREENCOPY "") \
+ $(usex suid -DWITH_SUID "") \
+ $(usex virtual-io -DWITH_VIRTUAL_INPUT "") \
+ $(usex X -DWITH_XWAYLAND "") \
+ all || die
+}
+
+src_install() {
+ ${MAKE} DESTDIR="${D}" PREFIX=/usr ETC_PREFIX=/ install || die
+ doman share/man/man1/hikari.1
+}
diff --git a/gui-wm/hikari/metadata.xml b/gui-wm/hikari/metadata.xml
index 369ad100778a..95946d509209 100644
--- a/gui-wm/hikari/metadata.xml
+++ b/gui-wm/hikari/metadata.xml
@@ -19,7 +19,6 @@
<flag name="gamma">add gamma control for redshift</flag>
<flag name="layershell">add support for wayland apps using layer shell</flag>
<flag name="screencopy">add support for screen grabbing</flag>
- <flag name="man">build and install man pages</flag>
<flag name="virtual-io">enable virtual input/output support, needed for remote I/O in VNC</flag>
</use>
</pkgmetadata>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 20:23:05 +0000