Date: Wed, 3 Jun 2020 19:28:08 +0000 (UTC) From: Lorenzo Salvadore <salvadore@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537836 - in head/x11-wm/hikari: . files Message-ID: <202006031928.053JS8LZ025065@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: salvadore Date: Wed Jun 3 19:28:08 2020 New Revision: 537836 URL: https://svnweb.freebsd.org/changeset/ports/537836 Log: x11-wm/hikari: Update to 2.0.0 - Floating views are raised after layout apply. - Sheet is reset before layout apply. - Focus view is raised to layout on layout apply. - Add append/prepend to layout operations. - Remove sheet groups (ungrouped views create a group for their app id instead). - Groups can now start with digits (no more sheet group overlap). - Add 'sheet-show-group' operation. - Add 'workspace-show-group' operation. - Add 'workspace-show-invisible' operation. - Add 'workspace-show-all' operation. - Add 'workspace-clear' operation. - Add 'workspace-show-group' operation. - Add 'workspace-cycle-[next|prev]' operations. - Add output relative view position configuration (e.g. center, bottom-right). - Allow tiled views to be moved around. - Migrate views to other outputs using move operations (mouse and keyboard). - Add move libinput configuration options for pointer devices. - Add 'ui' section to configuration. - Add default configuration file. - Add default wallpaper. - Many multi-monitor fixes. - And many bugfixes. Port changes: - Use hikari.desktop from upstream. - Use install target from upstream: a patch was needed to avoid installing setuid files in the stage directory. PR: 246954 Submitted by: ports@xanderio.de Approved by: gerald (mentor) Added: head/x11-wm/hikari/files/patch-Makefile (contents, props changed) head/x11-wm/hikari/pkg-plist (contents, props changed) Deleted: head/x11-wm/hikari/files/hikari.desktop.in Modified: head/x11-wm/hikari/Makefile head/x11-wm/hikari/distinfo Modified: head/x11-wm/hikari/Makefile ============================================================================== --- head/x11-wm/hikari/Makefile Wed Jun 3 18:50:07 2020 (r537835) +++ head/x11-wm/hikari/Makefile Wed Jun 3 19:28:08 2020 (r537836) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= hikari -DISTVERSION= 1.2.1 +DISTVERSION= 2.0.0 CATEGORIES= x11-wm MASTER_SITES= https://hikari.acmelabs.space/releases/ @@ -24,17 +24,11 @@ LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ USES= compiler:c11 gnome pkgconfig xorg USE_GNOME= cairo glib20 pango USE_XORG= pixman -MAKE_ARGS= ${WITH_DEBUG:DDEBUG=YES} -SUB_FILES= ${PORTNAME}.desktop -SUB_LIST= COMMENT="${COMMENT}" -PLIST_FILES= "${MAYBE_SUID}bin/${PORTNAME}" \ - "${MAYBE_SUID}bin/${PORTNAME}-unlocker" \ - etc/pam.d/${PORTNAME}-unlocker \ - share/man/man1/${PORTNAME}.1.gz \ - share/wayland-sessions/${PORTNAME}.desktop -PORTEXAMPLES= ${PORTNAME}.conf -OPTIONS_DEFINE= EXAMPLES GAMMA LAYERSHELL SCREENCOPY SUID X11 +MAKE_ARGS+= ${WITH_DEBUG:DDEBUG=YES} \ + WITHOUT_SUID=YES + +OPTIONS_DEFINE= GAMMA LAYERSHELL SCREENCOPY SUID X11 OPTIONS_DEFAULT= GAMMA LAYERSHELL SCREENCOPY SUID X11 GAMMA_DESC= Include gammacontrol protocol (required by, e.g., Redshift) @@ -45,17 +39,16 @@ SUID_DESC= Setuid bit on binaries (required for DRM a GAMMA_MAKE_ARGS= WITH_GAMMACONTROL=YES LAYERSHELL_MAKE_ARGS= WITH_LAYERSHELL=YES SCREENCOPY_MAKE_ARGS= WITH_SCREENCOPY=YES -SUID_VARS= MAYBE_SUID="@(,,4755) " +SUID_PLIST_SUB= MAYBE_SUID="@(,,4755) " +SUID_PLIST_SUB_OFF= MAYBE_SUID="" X11_MAKE_ARGS= WITH_XWAYLAND=YES -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/hikari ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${WRKSRC}/hikari-unlocker ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/pam.d/hikari-unlocker.FreeBSD ${STAGEDIR}${PREFIX}/etc/pam.d/hikari-unlocker - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/share/examples/hikari/hikari.conf ${STAGEDIR}${EXAMPLESDIR}/hikari.conf - ${INSTALL_MAN} ${WRKSRC}/share/man/man1/hikari.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1/ - @${MKDIR} ${STAGEDIR}${PREFIX}/share/wayland-sessions - ${INSTALL_DATA} ${WRKDIR}/hikari.desktop ${STAGEDIR}${PREFIX}/share/wayland-sessions +post-install: +.ifndef WITH_DEBUG + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari-unlocker +.endif + ${MV} ${STAGEDIR}${ETCDIR}/hikari.conf \ + ${STAGEDIR}${ETCDIR}/hikari.conf.sample .include <bsd.port.mk> Modified: head/x11-wm/hikari/distinfo ============================================================================== --- head/x11-wm/hikari/distinfo Wed Jun 3 18:50:07 2020 (r537835) +++ head/x11-wm/hikari/distinfo Wed Jun 3 19:28:08 2020 (r537836) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590253300 -SHA256 (hikari-1.2.1.tar.gz) = f361ec9a367c03a9e678a8d04361426f6982e661719b9e6a3e742572eae0a8e5 -SIZE (hikari-1.2.1.tar.gz) = 99489 +TIMESTAMP = 1591118564 +SHA256 (hikari-2.0.0.tar.gz) = 0230bd89c90da1082e7d59bd991118e0b76c621ee55d21506893866a44adb5fe +SIZE (hikari-2.0.0.tar.gz) = 1002997 Added: head/x11-wm/hikari/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/hikari/files/patch-Makefile Wed Jun 3 19:28:08 2020 (r537836) @@ -0,0 +1,15 @@ +--- Makefile.orig 2020-06-01 09:25:10 UTC ++++ Makefile +@@ -221,10 +221,10 @@ install: hikari hikari-unlocker share/man/man1/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 ++ 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 555 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 Added: head/x11-wm/hikari/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/hikari/pkg-plist Wed Jun 3 19:28:08 2020 (r537836) @@ -0,0 +1,7 @@ +%%MAYBE_SUID%%bin/hikari +%%MAYBE_SUID%%bin/hikari-unlocker +etc/pam.d/hikari-unlocker +@sample %%ETCDIR%%/hikari.conf.sample +share/backgrounds/hikari/hikari_wallpaper.png +share/man/man1/hikari.1.gz +share/wayland-sessions/hikari.desktop
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006031928.053JS8LZ025065>