diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile index 61859efeca6f..fd4a8f46a155 100644 --- a/x11-wm/wlmaker/Makefile +++ b/x11-wm/wlmaker/Makefile @@ -1,55 +1,55 @@ PORTNAME= wlmaker DISTVERSIONPREFIX= v -DISTVERSION= 0.7.1 -PORTREVISION= 1 +DISTVERSION= 0.8 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayland compositor inspired by Window Maker WWW= https://github.com/phkaeser/wlmaker LICENSE= APACHE20 BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.32:graphics/wayland-protocols LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libwayland-server.so:graphics/wayland \ libwlroots-0.20.so:x11-toolkits/wlroots020 \ + libinput.so:x11/libinput \ libxdg-basedir.so:x11/libxdg-basedir \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= foot:x11/foot USES= bison cmake compiler:c11 gnome pkgconfig xorg USE_GITHUB= yes USE_GNOME= cairo USE_XORG= xcb GH_ACCOUNT= phkaeser -GH_TUPLE= phkaeser:libbase:a6c6a27:libbase/submodules/libbase \ +GH_TUPLE= phkaeser:libbase:54e6055:libbase/submodules/libbase \ benhoyt:inih:r62:inih/submodules/inih CMAKE_OFF= ${WITH_DEBUG:D:Uconfig_DEBUG} post-patch: # Respect -O level from global CFLAGS or CMAKE_BUILD_TYPE @${REINPLACE_CMD} '/-O[0-9]/d' \ ${WRKSRC}/submodules/libbase/CMakeLists.txt \ ${WRKSRC}/CMakeLists.txt # Respect PREFIX for icons and system-wide config @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/src/clip.c \ ${WRKSRC}/src/config.c \ ${WRKSRC}/src/launcher.c \ ${WRKSRC}/src/${PORTNAME}.c # Generic nodes are not supported by procfs(5) @${REINPLACE_CMD} -e 's,/proc,${LINUXBASE}&,' \ ${WRKSRC}/apps/*.c \ ${WRKSRC}/src/task_list.c # Respect LOCALBASE for apps and use open source Chrome @${REINPLACE_CMD} -e 's,/usr/bin,${LOCALBASE}/bin,' \ -e 's/google-chrome/chrome/' \ ${WRKSRC}/src/action.c \ ${WRKSRC}/etc/*.plist # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276743 @${GREP} -Flr _POSIX_C_SOURCE ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ '/_POSIX_C_SOURCE/d' .include diff --git a/x11-wm/wlmaker/distinfo b/x11-wm/wlmaker/distinfo index b2d6b4477f46..9e2047e720eb 100644 --- a/x11-wm/wlmaker/distinfo +++ b/x11-wm/wlmaker/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1771077457 -SHA256 (phkaeser-wlmaker-v0.7.1_GH0.tar.gz) = c04a26972e92d5722abe5fae07406d8926aaca37a6144950c2eca5efc7c6a789 -SIZE (phkaeser-wlmaker-v0.7.1_GH0.tar.gz) = 513049 -SHA256 (phkaeser-libbase-a6c6a27_GH0.tar.gz) = 474aec72d920a574ac241763b9a3955d4ad6310080c312639e8a562eae04f462 -SIZE (phkaeser-libbase-a6c6a27_GH0.tar.gz) = 134464 +TIMESTAMP = 1779353019 +SHA256 (phkaeser-wlmaker-v0.8_GH0.tar.gz) = 17103a0fc89b6316c4970ccd2eb92b5c83adaa9e909ab6338958face45013bbd +SIZE (phkaeser-wlmaker-v0.8_GH0.tar.gz) = 596657 +SHA256 (phkaeser-libbase-54e6055_GH0.tar.gz) = 98c4b7c3c49b665539218c23402b3156c4e66c1d0d1e36e6b5da877f4b9df3a9 +SIZE (phkaeser-libbase-54e6055_GH0.tar.gz) = 138944 SHA256 (benhoyt-inih-r62_GH0.tar.gz) = 9c15fa751bb8093d042dae1b9f125eb45198c32c6704cd5481ccde460d4f8151 SIZE (benhoyt-inih-r62_GH0.tar.gz) = 22145 diff --git a/x11-wm/wlmaker/files/patch-session b/x11-wm/wlmaker/files/patch-session index dd6ff6256610..abe89289a875 100644 --- a/x11-wm/wlmaker/files/patch-session +++ b/x11-wm/wlmaker/files/patch-session @@ -1,38 +1,11 @@ Avoid Debian specifics when starting from a GUI login manager --- share/wlmaker.desktop.in.orig 2025-03-07 20:59:09 UTC +++ share/wlmaker.desktop.in @@ -1,5 +1,5 @@ Comment=A Wayland compositor inspired by Window Maker [Desktop Entry] Name=WaylandMaker Comment=A Wayland compositor inspired by Window Maker -Exec=@CMAKE_INSTALL_PREFIX@/bin/wlmaker.sh +Exec=wlmaker Type=Application ---- etc/Config.plist.orig 2026-02-14 13:57:37 UTC -+++ etc/Config.plist -@@ -5,16 +5,16 @@ - { - Keyboard = { - // Use system-wide configuration. See keyboard(5). -- XkbConfigurationFile = "/etc/default/keyboard"; -+ // XkbConfigurationFile = "/etc/default/keyboard"; - - // Alternatively: Specify the keyboard properties directly. -- // XkbRMLVO = { -- // Rules = "evdev"; -- // Model = "pc105"; -- // Layout = "us"; -- // Variant = "intl"; -- // Options = ""; -- // }; -+ XkbRMLVO = { -+ Rules = "evdev"; -+ Model = "pc105"; -+ Layout = "us"; -+ Variant = "intl"; -+ Options = ""; -+ }; - - Repeat = { - // Delay before initiating repeats, in milliseconds. diff --git a/x11-wm/wlmaker/pkg-plist b/x11-wm/wlmaker/pkg-plist index 36ac276225e3..e945ec3133a2 100644 --- a/x11-wm/wlmaker/pkg-plist +++ b/x11-wm/wlmaker/pkg-plist @@ -1,32 +1,39 @@ bin/wlmaker +bin/wlmbattery bin/wlmclock bin/wlmcpugraph bin/wlmeyes bin/wlmmemgraph bin/wlmnetgraph bin/wlmtool etc/xdg/wlmaker/Config.plist etc/xdg/wlmaker/RootMenu.plist etc/xdg/wlmaker/RootMenuDebian.plist etc/xdg/wlmaker/State.plist -etc/xdg/wlmaker/Themes/Debian.plist -etc/xdg/wlmaker/Themes/Default.plist share/applications/wlmaker.desktop +share/applications/wlmaker.wlmbattery.desktop share/applications/wlmaker.wlmclock.desktop share/applications/wlmaker.wlmcpugraph.desktop share/applications/wlmaker.wlmeyes.desktop share/applications/wlmaker.wlmmemgraph.desktop share/applications/wlmaker.wlmnetgraph.desktop share/icons/hicolor/48x48/apps/wlmaker.png share/icons/hicolor/64x64/apps/wlmaker.png +share/icons/hicolor/64x64/apps/wlmbattery.png share/icons/hicolor/64x64/apps/wlmclock.png share/icons/hicolor/64x64/apps/wlmcpugraph.png share/icons/hicolor/64x64/apps/wlmeyes.png share/icons/hicolor/64x64/apps/wlmmemgraph.png share/icons/hicolor/64x64/apps/wlmnetgraph.png share/icons/hicolor/scalable/apps/wlmaker.svg +share/metainfo/org.wlmaker.wlmaker.metainfo.xml share/wayland-sessions/wlmaker.desktop -%%DATADIR%%/icons/chrome-48x48.png -%%DATADIR%%/icons/clip-48x48.png -%%DATADIR%%/icons/firefox-48x48.png -%%DATADIR%%/icons/terminal-48x48.png +%%DATADIR%%/Themes/Debian.plist +%%DATADIR%%/Themes/DebianDouble.plist +%%DATADIR%%/Themes/DebianLarger.plist +%%DATADIR%%/Themes/Default.plist +%%DATADIR%%/icons/chrome-56x56.png +%%DATADIR%%/icons/chromium-56x56.png +%%DATADIR%%/icons/clip-56x56.png +%%DATADIR%%/icons/firefox-56x56.png +%%DATADIR%%/icons/terminal-56x56.png