From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- gui-wm/Manifest.gz | Bin 720 -> 719 bytes gui-wm/hikari/Manifest | 5 +- 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 + gui-wm/sway/Manifest | 6 +- gui-wm/sway/sway-1.5.ebuild | 118 +++++++++ gui-wm/sway/sway-1.5_rc1.ebuild | 116 --------- gui-wm/sway/sway-9999.ebuild | 5 +- gui-wm/wayfire/Manifest | 4 +- gui-wm/wayfire/wayfire-0.5.0.ebuild | 92 +++++++ gui-wm/wayfire/wayfire-9999.ebuild | 26 +- 12 files changed, 626 insertions(+), 136 deletions(-) create mode 100644 gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch create mode 100644 gui-wm/hikari/hikari-2.1.1.ebuild create mode 100644 gui-wm/sway/sway-1.5.ebuild delete mode 100644 gui-wm/sway/sway-1.5_rc1.ebuild create mode 100644 gui-wm/wayfire/wayfire-0.5.0.ebuild (limited to 'gui-wm') diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz index 3b31734a97be..d7a41c0cbeb9 100644 Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest index 22a7bd6ecb92..bb03a62ca5c5 100644 --- a/gui-wm/hikari/Manifest +++ b/gui-wm/hikari/Manifest @@ -1,7 +1,10 @@ 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 -MISC metadata.xml 970 BLAKE2B 3862fa99df4057da6ef427fefe51f33b1ac2adcc2c9ce51393f5189fa85ffea7b19b06898b23433e1980e32c08f5597f92e133095a4a849f3447bf77e1e4623e SHA512 c1032c3c177cdc0ad4afea2276f451bf39a7220c6d7f015d89c7a193b6fc194dae9e0711382126cf6df828c8b93e2445f3c28d93a2459cae1991d39fb2340430 +EBUILD hikari-2.1.1.ebuild 1243 BLAKE2B a7661734f9a46267934ad187a1bed2d028f23044b681c5cac6318f1674c2e8745c26c43edcc6f0f40e3a2ce8c1cd2be0b8aa2e65b7605b8bd63da9a45feb36a1 SHA512 048270c859405fc622772444eb84d1b06a781c80b9c4d454bdcaefb41d2537bdee991753bcf1c6151b9ee2012ad9391bb3098b7b949ec03ea07ab3e0439f4062 +MISC metadata.xml 1075 BLAKE2B 685e0168c0d88f9fd253552e20447e197d2c96354c094ae010cbf0ec5db9021f49cc8b69d9c124e43edb468ee749ac43d79e8cb84abda00e3bffa64360bdc9bb SHA512 625e3432e116a91897ad9ca661500a259e445abbd845f7b78716727fb8f680ecc78d86c41b0939b9495d9ecdcd541404eba58735b445f44f628bfd84581a4567 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 000000000000..4fd6d468d481 --- /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 +-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} \ +- ${PANGO_CFLAGS} \ +- ${CAIRO_CFLAGS} \ +- ${PIXMAN_CFLAGS} \ +- ${XKBCOMMON_CFLAGS} \ +- ${WAYLAND_CFLAGS} \ +- ${LIBINPUT_CFLAGS} \ +- ${UCL_CFLAGS} ++ $(WLROOTS_CFLAGS) \ ++ $(PANGO_CFLAGS) \ ++ $(CAIRO_CFLAGS) \ ++ $(PIXMAN_CFLAGS) \ ++ $(XKBCOMMON_CFLAGS) \ ++ $(WAYLAND_CFLAGS) \ ++ $(LIBINPUT_CFLAGS) \ ++ $(UCL_CFLAGS) + + LIBS = \ +- ${WLROOTS_LIBS} \ +- ${PANGO_LIBS} \ +- ${CAIRO_LIBS} \ +- ${PIXMAN_LIBS} \ +- ${XKBCOMMON_LIBS} \ +- ${WAYLAND_LIBS} \ +- ${LIBINPUT_LIBS} \ +- ${UCL_LIBS} ++ $(WLROOTS_LIBS) \ ++ $(PANGO_LIBS) \ ++ $(CAIRO_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" ||: +@@ -178,66 +207,38 @@ 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-2.1.1.ebuild b/gui-wm/hikari/hikari-2.1.1.ebuild new file mode 100644 index 000000000000..b8ef028dff7f --- /dev/null +++ b/gui-wm/hikari/hikari-2.1.1.ebuild @@ -0,0 +1,57 @@ +# 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 suid virtual-io +X" + +DEPEND=" + dev-libs/libinput:= + dev-libs/libucl + >=gui-libs/wlroots-0.11.0 + 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 + virtual/pkgconfig +" + +# 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_SUID=$(usex suid 1 0) \ + WITH_VIRTUAL_INPUT=$(usex virtual-io 1 0) \ + WITH_XWAYLAND=$(usex X 1 0) \ + all +} + +src_install() { + emake PREFIX="${D}/usr" ETC_PREFIX="${D}" prefix="${SYSROOT}/usr" install install-doc + doman share/man/man1/hikari.1 +} diff --git a/gui-wm/hikari/metadata.xml b/gui-wm/hikari/metadata.xml index c932df87cce3..369ad100778a 100644 --- a/gui-wm/hikari/metadata.xml +++ b/gui-wm/hikari/metadata.xml @@ -20,5 +20,6 @@ add support for wayland apps using layer shell add support for screen grabbing build and install man pages + enable virtual input/output support, needed for remote I/O in VNC diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest index 746523c13b2f..f29870713cae 100644 --- a/gui-wm/sway/Manifest +++ b/gui-wm/sway/Manifest @@ -1,7 +1,7 @@ AUX sway-1.4-gcc-10.patch 1147 BLAKE2B 5ccd4d4b5320389f0b0f521bf40c1d68016098951b2196f5045b6323eb622ea865390d82c01b4a12ce3e77779fbde60a5ff452a58a3121bf83284af961bdf7b4 SHA512 1aaa87327c4f2b83325de3eb33d5976a62e60fab0d95e78bee7697f1293e326b039bbb135d2b0dce17328fe95705b87b4e206b4605cd212d914cb5714f03bb69 DIST sway-1.4.tar.gz 5514489 BLAKE2B 31eb1aee32079e643cc7a0263a097000c089e36916ea2a681e1ec696f8329e7ecfe3c8a981ec3b6d4e3dd99c8e263b2c208dbe602308d6bdaf4cdabbb3c10971 SHA512 3b280bdfdbdae8fb9b4f555bc630c64e7c1d09f7b2c783b99413863a6b620d50cd2b6d10d63e11fdfb9c678fce9a403228ac52fa69fb52561ffbd06790505a71 -DIST sway-1.5_rc1.tar.gz 5535472 BLAKE2B 54ecad147a7ce262231196afd8853bef2093e43516b89397d3fdaeb891beafeab29ca23aa12de02801b875330864261454a63593c881a25a12f85c0dedecd200 SHA512 0841122414d719ba183caf4c4ecb314d8a262a091e674f6884ed2f4f37f1e922f1415ecf985e81c785d5646481628f14c684523087a2dd7664628120be423a28 +DIST sway-1.5.tar.gz 5535966 BLAKE2B e863e97ee897dcd1652d363a09b712932de55da08c88b4858f0aadc29b2cb19d2bda1e5e1184f4e4be6fa54a0136463556f9072f32e2b952d4f12ffd0ee9baf9 SHA512 702e44f8923a4ca05d831dd7ed76165654f113a8b2754d332c509ee844528f47c52b7f21deca78d4a79dad465cbcd0934574fff4ad9bb7a45aec3124dea5bca4 EBUILD sway-1.4-r2.ebuild 3130 BLAKE2B 693a483255dcc93f975cf8ed229499fa944cf094fa18372d095141e3757438fd0788d9082999700b34f3a020d641e3e0c694da652c228b4dc3788df1eec7fefe SHA512 5a5a0de6261f2be9f35357c84c893290e63e7234bd1e474a3e418f07bad344b3a4f9cec6d9cc2076e1f526df920a3f46eb8f21a19e567608bd42fd5f59d875c5 -EBUILD sway-1.5_rc1.ebuild 3046 BLAKE2B 0e73428d39e84d4ddb6b8b5bbd5704820c38485144933864a9e332fd7287b78533bdd431a3ca3e64126198f185cfcda7184aed91a6d73105012c397d03bbe257 SHA512 7f8a97b261e970488f34d9e9cd1c3b0bdf6e3274272b6fc024ce243975791666a9ccd072d5ab403460ea61a4ce99e802c3cccd600c968de182b5cf0ddb94d543 -EBUILD sway-9999.ebuild 3099 BLAKE2B d0c795d635b4c5f449972597906f82bdc9f3fc04324071a5b74989a6496d8b93f686a3308535a81b0c420291d3b2ac0d9a9a86386911a208bc76975e2e560fd7 SHA512 feb93d35d39d6558aeb614af0008e0c4b1a2426250013998ab72784fee2144865966342a64c973eb7a41333da23133b3411b93cf9c1330259389749df5515aff +EBUILD sway-1.5.ebuild 3121 BLAKE2B 45f2a604243345be2d31b20b33f17fc75d120740c438a667ea39220b39639854577c4d84e4dd3e2f93f9594e7e7dbcbca8df4b00999849376fe568414e84141c SHA512 15abe6e2bb12dfc38194f9d4ffd14fba05a16e1dc4abc312bb6102a8a513dff2d8355908536f643d4a0ec57fca1724ffd574fd9020270fba2d2d1c7a3f2acad3 +EBUILD sway-9999.ebuild 3124 BLAKE2B ab46472c87e47763615ba86ac40a4b79c010c4565c3e11546ed56de119758c54914c43fad9d39199eccc6c5ca8b43a270308958bb1d68cd147a418970cbf4b93 SHA512 90442f48633fbd3358449b6b2eab95055f496d1d2bc6ddca3810ba8e9ea6d5ec1f9dc2a16adf52705fd277bffef166ebe0c772dc8ae19b2c018d46c16e348e84 MISC metadata.xml 2374 BLAKE2B e17f6ebbeca77d00043359eb5eec3cf6070c8b3ef1c852dbcbf9ef69e2ae558b78eebf37485e21d475d45f33015a97bc6a61740e158d2aafd1695b842262b5bd SHA512 e232fe896f8fd0c8e7293093fba00c03604771740e5984978f32605f62e86f5d97d5ba95a10488b354d30d65a94bb33a051e21196bba1b0693ee13cef09ce33d diff --git a/gui-wm/sway/sway-1.5.ebuild b/gui-wm/sway/sway-1.5.ebuild new file mode 100644 index 000000000000..66ff5e4f18e0 --- /dev/null +++ b/gui-wm/sway/sway-1.5.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils meson + +DESCRIPTION="i3-compatible Wayland window manager" +HOMEPAGE="https://swaywm.org" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/swaywm/${PN}.git" +else + MY_PV=${PV/_rc/-rc} + SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 arm64 ~ppc64 x86" + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion" +REQUIRED_USE="?? ( elogind systemd ) + tray? ( || ( elogind systemd ) )" + +DEPEND=" + >=dev-libs/json-c-0.13:0= + >=dev-libs/libinput-1.6.0:0= + dev-libs/libpcre + dev-libs/wayland + x11-libs/cairo + x11-libs/libxkbcommon + x11-libs/pango + x11-libs/pixman + media-libs/mesa[gles2,libglvnd] + elogind? ( >=sys-auth/elogind-239 ) + swaybar? ( x11-libs/gdk-pixbuf:2 ) + swaybg? ( gui-apps/swaybg ) + swayidle? ( gui-apps/swayidle ) + swaylock? ( gui-apps/swaylock ) + systemd? ( >=sys-apps/systemd-239 ) + wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) + X? ( x11-libs/libxcb:0= ) +" +if [[ ${PV} == 9999 ]]; then + DEPEND+="~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]" +else + DEPEND+=" + >=gui-libs/wlroots-0.11.0:=[elogind=,systemd=,X=] + ~/.config/wayfire.ini" + fi +} diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild index 3a3d136e62b0..f2df4accbaa3 100644 --- a/gui-wm/wayfire/wayfire-9999.ebuild +++ b/gui-wm/wayfire/wayfire-9999.ebuild @@ -18,7 +18,7 @@ fi LICENSE="MIT" SLOT="0" -IUSE="+gles +system-wfconfig +system-wlroots elogind systemd" +IUSE="+gles +system-wfconfig +system-wlroots elogind systemd X" REQUIRED_USE="?? ( elogind systemd )" DEPEND=" @@ -26,19 +26,19 @@ DEPEND=" dev-libs/libinput gui-libs/gtk-layer-shell media-libs/glm - media-libs/mesa:=[gles2,wayland,X] + media-libs/mesa:=[gles2,wayland,X?] media-libs/libjpeg-turbo media-libs/libpng - media-libs/freetype:=[X] + media-libs/freetype:=[X?] x11-libs/libdrm - x11-libs/gtk+:3=[wayland,X] - x11-libs/cairo:=[X,svg] - x11-libs/libxkbcommon:=[X] + x11-libs/gtk+:3=[wayland,X?] + x11-libs/cairo:=[X?,svg] + X? ( x11-libs/libxkbcommon:=[X] ) x11-libs/pixman - gles? ( media-libs/libglvnd[X] ) - system-wfconfig? ( ~gui-libs/wf-config-${PV} ) + gles? ( media-libs/libglvnd[X?] ) + system-wfconfig? ( >=gui-libs/wf-config-${PV} ) !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( ~gui-libs/wlroots-9999[elogind=,systemd=,X] ) + system-wlroots? ( >=gui-libs/wlroots-0.11.0[elogind=,systemd=,X?] ) !system-wlroots? ( !gui-libs/wlroots ) " @@ -50,15 +50,15 @@ RDEPEND=" " BDEPEND=" - ${DEPEND} + dev-libs/wayland-protocols virtual/pkgconfig - >=dev-libs/wayland-protocols-1.18 " src_configure() { local emesonargs=( $(meson_feature system-wfconfig use_system_wfconfig) $(meson_feature system-wlroots use_system_wlroots) + $(meson_feature X xwayland) $(meson_use gles enable_gles32) ) meson_src_configure @@ -85,8 +85,8 @@ pkg_postinst() { if [ -z "${REPLACING_VERSIONS}" ]; then elog "Wayfire has been installed but the session cannot be used" elog "until you install a configuration file. The default config" - elog "file is installed at \"/usr/share/doc/${P}/wayfire.ini.bz2\"" + elog "file is installed at \"/usr/share/doc/${PF}/wayfire.ini.bz2\"" elog "To install the file execute" - elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${P}/wayfire.ini.bz2 > ~/.config/wayfire.ini" + elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${PF}/wayfire.ini.bz2 > ~/.config/wayfire.ini" fi } -- cgit v1.2.3