* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/files/, gui-wm/hikari/
@ 2020-06-28 22:21 Aaron Bauman
0 siblings, 0 replies; 4+ messages in thread
From: Aaron Bauman @ 2020-06-28 22:21 UTC (permalink / raw
To: gentoo-commits
commit: 7f7e128f4e44faf93518b84bc455945ee7f663b6
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Wed Jun 17 12:40:49 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 22:21:01 2020 +0000
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 <gentoo <AT> aisha.cc>
Signed-off-by: Aaron Bauman <bman <AT> 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 00000000000..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) --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-2.0.2.ebuild b/gui-wm/hikari/hikari-2.0.2.ebuild
new file mode 100644
index 00000000000..45ebbda8ca0
--- /dev/null
+++ b/gui-wm/hikari/hikari-2.0.2.ebuild
@@ -0,0 +1,63 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/files/, gui-wm/hikari/
@ 2020-08-15 9:30 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2020-08-15 9:30 UTC (permalink / raw
To: gentoo-commits
commit: f7fbfed5e0f9ad844125666159b8e9ec85159c31
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Aug 4 13:20:00 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 09:29:47 2020 +0000
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 <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/16999
Signed-off-by: Joonas Niilola <juippis <AT> 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 00000000000..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
+-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 00000000000..b8ef028dff7
--- /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 c932df87cce..369ad100778 100644
--- a/gui-wm/hikari/metadata.xml
+++ b/gui-wm/hikari/metadata.xml
@@ -20,5 +20,6 @@
<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>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/files/, gui-wm/hikari/
@ 2020-09-29 6:37 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2020-09-29 6:37 UTC (permalink / raw
To: gentoo-commits
commit: c27f3a71952d475a5bc3a150538f9f7b67835a58
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Wed Aug 26 03:57:50 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 06:23:01 2020 +0000
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 <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/17262
Signed-off-by: Joonas Niilola <juippis <AT> 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..00000000000
--- 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-2.0.2.ebuild b/gui-wm/hikari/hikari-2.0.2.ebuild
deleted file mode 100644
index 45ebbda8ca0..00000000000
--- 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/metadata.xml b/gui-wm/hikari/metadata.xml
index 369ad100778..95946d50920 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>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/files/, gui-wm/hikari/
@ 2021-12-28 17:10 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2021-12-28 17:10 UTC (permalink / raw
To: gentoo-commits
commit: bc316728b62ba034c09ed3e08beb21e0e400d256
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 14:28:23 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 17:00:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc316728
gui-wm/hikari: drop 2.2.2-r1
Signed-off-by: Ionen Wolkens <ionen <AT> 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..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 @@
</longdescription>
<use>
<flag name="X">Enable support for X11 applications (XWayland)</flag>
- <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="virtual-io">enable virtual input/output support, needed for remote I/O in VNC</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-12-28 17:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-28 17:10 [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/files/, gui-wm/hikari/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2020-09-29 6:37 Joonas Niilola
2020-08-15 9:30 Joonas Niilola
2020-06-28 22:21 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox