| 1 |
commit: f7fbfed5e0f9ad844125666159b8e9ec85159c31 |
| 2 |
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> |
| 3 |
AuthorDate: Tue Aug 4 13:20:00 2020 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 15 09:29:47 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7fbfed5 |
| 7 |
|
| 8 |
gui-wm/hikari: update to version 2.1.1 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/733646 |
| 11 |
Closes: https://bugs.gentoo.org/730550 |
| 12 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 13 |
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/16999 |
| 15 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 16 |
|
| 17 |
gui-wm/hikari/Manifest | 1 + |
| 18 |
gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch | 332 ++++++++++++++++++++++++ |
| 19 |
gui-wm/hikari/hikari-2.1.1.ebuild | 57 ++++ |
| 20 |
gui-wm/hikari/metadata.xml | 1 + |
| 21 |
4 files changed, 391 insertions(+) |
| 22 |
|
| 23 |
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest |
| 24 |
index 4a0d036c0f8..0da13980b1b 100644 |
| 25 |
--- a/gui-wm/hikari/Manifest |
| 26 |
+++ b/gui-wm/hikari/Manifest |
| 27 |
@@ -1,2 +1,3 @@ |
| 28 |
DIST hikari-1.2.0.tar.gz 98941 BLAKE2B 0b882d483143e307d4b173560f335e85b4c5613b75c51c6b70b68df9b4f70f9a009d95cb8eda1c211f4968b5c8600e7113bca5e014cecfb1917db2acae7e6f3d SHA512 2bd0b6032541ca63a2bd12aee9155e9b0d08e4c541ec2f837073f1498ecb39df969f8821fcbd066e44c5ddaf658e4875bea25f344226b7ea97fe008a0db4d328 |
| 29 |
DIST hikari-2.0.2.tar.gz 1003593 BLAKE2B 89a2ec29673e7ac371a7e4f179b3dc398fbacb3daf859a9f1a53cf74aac9dc36ca33f3dc1878360fdae80ef39315a0b06d0988d897c9ce58693404fd3099d6bf SHA512 12e6cf2f1f24a4c0b64e6c035c518bdc5dbfa094a220147c374f599df8b52a4ee4c1f3cdffe1080fe87c665841a6ca018de4a48ec65aaa5b60e9e968087d83d6 |
| 30 |
+DIST hikari-2.1.1.tar.gz 1012598 BLAKE2B 189e7bd9271ed5af89f5039288334c16a33c049c504f57e05cfa11b20098650165bb655023d016a14f2b13ed94e819bece088ef8517b9114b80d6a5921000780 SHA512 6da547d957cc65ab040647209a865550b0cc2b3d79040fae507591c41e938826861e27034379c21a1b7ce18afa35dbb813e96e661f4bd1232eb932f032271dff |
| 31 |
|
| 32 |
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 |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..4fd6d468d48 |
| 35 |
--- /dev/null |
| 36 |
+++ b/gui-wm/hikari/files/hikari-2.1.1-gnu-make.patch |
| 37 |
@@ -0,0 +1,332 @@ |
| 38 |
+explain steps to guide future me and other patchers |
| 39 |
+(1) define common variables on top |
| 40 |
+(2) remove conditions for doc and others to define VERSION |
| 41 |
+(3) replace all ${*} by $(*) |
| 42 |
+(4) replace pkg-config by $(PKG_CONFIG) |
| 43 |
+(6) remove .PATH: src |
| 44 |
+(5) remove main.c from OBJS because it is in different directory |
| 45 |
+ - we will define a separate target for it |
| 46 |
+(6) add $(OBJS) target + main.o target and add then to the end |
| 47 |
+ of dependencies for hikari |
| 48 |
+(7) add main.o to be cleaned-up |
| 49 |
+(8) reorder the library orders in the $(CC) steps because gcc |
| 50 |
+diff --git a/Makefile b/Makefile |
| 51 |
+index cab013a..b72e74c 100644 |
| 52 |
+--- a/Makefile |
| 53 |
++++ b/Makefile |
| 54 |
+@@ -1,7 +1,22 @@ |
| 55 |
++TARGET = hikari |
| 56 |
++ |
| 57 |
++DESTDIR ?= |
| 58 |
++ |
| 59 |
++prefix ?= /usr/local |
| 60 |
++exec_prefix ?= $(prefix) |
| 61 |
++bindir ?= $(exec_prefix)/bin |
| 62 |
++sysconfdir ?= $(prefix)/etc |
| 63 |
++ |
| 64 |
++PKG_CONFIG ?= pkg-config |
| 65 |
++ |
| 66 |
++VERSION ?= "CURRENT" |
| 67 |
++ |
| 68 |
++### Upstream variables |
| 69 |
++PREFIX ?= $(DESTDIR)$(prefix) |
| 70 |
++ETC_PREFIX ?= $(DESTDIR)$(sysconfdir) |
| 71 |
++ |
| 72 |
+ OS != uname |
| 73 |
+-VERSION ?= "CURRENT" |
| 74 |
+-PREFIX ?= /usr/local |
| 75 |
+-ETC_PREFIX ?= ${PREFIX} |
| 76 |
++INSTALL_GROUP != id -gn |
| 77 |
+ |
| 78 |
+ OBJS = \ |
| 79 |
+ action.o \ |
| 80 |
+@@ -33,7 +48,6 @@ OBJS = \ |
| 81 |
+ layout_select_mode.o \ |
| 82 |
+ lock_indicator.o \ |
| 83 |
+ lock_mode.o \ |
| 84 |
+- main.o \ |
| 85 |
+ mark.o \ |
| 86 |
+ mark_assign_mode.o \ |
| 87 |
+ mark_select_mode.o \ |
| 88 |
+@@ -64,109 +78,124 @@ OBJS = \ |
| 89 |
+ |
| 90 |
+ WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols |
| 91 |
+ |
| 92 |
+-.PHONY: distclean clean clean-doc doc dist install uninstall |
| 93 |
+-.PATH: src |
| 94 |
+- |
| 95 |
+ # Allow specification of /extra/ CFLAGS and LDFLAGS |
| 96 |
+-CFLAGS += ${CFLAGS_EXTRA} |
| 97 |
+-LDFLAGS += ${LDFLAGS_EXTRA} |
| 98 |
++CFLAGS += $(CFLAGS_EXTRA) |
| 99 |
++LDFLAGS += $(LDFLAGS_EXTRA) |
| 100 |
+ |
| 101 |
+-.ifdef DEBUG |
| 102 |
++ifeq ($(DEBUG),1) |
| 103 |
+ CFLAGS += -g -O0 -fsanitize=address |
| 104 |
+-.else |
| 105 |
++else |
| 106 |
+ CFLAGS += -DNDEBUG |
| 107 |
+-.endif |
| 108 |
++endif |
| 109 |
+ |
| 110 |
+-.ifdef WITH_POSIX_C_SOURCE |
| 111 |
++ifeq ($(WITH_POSIX_C_SOURCE),1) |
| 112 |
+ CFLAGS += -D_POSIX_C_SOURCE=200809L |
| 113 |
+-.endif |
| 114 |
++endif |
| 115 |
+ |
| 116 |
+-.ifdef WITH_XWAYLAND |
| 117 |
++ifeq ($(WITH_XWAYLAND),1) |
| 118 |
+ CFLAGS += -DHAVE_XWAYLAND=1 |
| 119 |
+-.endif |
| 120 |
++endif |
| 121 |
+ |
| 122 |
+-.ifdef WITH_GAMMACONTROL |
| 123 |
++ifeq ($(WITH_GAMMACONTROL),1) |
| 124 |
+ CFLAGS += -DHAVE_GAMMACONTROL=1 |
| 125 |
+-.endif |
| 126 |
++endif |
| 127 |
+ |
| 128 |
+-.ifdef WITH_SCREENCOPY |
| 129 |
++ifeq ($(WITH_SCREENCOPY),1) |
| 130 |
+ CFLAGS += -DHAVE_SCREENCOPY=1 |
| 131 |
+-.endif |
| 132 |
++endif |
| 133 |
+ |
| 134 |
+-.ifdef WITH_LAYERSHELL |
| 135 |
++ifeq ($(WITH_LAYERSHELL),1) |
| 136 |
+ CFLAGS += -DHAVE_LAYERSHELL=1 |
| 137 |
+-.endif |
| 138 |
++endif |
| 139 |
++ |
| 140 |
++ifeq ($(WITH_VIRTUAL_INPUT),1) |
| 141 |
++CFLAGS += -DHAVE_VIRTUAL_INPUT=1 |
| 142 |
++endif |
| 143 |
+ |
| 144 |
+-.ifdef WITHOUT_SUID |
| 145 |
++ifeq ($(WITHOUT_SUID),1) |
| 146 |
+ PERMS = 555 |
| 147 |
+-.else |
| 148 |
++else |
| 149 |
+ PERMS = 4555 |
| 150 |
+-.endif |
| 151 |
++endif |
| 152 |
+ |
| 153 |
+-CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX} |
| 154 |
++CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=$(ETC_PREFIX) |
| 155 |
+ |
| 156 |
+-WLROOTS_CFLAGS != pkg-config --cflags wlroots |
| 157 |
+-WLROOTS_LIBS != pkg-config --libs wlroots |
| 158 |
++WLROOTS_CFLAGS != $(PKG_CONFIG) --cflags wlroots |
| 159 |
++WLROOTS_LIBS != $(PKG_CONFIG) --libs wlroots |
| 160 |
+ |
| 161 |
+ WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1 |
| 162 |
+ |
| 163 |
+-PANGO_CFLAGS != pkg-config --cflags pangocairo |
| 164 |
+-PANGO_LIBS != pkg-config --libs pangocairo |
| 165 |
++PANGO_CFLAGS != $(PKG_CONFIG) --cflags pangocairo |
| 166 |
++PANGO_LIBS != $(PKG_CONFIG) --libs pangocairo |
| 167 |
+ |
| 168 |
+-CAIRO_CFLAGS != pkg-config --cflags cairo |
| 169 |
+-CAIRO_LIBS != pkg-config --libs cairo |
| 170 |
++CAIRO_CFLAGS != $(PKG_CONFIG) --cflags cairo |
| 171 |
++CAIRO_LIBS != $(PKG_CONFIG) --libs cairo |
| 172 |
+ |
| 173 |
+-PIXMAN_CFLAGS != pkg-config --cflags pixman-1 |
| 174 |
+-PIXMAN_LIBS != pkg-config --libs pixman-1 |
| 175 |
++PIXMAN_CFLAGS != $(PKG_CONFIG) --cflags pixman-1 |
| 176 |
++PIXMAN_LIBS != $(PKG_CONFIG) --libs pixman-1 |
| 177 |
+ |
| 178 |
+-XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon |
| 179 |
+-XKBCOMMON_LIBS != pkg-config --libs xkbcommon |
| 180 |
++XKBCOMMON_CFLAGS != $(PKG_CONFIG) --cflags xkbcommon |
| 181 |
++XKBCOMMON_LIBS != $(PKG_CONFIG) --libs xkbcommon |
| 182 |
+ |
| 183 |
+-WAYLAND_CFLAGS != pkg-config --cflags wayland-server |
| 184 |
+-WAYLAND_LIBS != pkg-config --libs wayland-server |
| 185 |
++WAYLAND_CFLAGS != $(PKG_CONFIG) --cflags wayland-server |
| 186 |
++WAYLAND_LIBS != $(PKG_CONFIG) --libs wayland-server |
| 187 |
+ |
| 188 |
+-LIBINPUT_CFLAGS != pkg-config --cflags libinput |
| 189 |
+-LIBINPUT_LIBS != pkg-config --libs libinput |
| 190 |
++LIBINPUT_CFLAGS != $(PKG_CONFIG) --cflags libinput |
| 191 |
++LIBINPUT_LIBS != $(PKG_CONFIG) --libs libinput |
| 192 |
+ |
| 193 |
+-UCL_CFLAGS != pkg-config --cflags libucl |
| 194 |
+-UCL_LIBS != pkg-config --libs libucl |
| 195 |
++UCL_CFLAGS != $(PKG_CONFIG) --cflags libucl |
| 196 |
++UCL_LIBS != $(PKG_CONFIG) --libs libucl |
| 197 |
+ |
| 198 |
+ CFLAGS += \ |
| 199 |
+- ${WLROOTS_CFLAGS} \ |
| 200 |
+- ${PANGO_CFLAGS} \ |
| 201 |
+- ${CAIRO_CFLAGS} \ |
| 202 |
+- ${PIXMAN_CFLAGS} \ |
| 203 |
+- ${XKBCOMMON_CFLAGS} \ |
| 204 |
+- ${WAYLAND_CFLAGS} \ |
| 205 |
+- ${LIBINPUT_CFLAGS} \ |
| 206 |
+- ${UCL_CFLAGS} |
| 207 |
++ $(WLROOTS_CFLAGS) \ |
| 208 |
++ $(PANGO_CFLAGS) \ |
| 209 |
++ $(CAIRO_CFLAGS) \ |
| 210 |
++ $(PIXMAN_CFLAGS) \ |
| 211 |
++ $(XKBCOMMON_CFLAGS) \ |
| 212 |
++ $(WAYLAND_CFLAGS) \ |
| 213 |
++ $(LIBINPUT_CFLAGS) \ |
| 214 |
++ $(UCL_CFLAGS) |
| 215 |
+ |
| 216 |
+ LIBS = \ |
| 217 |
+- ${WLROOTS_LIBS} \ |
| 218 |
+- ${PANGO_LIBS} \ |
| 219 |
+- ${CAIRO_LIBS} \ |
| 220 |
+- ${PIXMAN_LIBS} \ |
| 221 |
+- ${XKBCOMMON_LIBS} \ |
| 222 |
+- ${WAYLAND_LIBS} \ |
| 223 |
+- ${LIBINPUT_LIBS} \ |
| 224 |
+- ${UCL_LIBS} |
| 225 |
++ $(WLROOTS_LIBS) \ |
| 226 |
++ $(PANGO_LIBS) \ |
| 227 |
++ $(CAIRO_LIBS) \ |
| 228 |
++ $(PIXMAN_LIBS) \ |
| 229 |
++ $(XKBCOMMON_LIBS) \ |
| 230 |
++ $(WAYLAND_LIBS) \ |
| 231 |
++ $(LIBINPUT_LIBS) \ |
| 232 |
++ $(UCL_LIBS) |
| 233 |
+ |
| 234 |
+-all: hikari hikari-unlocker |
| 235 |
++.PHONY: distclean clean clean-doc doc dist install uninstall |
| 236 |
+ |
| 237 |
+ version.h: |
| 238 |
+- echo "#define HIKARI_VERSION \"${VERSION}\"" >> version.h |
| 239 |
++ echo "#define HIKARI_VERSION \"$(VERSION)\"" >> version.h |
| 240 |
+ |
| 241 |
+-hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h ${OBJS} |
| 242 |
+- ${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o ${.TARGET} ${OBJS} ${LIBS} |
| 243 |
++$(OBJS): %.o: src/%.c |
| 244 |
++ $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ |
| 245 |
++ |
| 246 |
++main.o: |
| 247 |
++ $(CC) $(CFLAGS) $(INCLUDES) -c main.c -o main.o |
| 248 |
+ |
| 249 |
+ xdg-shell-protocol.h: |
| 250 |
+- wayland-scanner server-header ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml ${.TARGET} |
| 251 |
++ wayland-scanner server-header $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml xdg-shell-protocol.h |
| 252 |
+ |
| 253 |
+ wlr-layer-shell-unstable-v1-protocol.h: |
| 254 |
+- wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET} |
| 255 |
++ wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml wlr-layer-shell-unstable-v1-protocol.h |
| 256 |
++ |
| 257 |
++hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h $(OBJS) main.o |
| 258 |
++ $(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) $(OBJS) main.o $(LIBS) -o $(TARGET) |
| 259 |
+ |
| 260 |
+ hikari-unlocker: hikari_unlocker.c |
| 261 |
+- ${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam |
| 262 |
++ $(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) hikari_unlocker.c -lpam $(LIBS) -o hikari-unlocker |
| 263 |
++ |
| 264 |
++share/man/man1/hikari.1: |
| 265 |
++ pandoc -M title:"HIKARI(1) $(VERSION) | hikari - Wayland Compositor" -s \ |
| 266 |
++ --to man -o share/man/man1/hikari.1 share/man/man1/hikari.md |
| 267 |
++ |
| 268 |
++doc: share/man/man1/hikari.1 |
| 269 |
++ |
| 270 |
++all: hikari hikari-unlocker |
| 271 |
+ |
| 272 |
+ clean-doc: |
| 273 |
+ @test -e _darcs && echo "cleaning manpage" ||: |
| 274 |
+@@ -178,66 +207,38 @@ clean: clean-doc |
| 275 |
+ @rm xdg-shell-protocol.h 2> /dev/null ||: |
| 276 |
+ @rm wlr-layer-shell-unstable-v1-protocol.h 2> /dev/null ||: |
| 277 |
+ @echo "cleaning object files" |
| 278 |
+- @rm ${OBJS} 2> /dev/null ||: |
| 279 |
++ @rm $(OBJS) 2> /dev/null ||: |
| 280 |
++ @rm main.o 2> /dev/null ||: |
| 281 |
+ @echo "cleaning executables" |
| 282 |
+ @rm hikari 2> /dev/null ||: |
| 283 |
+ @rm hikari-unlocker 2> /dev/null ||: |
| 284 |
+ |
| 285 |
+-share/man/man1/hikari.1: |
| 286 |
+- pandoc -M title:"HIKARI(1) ${VERSION} | hikari - Wayland Compositor" -s \ |
| 287 |
+- --to man -o share/man/man1/hikari.1 share/man/man1/hikari.md |
| 288 |
+- |
| 289 |
+-doc: share/man/man1/hikari.1 |
| 290 |
+- |
| 291 |
+-hikari-${VERSION}.tar.gz: version.h share/man/man1/hikari.1 |
| 292 |
+- @darcs revert |
| 293 |
+- @tar -s "#^#hikari-${VERSION}/#" -czf hikari-${VERSION}.tar.gz \ |
| 294 |
+- version.h \ |
| 295 |
+- main.c \ |
| 296 |
+- hikari_unlocker.c \ |
| 297 |
+- include/hikari/*.h \ |
| 298 |
+- src/*.c \ |
| 299 |
+- protocol/*.xml \ |
| 300 |
+- Makefile \ |
| 301 |
+- LICENSE \ |
| 302 |
+- README.md \ |
| 303 |
+- CHANGELOG.md \ |
| 304 |
+- share/man/man1/hikari.md \ |
| 305 |
+- share/man/man1/hikari.1 \ |
| 306 |
+- share/backgrounds/hikari/hikari_wallpaper.png \ |
| 307 |
+- share/wayland-sessions/hikari.desktop \ |
| 308 |
+- etc/hikari/hikari.conf \ |
| 309 |
+- etc/pam.d/hikari-unlocker.* |
| 310 |
+- |
| 311 |
+-distclean: clean-doc |
| 312 |
+- @test -e _darcs && echo "cleaning version.h" ||: |
| 313 |
+- @test -e _darcs && rm version.h ||: |
| 314 |
+- |
| 315 |
+-dist: distclean hikari-${VERSION}.tar.gz |
| 316 |
+- |
| 317 |
+-install: hikari hikari-unlocker share/man/man1/hikari.1 |
| 318 |
+- mkdir -p ${DESTDIR}/${PREFIX}/bin |
| 319 |
+- mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1 |
| 320 |
+- mkdir -p ${DESTDIR}/${PREFIX}/share/backgrounds/hikari |
| 321 |
+- mkdir -p ${DESTDIR}/${PREFIX}/share/wayland-sessions |
| 322 |
+- mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/hikari |
| 323 |
+- mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/pam.d |
| 324 |
+- sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf |
| 325 |
+- chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf |
| 326 |
+- install -m ${PERMS} hikari ${DESTDIR}/${PREFIX}/bin |
| 327 |
+- install -m 4555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin |
| 328 |
+- install -m 644 share/man/man1/hikari.1 ${DESTDIR}/${PREFIX}/share/man/man1 |
| 329 |
+- install -m 644 share/backgrounds/hikari/hikari_wallpaper.png ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png |
| 330 |
+- install -m 644 share/wayland-sessions/hikari.desktop ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop |
| 331 |
+- install -m 644 etc/pam.d/hikari-unlocker.${OS} ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker |
| 332 |
++install-doc: |
| 333 |
++ install -m 644 share/man/man1/hikari.1 $(PREFIX)/share/man/man1 |
| 334 |
++ |
| 335 |
++install: |
| 336 |
++ mkdir -p $(PREFIX)/bin |
| 337 |
++ mkdir -p $(PREFIX)/share/man/man1 |
| 338 |
++ mkdir -p $(PREFIX)/share/backgrounds/hikari |
| 339 |
++ mkdir -p $(PREFIX)/share/wayland-sessions |
| 340 |
++ mkdir -p $(ETC_PREFIX)/etc/hikari |
| 341 |
++ mkdir -p $(ETC_PREFIX)/etc/pam.d |
| 342 |
++ sed "s,PREFIX,$(prefix)," etc/hikari/hikari.conf > $(ETC_PREFIX)/etc/hikari/hikari.conf |
| 343 |
++ chmod 644 $(ETC_PREFIX)/etc/hikari/hikari.conf |
| 344 |
++ install -m $(PERMS) hikari $(PREFIX)/bin |
| 345 |
++ install -m 4555 hikari-unlocker $(PREFIX)/bin |
| 346 |
++ install -m 644 share/backgrounds/hikari/hikari_wallpaper.png $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png |
| 347 |
++ install -m 644 share/wayland-sessions/hikari.desktop $(PREFIX)/share/wayland-sessions/hikari.desktop |
| 348 |
++ install -m 644 etc/pam.d/hikari-unlocker.$(OS) $(ETC_PREFIX)/etc/pam.d/hikari-unlocker |
| 349 |
+ |
| 350 |
+ uninstall: |
| 351 |
+- -rm ${DESTDIR}/${PREFIX}/bin/hikari |
| 352 |
+- -rm ${DESTDIR}/${PREFIX}/bin/hikari-unlocker |
| 353 |
+- -rm ${DESTDIR}/${PREFIX}/share/man/man1/hikari.1 |
| 354 |
+- -rm ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png |
| 355 |
+- -rm ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop |
| 356 |
+- -rm ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker |
| 357 |
+- -rm ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf |
| 358 |
+- -rmdir ${DESTDIR}/${ETC_PREFIX}/etc/hikari |
| 359 |
+- -rmdir ${DESTDIR}/${PREFIX}/share/backgrounds/hikari |
| 360 |
++ -rm $(PREFIX)/bin/hikari |
| 361 |
++ -rm $(PREFIX)/bin/hikari-unlocker |
| 362 |
++ -rm $(PREFIX)/share/man/man1/hikari.1 |
| 363 |
++ -rm $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png |
| 364 |
++ -rm $(PREFIX)/share/wayland-sessions/hikari.desktop |
| 365 |
++ -rm $(ETC_PREFIX)/etc/pam.d/hikari-unlocker |
| 366 |
++ -rm $(ETC_PREFIX)/etc/hikari/hikari.conf |
| 367 |
++ -rmdir $(ETC_PREFIX)/etc/hikari |
| 368 |
++ -rmdir $(PREFIX)/share/backgrounds/hikari |
| 369 |
++ |
| 370 |
|
| 371 |
diff --git a/gui-wm/hikari/hikari-2.1.1.ebuild b/gui-wm/hikari/hikari-2.1.1.ebuild |
| 372 |
new file mode 100644 |
| 373 |
index 00000000000..b8ef028dff7 |
| 374 |
--- /dev/null |
| 375 |
+++ b/gui-wm/hikari/hikari-2.1.1.ebuild |
| 376 |
@@ -0,0 +1,57 @@ |
| 377 |
+# Copyright 2019-2020 Gentoo Authors |
| 378 |
+# Distributed under the terms of the GNU General Public License v2 |
| 379 |
+ |
| 380 |
+EAPI=7 |
| 381 |
+ |
| 382 |
+DESCRIPTION="Wayland compositor inspired by CWM" |
| 383 |
+HOMEPAGE="https://hikari.acmelabs.space/" |
| 384 |
+SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz" |
| 385 |
+KEYWORDS="~amd64 ~x86" |
| 386 |
+ |
| 387 |
+LICENSE="MIT" |
| 388 |
+SLOT="0" |
| 389 |
+IUSE="gamma layershell screencopy suid virtual-io +X" |
| 390 |
+ |
| 391 |
+DEPEND=" |
| 392 |
+ dev-libs/libinput:= |
| 393 |
+ dev-libs/libucl |
| 394 |
+ >=gui-libs/wlroots-0.11.0 |
| 395 |
+ media-libs/libglvnd |
| 396 |
+ x11-libs/cairo[X?,svg] |
| 397 |
+ x11-libs/libxkbcommon[X?] |
| 398 |
+ x11-libs/pango[X?] |
| 399 |
+ x11-libs/pixman |
| 400 |
+ sys-libs/pam |
| 401 |
+" |
| 402 |
+ |
| 403 |
+RDEPEND=" |
| 404 |
+ ${DEPEND} |
| 405 |
+ x11-misc/xkeyboard-config |
| 406 |
+" |
| 407 |
+ |
| 408 |
+BDEPEND=" |
| 409 |
+ dev-libs/wayland-protocols |
| 410 |
+ virtual/pkgconfig |
| 411 |
+" |
| 412 |
+ |
| 413 |
+# keep this as others OS's are using this as reference |
| 414 |
+PATCHES=( |
| 415 |
+ "${FILESDIR}/${P}-gnu-make.patch" |
| 416 |
+) |
| 417 |
+ |
| 418 |
+src_compile() { |
| 419 |
+ emake VERSION="{PV}" \ |
| 420 |
+ WITH_POSIX_C_SOURCE=1 \ |
| 421 |
+ WITH_GAMMACONTROL=$(usex gamma 1 0) \ |
| 422 |
+ WITH_LAYERSHELL=$(usex layershell 1 0) \ |
| 423 |
+ WITH_SCREENCOPY=$(usex screencopy 1 0) \ |
| 424 |
+ WITH_SUID=$(usex suid 1 0) \ |
| 425 |
+ WITH_VIRTUAL_INPUT=$(usex virtual-io 1 0) \ |
| 426 |
+ WITH_XWAYLAND=$(usex X 1 0) \ |
| 427 |
+ all |
| 428 |
+} |
| 429 |
+ |
| 430 |
+src_install() { |
| 431 |
+ emake PREFIX="${D}/usr" ETC_PREFIX="${D}" prefix="${SYSROOT}/usr" install install-doc |
| 432 |
+ doman share/man/man1/hikari.1 |
| 433 |
+} |
| 434 |
|
| 435 |
diff --git a/gui-wm/hikari/metadata.xml b/gui-wm/hikari/metadata.xml |
| 436 |
index c932df87cce..369ad100778 100644 |
| 437 |
--- a/gui-wm/hikari/metadata.xml |
| 438 |
+++ b/gui-wm/hikari/metadata.xml |
| 439 |
@@ -20,5 +20,6 @@ |
| 440 |
<flag name="layershell">add support for wayland apps using layer shell</flag> |
| 441 |
<flag name="screencopy">add support for screen grabbing</flag> |
| 442 |
<flag name="man">build and install man pages</flag> |
| 443 |
+ <flag name="virtual-io">enable virtual input/output support, needed for remote I/O in VNC</flag> |
| 444 |
</use> |
| 445 |
</pkgmetadata> |
Archives