diff --git a/x11/wf-shell/Makefile b/x11/wf-shell/Makefile index 41406143d855..47056142e6a2 100644 --- a/x11/wf-shell/Makefile +++ b/x11/wf-shell/Makefile @@ -1,62 +1,62 @@ PORTNAME= wf-shell DISTVERSIONPREFIX= v DISTVERSION= 0.11.0 +PORTREVISION= 1 CATEGORIES= x11 wayland MAINTAINER= ports@FreeBSD.org COMMENT= GTK3-based panel for wayfire WWW= https://wayfire.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols \ wf-config>=0.7.0:devel/wf-config \ wayfire>0:x11-wm/wayfire LIB_DEPENDS= libdbusmenu-glib.so:devel/libdbusmenu \ libinotify.so:devel/libinotify \ libwf-config.so:devel/wf-config \ + libgtk4-layer-shell.so:x11-toolkits/gtk4-layer-shell \ libwayland-client.so:graphics/wayland \ libepoxy.so:graphics/libepoxy \ libxkbregistry.so:x11/libxkbcommon \ libyyjson.so:devel/yyjson \ libdrm.so:graphics/libdrm RUN_DEPENDS= wayland-logout:x11/wayland-logout FLAVORS= default nopipewire nopulse lite FLAVOR?= ${FLAVORS:[1]} ${FLAVOR}_PKGNAMESUFFIX= ${FLAVOR:N${FLAVORS:[1]}:C|(.+)|-\1|} -USES= compiler:c++17-lang gl gnome meson pkgconfig vala:build ssl +USES= compiler:c++17-lang gl gnome meson pkgconfig ssl USE_GITHUB= yes GH_ACCOUNT= WayfireWM -GH_TUPLE= wmww:gtk4-layer-shell:v1.3.0:gtk4_layer_shell/subprojects/gtk4-layer-shell \ - GNOME:libgnome-volume-control:5f9768a:gvc/subprojects/gvc \ +GH_TUPLE= GNOME:libgnome-volume-control:5f9768a:gvc/subprojects/gvc \ WayfireWM:wf-json:70039e1:wf_json/subprojects/wf-json USE_GL= gbm USE_GNOME= gtkmm40 -MESON_ARGS= -Dgvc:alsa=false -Dwayland-logout=false -Dddcutil=disabled +MESON_ARGS= -Dddcutil=disabled -Dgvc:alsa=false -Dwayland-logout=false LDFLAGS+= -lpam -lpthread CONFLICTS_INSTALL= ${PORTNAME}* OPTIONS_DEFINE= PIPEWIRE PULSEAUDIO OPTIONS_DEFAULT= PIPEWIRE PULSEAUDIO .if ${FLAVOR:U} == nopipewire || ${FLAVOR:U} == lite OPTIONS_EXCLUDE+= PIPEWIRE .endif .if ${FLAVOR:U} == nopulse || ${FLAVOR:U} == lite OPTIONS_EXCLUDE+= PULSEAUDIO .endif PIPEWIRE_LIB_DEPENDS= libwireplumber-0.5.so:multimedia/wireplumber PIPEWIRE_MESON_ENABLED= wp-mixer-widget PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_MESON_ENABLED= volume-widget post-patch: - ${LN} -s . ${WRKSRC}/subprojects/gtk4-layer-shell/include/gtk4-layer-shell ${REINPLACE_CMD} 's|/etc/|${LOCALBASE}/etc/|' ${WRKSRC}/data/meson.build .include diff --git a/x11/wf-shell/distinfo b/x11/wf-shell/distinfo index 151a0fabb6da..7bfd7631ffbf 100644 --- a/x11/wf-shell/distinfo +++ b/x11/wf-shell/distinfo @@ -1,9 +1,7 @@ -TIMESTAMP = 1787444444 +TIMESTAMP = 1787777777 SHA256 (WayfireWM-wf-shell-v0.11.0_GH0.tar.gz) = 328b1a01c5fc63ebc6fa79152bafdcd2e1525c8bb3caf5b49361ff2792dd57f4 SIZE (WayfireWM-wf-shell-v0.11.0_GH0.tar.gz) = 39167138 -SHA256 (wmww-gtk4-layer-shell-v1.3.0_GH0.tar.gz) = 1ebb01ab14e98afd1727f68f64981c37bd23305b1f131f5667c02b94cf593192 -SIZE (wmww-gtk4-layer-shell-v1.3.0_GH0.tar.gz) = 79405 SHA256 (GNOME-libgnome-volume-control-5f9768a_GH0.tar.gz) = c5b11d3acc14c170bcf9f229a8ab858c7aa2f986a65d4acc4633823646a5c7c6 SIZE (GNOME-libgnome-volume-control-5f9768a_GH0.tar.gz) = 46401 SHA256 (WayfireWM-wf-json-70039e1_GH0.tar.gz) = db7548bcee0eb784a1813c9b29aca93568357ee9c224b07d0d7436aa21988689 SIZE (WayfireWM-wf-json-70039e1_GH0.tar.gz) = 4923 diff --git a/x11/wf-shell/pkg-plist b/x11/wf-shell/pkg-plist index fac5941a881f..2270e69a43aa 100644 --- a/x11/wf-shell/pkg-plist +++ b/x11/wf-shell/pkg-plist @@ -1,56 +1,43 @@ bin/wf-background bin/wf-dock bin/wf-locker bin/wf-locker-pin bin/wf-panel bin/wf-stream-chooser etc/pam.d/wf-locker etc/xdg/xdg-desktop-portal-wlr/wayfire -include/gtk4-layer-shell/gtk4-layer-shell.h -include/gtk4-layer-shell/gtk4-session-lock.h -lib/girepository-1.0/Gtk4LayerShell-1.0.typelib -lib/girepository-1.0/Gtk4SessionLock-1.0.typelib -lib/libgtk4-layer-shell.so -lib/libgtk4-layer-shell.so.0 -lib/libgtk4-layer-shell.so.1.3.0 -lib/liblayer-shell-preload.so -libdata/pkgconfig/gtk4-layer-shell-0.pc libdata/pkgconfig/wf-shell.pc share/applications/wf-locker-pin.desktop -share/gir-1.0/Gtk4LayerShell-1.0.gir -share/gir-1.0/Gtk4SessionLock-1.0.gir share/icons/hicolor/128x128/apps/wayfire.png share/icons/hicolor/160x160/apps/wayfire.png share/icons/hicolor/192x192/apps/wayfire.png share/icons/hicolor/256x256/apps/wayfire.png share/icons/hicolor/48x48/apps/wayfire.png share/icons/hicolor/512x512/apps/wayfire.png share/icons/hicolor/64x64/apps/wayfire.png share/icons/hicolor/72x72/apps/wayfire.png share/icons/hicolor/96x96/apps/wayfire.png share/icons/hicolor/scalable/apps/wayfire.svg -share/vala/vapi/gtk4-layer-shell-0.deps -share/vala/vapi/gtk4-layer-shell-0.vapi %%DATADIR%%/backgrounds/calm-blue.png %%DATADIR%%/backgrounds/circuits.png %%DATADIR%%/backgrounds/secret-chest.png %%DATADIR%%/backgrounds/simple-2.png %%DATADIR%%/backgrounds/simple.png %%DATADIR%%/backgrounds/snow.png %%DATADIR%%/backgrounds/wallpaper.jpg %%DATADIR%%/css/default.css %%DATADIR%%/css/panel-battery-zoom-hover.css %%DATADIR%%/css/panel-launchers-zoom-hover.css %%DATADIR%%/css/panel-menu-button-small.css %%DATADIR%%/css/panel-menu-zoom-hover.css %%DATADIR%%/css/panel-network-zoom-hover.css %%DATADIR%%/css/panel-selectors.css %%DATADIR%%/css/panel-tray-zoom-hover.css %%DATADIR%%/css/panel-volume-zoom-hover.css %%DATADIR%%/css/panel-window-list-zoom-hover.css %%DATADIR%%/css/user-font.css %%DATADIR%%/icons/wayfire.png %%DATADIR%%/metadata/background.xml %%DATADIR%%/metadata/dock.xml %%DATADIR%%/metadata/locker.xml %%DATADIR%%/metadata/panel.xml