From 3517852e3b8a68d1e997770fc0650c5053bafc6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 Jan 2022 01:27:12 +0000 Subject: gentoo resync : 04.01.2022 --- gui-wm/hikari/Manifest | 5 +- 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, 1 insertion(+), 164 deletions(-) delete mode 100644 gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch delete mode 100644 gui-wm/hikari/hikari-2.2.2-r1.ebuild (limited to 'gui-wm/hikari') diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest index 0cb41a1f2651..ff966426450e 100644 --- a/gui-wm/hikari/Manifest +++ b/gui-wm/hikari/Manifest @@ -1,6 +1,3 @@ -AUX hikari-2.2.1-pkgconfig.patch 2675 BLAKE2B c5313156b4c9fb2871d3c5ee7b0b4532235c9ccf36747d5b6f2b519f1cd9f9fc65b366f404c4c30842286c3656ee75a59ebf214c6b06f4ad3be188d312f9b371 SHA512 d9e782c9bc7038e452a2a2956dd7e812484d8e8cbbd73018dff45a91522594ebd9cfa3e8737b66c143ab7a8cfd04e360b41b9cf4f037a8f215e1986745467378 -DIST hikari-2.2.2.tar.gz 1019277 BLAKE2B 3cf76f0849cbc80493b6f078ec32b2a6f8e47f12ff3a015132e662dc2382f4071661126bf111550e5ab31eee69c54adaf10ec6ef64b681d7859771a180d30652 SHA512 53b1cb8b8e5fdbabcdcb5ba8af31f1cc66e89c8e94d217b7d1f89f0c733fb7969a251ef5090296b7aeca064aafc60d12878f3f2dbffa17e1fb24609e5549b4f1 DIST hikari-2.3.2.tar.gz 1022093 BLAKE2B 8e4df4377728cc1feab3509588a9f2d5138af6e3175682672eedce4ca45d5bb9b7e56568a860871b319b3ff1213468f38f0b6253927f6ab4b905dd495c05c53e SHA512 b7485be089064dd19c4614f60066b3f7b2f322328fa771d4383db27656695746fb00ab534cc754929141c23b7556992391529e537e0522080177068f3d0e2954 -EBUILD hikari-2.2.2-r1.ebuild 1721 BLAKE2B 752691578c78743032d04b5773e6165a384fa83fb2945d8d0b95177cf36605a2e482df839b23fed74a29ee5071bb15b8aff773f45e3de45e765cf49a9296b6f1 SHA512 684e98f99c7a12034bf02b178d75fe0b6086517c1d7b1876036931cb162f52de5fec39e82bff9ba17041abd6b7566fae06e1510094bc81cbb35f56e1c90501be EBUILD hikari-2.3.2.ebuild 1422 BLAKE2B 312e7affe946ab5060348d2ed20e35b42d69298f9aec161b0652826ec92a46eb88e2fee51aa2ad644558d3ed2872bfde290be7d91424ed2b57f44966f92ea01b SHA512 09a16c5af0ed7239de799464c33021acb5acede8e28831fac0f68ad21167c575e7f3ce63f221578fc7d8581be37842d08a8f47f658e5e9c2dd10a36c4a30d610 -MISC metadata.xml 868 BLAKE2B a0b94f722e127c7cfac2e2367fad3e5670b4635ceeb18796fd1ddd45b3b5e7354e445f64732f5d5c176f4599f5a8a82fdf811febe38a31ace17f72aaa61fd95f SHA512 4237f17b3528c133e1fed9836fc39bd39aa7a0d2d60885148c82d1fb56559962b9638057e50201a947f09a351e480870a8dda2376dfe3850141695476016d373 +MISC metadata.xml 541 BLAKE2B 098ae61fbe9416820f64e69de7173d5b2f3141dd9a48447cf41f854faa1f0cfa83ee84850fc9e2fed380b1701adccfb1f2ad6cc794915e9c6042e10cbf796f9f SHA512 845ecfce2a6b0f8a0fb615939b1bb68eb0cd79f29a6e9ef3c84fe82ccc4bac4dc78ee3d9794a8d4f805f8cc5a0842535d82accac7dfee9743aa00f095a3e58bc 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..000000000000 --- 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..000000000000 --- 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://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 -" - -# Needeed in DEPEND only (not BDEPEND as need to be right location etc) -DEPEND+=" dev-libs/wayland-protocols" - -BDEPEND=" - sys-devel/bmake - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}"/${PN}-2.2.1-pkgconfig.patch ) - -pkg_setup() { - # We set `bmake` and we also have to remove any reference to -l in MAKEOPTS - # as `bmake` does not support load average - # We do this in a crude way until flag-o-matic supports MAKEOPTS - # bug 778191 - export MAKE=bmake - export MAKEOPTS=$(echo ${MAKEOPTS} | sed 's/-l \?[\.0-9]\+//' || die) - tc-export CC PKG_CONFIG -} - -src_compile() { - emake \ - VERSION="${PV}" \ - CC="$(tc-getCC)" \ - CFLAGS_EXTRA="${CFLAGS}" \ - LDFLAGS_EXTRA="${LDFLAGS}" \ - -DWITH_POSIX_C_SOURCE \ - $(usex gamma -DWITH_GAMMACONTROL "") \ - $(usex layershell -DWITH_LAYERSHELL "") \ - $(usex screencopy -DWITH_SCREENCOPY "") \ - $(usex virtual-io -DWITH_VIRTUAL_INPUT "") \ - $(usex X -DWITH_XWAYLAND "") \ - all -} - -src_install() { - emake \ - DESTDIR="${D}" \ - PREFIX=/usr \ - ETC_PREFIX=/ \ - $(usex suid "" -DWITHOUT_SUID) \ - install - - doman share/man/man1/hikari.1 -} diff --git a/gui-wm/hikari/metadata.xml b/gui-wm/hikari/metadata.xml index 528433ed8065..ad8d6bb1c67c 100644 --- a/gui-wm/hikari/metadata.xml +++ b/gui-wm/hikari/metadata.xml @@ -10,9 +10,5 @@ Enable support for X11 applications (XWayland) - add gamma control for redshift - add support for wayland apps using layer shell - add support for screen grabbing - enable virtual input/output support, needed for remote I/O in VNC -- cgit v1.2.3