Index: head/x11/Makefile =================================================================== --- head/x11/Makefile (revision 545082) +++ head/x11/Makefile (revision 545083) @@ -1,525 +1,526 @@ # $FreeBSD$ # COMMENT = Ports to support the X window system SUBDIR += 3ddesktop SUBDIR += 9box SUBDIR += 9menu SUBDIR += admiral SUBDIR += alacritty SUBDIR += albert SUBDIR += alltray SUBDIR += alttab SUBDIR += aminal SUBDIR += antimicro SUBDIR += appres SUBDIR += apwal SUBDIR += arandr SUBDIR += aterm SUBDIR += babl SUBDIR += bbappconf SUBDIR += bbdock SUBDIR += bbrun SUBDIR += beforelight SUBDIR += bemenu SUBDIR += bgrot SUBDIR += bgs SUBDIR += bitmap SUBDIR += bmpanel2 SUBDIR += bricons SUBDIR += brisk-menu SUBDIR += cde SUBDIR += cinnamon SUBDIR += cinnamon-desktop SUBDIR += cinnamon-menus SUBDIR += cinnamon-screensaver SUBDIR += cinnamon-session SUBDIR += cl-clx SUBDIR += cl-clx-sbcl SUBDIR += clipman SUBDIR += compton-conf SUBDIR += conlecterm SUBDIR += controllermap SUBDIR += cool-retro-term SUBDIR += decurs SUBDIR += deforaos-desktop SUBDIR += deforaos-keyboard SUBDIR += deforaos-libdesktop SUBDIR += deforaos-locker SUBDIR += deforaos-panel SUBDIR += deskmenu SUBDIR += dmenu SUBDIR += dmenu-wayland SUBDIR += docker-tray SUBDIR += dsbautostart SUBDIR += dxpc SUBDIR += dzen2 SUBDIR += eaglemode SUBDIR += editres SUBDIR += emprint SUBDIR += erun SUBDIR += eterm SUBDIR += evilvte SUBDIR += fbdesk SUBDIR += fbpanel SUBDIR += find-cursor SUBDIR += fireflies SUBDIR += florence SUBDIR += flruler SUBDIR += fluxbg SUBDIR += fpc-x11 SUBDIR += fstobdf SUBDIR += gdm SUBDIR += gmrun SUBDIR += gnome-clipboard-daemon SUBDIR += gnome-desktop SUBDIR += gnome-menus SUBDIR += gnome-pie SUBDIR += gnome-session SUBDIR += gnome-shell SUBDIR += gnome-shell-extensions SUBDIR += gnome-terminal SUBDIR += gnome3 SUBDIR += gnome3-lite SUBDIR += gnustep-app SUBDIR += grabc SUBDIR += grim SUBDIR += gromit SUBDIR += gskrab SUBDIR += gstreamer1-plugins-x SUBDIR += gstreamer1-plugins-ximagesrc SUBDIR += gsynaptics SUBDIR += gtk-theme-switch2 SUBDIR += gtkchtheme SUBDIR += gtkterm2 SUBDIR += guake SUBDIR += gxkb SUBDIR += hhpc SUBDIR += hs-xmobar SUBDIR += hsetroot SUBDIR += i3blocks SUBDIR += i3lock SUBDIR += i3status SUBDIR += iceauth SUBDIR += ico SUBDIR += idesk SUBDIR += imwheel SUBDIR += innerspace SUBDIR += j4-dmenu-desktop SUBDIR += jgmenu SUBDIR += kanshi SUBDIR += kb2mb2 SUBDIR += kde-baseapps SUBDIR += kde5 SUBDIR += keybinder SUBDIR += keybinder-gtk3 SUBDIR += keyboardcast SUBDIR += keynav SUBDIR += kf5-frameworkintegration SUBDIR += kf5-frameworks SUBDIR += kf5-kactivities SUBDIR += kf5-kactivities-stats SUBDIR += kf5-kded SUBDIR += kf5-kdelibs4support SUBDIR += kf5-kglobalaccel SUBDIR += kf5-kinit SUBDIR += kf5-krunner SUBDIR += kf5-kwayland SUBDIR += kf5-kwindowsystem SUBDIR += kf5-plasma-framework SUBDIR += konsole SUBDIR += lemonbar SUBDIR += libICE SUBDIR += libSM SUBDIR += libX11 SUBDIR += libXScrnSaver SUBDIR += libXau SUBDIR += libXcm SUBDIR += libXcomposite SUBDIR += libXcursor SUBDIR += libXdamage SUBDIR += libXdmcp SUBDIR += libXext SUBDIR += libXfixes SUBDIR += libXi SUBDIR += libXinerama SUBDIR += libXpm SUBDIR += libXpresent SUBDIR += libXrandr SUBDIR += libXrender SUBDIR += libXres SUBDIR += libXtst SUBDIR += libXv SUBDIR += libXvMC SUBDIR += libXxf86dga SUBDIR += libXxf86vm SUBDIR += libdmx SUBDIR += libexo SUBDIR += libfakekey SUBDIR += libfm SUBDIR += libfm-extra SUBDIR += libfm-qt SUBDIR += libgnome SUBDIR += libgnome-reference SUBDIR += libgnomekbd SUBDIR += libgnomemm26 SUBDIR += libinput SUBDIR += libmatekbd SUBDIR += libsx SUBDIR += libsynaptics SUBDIR += libwacom SUBDIR += libxcb SUBDIR += libxdg-basedir SUBDIR += libxfce4menu SUBDIR += libxfce4util SUBDIR += libxkbcommon SUBDIR += libxkbfile SUBDIR += libxklavier SUBDIR += libxshmfence SUBDIR += lightdm SUBDIR += lightdm-gtk-greeter SUBDIR += lightdm-gtk-greeter-settings SUBDIR += lilyterm SUBDIR += linux-c7-libxkbcommon SUBDIR += linux-c7-pixman SUBDIR += linux-c7-xcb-util SUBDIR += linux-c7-xcb-util-image SUBDIR += linux-c7-xcb-util-keysyms SUBDIR += linux-c7-xorg-libs SUBDIR += linux-nvidia-libs SUBDIR += linux-nvidia-libs-304 SUBDIR += linux-nvidia-libs-340 SUBDIR += linux-nvidia-libs-390 SUBDIR += listres SUBDIR += lsw SUBDIR += luit SUBDIR += lumina SUBDIR += lumina-core SUBDIR += lumina-coreutils SUBDIR += lupe SUBDIR += lxde-meta SUBDIR += lxhotkey SUBDIR += lxmenu-data SUBDIR += lxpanel SUBDIR += lxqt-about SUBDIR += lxqt-globalkeys SUBDIR += lxqt-runner SUBDIR += lxrandr SUBDIR += ly SUBDIR += mate SUBDIR += mate-applets SUBDIR += mate-base SUBDIR += mate-desktop SUBDIR += mate-menus SUBDIR += mate-panel SUBDIR += mate-screensaver SUBDIR += mate-session-manager SUBDIR += mate-terminal SUBDIR += menu-cache SUBDIR += menulibre SUBDIR += metalock SUBDIR += mkcomposecache SUBDIR += mlterm SUBDIR += mons SUBDIR += mrxvt SUBDIR += mrxvt-devel SUBDIR += multi-aterm SUBDIR += mxico SUBDIR += nezd SUBDIR += numlockx SUBDIR += nvidia-driver SUBDIR += nvidia-driver-304 SUBDIR += nvidia-driver-340 SUBDIR += nvidia-driver-390 SUBDIR += nvidia-settings SUBDIR += nvidia-xconfig SUBDIR += nwg-launchers SUBDIR += nxcomp SUBDIR += p5-Clipboard SUBDIR += p5-X11-GUITest SUBDIR += p5-X11-IdleTime SUBDIR += p5-X11-Protocol SUBDIR += p5-X11-Protocol-Other SUBDIR += p5-X11-Resolution SUBDIR += p5-X11-XCB SUBDIR += p5-X11-Xlib SUBDIR += p5-XTerm-Conf SUBDIR += pcdm SUBDIR += perwindowlayoutd + SUBDIR += phosh SUBDIR += pipeglade SUBDIR += pixman SUBDIR += plank SUBDIR += plasma-wayland-protocols SUBDIR += plasma5-kactivitymanagerd SUBDIR += plasma5-kgamma5 SUBDIR += plasma5-kscreen SUBDIR += plasma5-kwayland-integration SUBDIR += plasma5-kwayland-server SUBDIR += plasma5-libkscreen SUBDIR += plasma5-plasma SUBDIR += plasma5-plasma-desktop SUBDIR += plasma5-plasma-integration SUBDIR += plasma5-plasma-workspace SUBDIR += polybar SUBDIR += printscreen SUBDIR += py-caffeine-ng SUBDIR += py-i3ipc SUBDIR += py-pyscreenshot SUBDIR += py-pyvirtualdisplay SUBDIR += py-qt5-opengl SUBDIR += py-xcffib SUBDIR += py-xdot SUBDIR += qimageblitz SUBDIR += qt5-qev SUBDIR += qt5-x11extras SUBDIR += qterminal SUBDIR += radare-cutter SUBDIR += rendercheck SUBDIR += rgb SUBDIR += rofi SUBDIR += rofi-calc SUBDIR += rofi-pass SUBDIR += roxterm SUBDIR += rsibreak SUBDIR += rubygem-gnome SUBDIR += rxvt-unicode SUBDIR += sakura SUBDIR += sbxkb SUBDIR += screen-message SUBDIR += scripts SUBDIR += sddm SUBDIR += sessreg SUBDIR += setlayout SUBDIR += setxkbmap SUBDIR += showkeys SUBDIR += simdock SUBDIR += simplestroke SUBDIR += slick-greeter SUBDIR += slim SUBDIR += slock SUBDIR += slop SUBDIR += slurp SUBDIR += smproxy SUBDIR += squeekboard SUBDIR += sselp SUBDIR += stalonetray SUBDIR += startup-notification SUBDIR += sterm SUBDIR += stjerm SUBDIR += swarp SUBDIR += swaybg SUBDIR += swayidle SUBDIR += swaylock SUBDIR += sxhkd SUBDIR += sxpc SUBDIR += tabbed SUBDIR += temperature.app SUBDIR += terminal.app SUBDIR += terminator SUBDIR += terminology SUBDIR += thinglaunch SUBDIR += thingylaunch SUBDIR += tilda SUBDIR += tint SUBDIR += trayer SUBDIR += tycoon SUBDIR += urxvt-font-size SUBDIR += urxvt-perls SUBDIR += vdesk SUBDIR += viewres SUBDIR += virglrenderer SUBDIR += virtboard SUBDIR += virtualgl SUBDIR += wallutils SUBDIR += waybar SUBDIR += wbar SUBDIR += wcm SUBDIR += wdisplays SUBDIR += wdm SUBDIR += wev SUBDIR += wf-shell SUBDIR += wl-clipboard SUBDIR += wlogout SUBDIR += wmappl SUBDIR += wmblob SUBDIR += wmbutton SUBDIR += wmcliphist SUBDIR += wmctrl SUBDIR += wmdrawer SUBDIR += wmmatrix SUBDIR += wmsystemtray SUBDIR += wmutils-core SUBDIR += wmutils-opt SUBDIR += wmxss SUBDIR += wob SUBDIR += wofi SUBDIR += workrave SUBDIR += wshowkeys SUBDIR += x11perf SUBDIR += x3270 SUBDIR += xantfarm SUBDIR += xapps SUBDIR += xascii SUBDIR += xauth SUBDIR += xautolock SUBDIR += xautomation SUBDIR += xbacklight SUBDIR += xballoon SUBDIR += xbanish SUBDIR += xbanner SUBDIR += xbiff SUBDIR += xbindkeys SUBDIR += xbitmaps SUBDIR += xbrightness SUBDIR += xcalc SUBDIR += xcalib SUBDIR += xcape SUBDIR += xcb SUBDIR += xcb-proto SUBDIR += xcb-util SUBDIR += xcb-util-cursor SUBDIR += xcb-util-errors SUBDIR += xcb-util-image SUBDIR += xcb-util-keysyms SUBDIR += xcb-util-renderutil SUBDIR += xcb-util-wm SUBDIR += xcb-util-xrm SUBDIR += xcbautolock SUBDIR += xclip SUBDIR += xclipboard SUBDIR += xcm SUBDIR += xcmd SUBDIR += xcmsdb SUBDIR += xcoloredit SUBDIR += xcolors SUBDIR += xconsole SUBDIR += xcursorgen SUBDIR += xcut SUBDIR += xditview SUBDIR += xdm SUBDIR += xdotool SUBDIR += xdpyinfo SUBDIR += xdriinfo SUBDIR += xdtm SUBDIR += xedit SUBDIR += xev SUBDIR += xeyes SUBDIR += xf86dga SUBDIR += xfce4-clipman-plugin SUBDIR += xfce4-conf SUBDIR += xfce4-dashboard SUBDIR += xfce4-embed-plugin SUBDIR += xfce4-goodies SUBDIR += xfce4-quicklauncher-plugin SUBDIR += xfce4-screensaver SUBDIR += xfce4-screenshooter-plugin SUBDIR += xfce4-taskmanager SUBDIR += xfce4-terminal SUBDIR += xfce4-verve-plugin SUBDIR += xfce4-whiskermenu-plugin SUBDIR += xfce4-wmdock-plugin SUBDIR += xfd SUBDIR += xfishtank SUBDIR += xforward SUBDIR += xgamma SUBDIR += xgc SUBDIR += xgrab SUBDIR += xhost SUBDIR += xidle SUBDIR += xinit SUBDIR += xinput SUBDIR += xkb-switch SUBDIR += xkbcomp SUBDIR += xkbctrl SUBDIR += xkbevd SUBDIR += xkbind SUBDIR += xkbprint SUBDIR += xkbset SUBDIR += xkbutils SUBDIR += xkeyboard-config SUBDIR += xkeycaps SUBDIR += xkeywrap SUBDIR += xkill SUBDIR += xload SUBDIR += xloadimage SUBDIR += xlockmore SUBDIR += xlogo SUBDIR += xlsatoms SUBDIR += xlsclients SUBDIR += xmag SUBDIR += xman SUBDIR += xmangekyou SUBDIR += xmascot SUBDIR += xmessage SUBDIR += xmh SUBDIR += xmodmap SUBDIR += xmon SUBDIR += xmore SUBDIR += xmotd SUBDIR += xmsg SUBDIR += xmx SUBDIR += xnee SUBDIR += xorg SUBDIR += xorg-apps SUBDIR += xorg-cf-files SUBDIR += xorg-docs SUBDIR += xorg-libraries SUBDIR += xorg-minimal SUBDIR += xorgproto SUBDIR += xpr SUBDIR += xpra SUBDIR += xprintidle SUBDIR += xprompt SUBDIR += xprop SUBDIR += xrandr SUBDIR += xrdb SUBDIR += xrefresh SUBDIR += xrestop SUBDIR += xrootconsole SUBDIR += xrsh SUBDIR += xrsi SUBDIR += xscope SUBDIR += xscreensaver SUBDIR += xscreensaver.app SUBDIR += xsel-conrad SUBDIR += xset SUBDIR += xsetroot SUBDIR += xsettingsd SUBDIR += xskyroot SUBDIR += xsm SUBDIR += xsnow SUBDIR += xstarroll SUBDIR += xstdcmap SUBDIR += xstroke SUBDIR += xtacy SUBDIR += xterm SUBDIR += xtermcontrol SUBDIR += xtermset SUBDIR += xtestpicture SUBDIR += xtitle SUBDIR += xtoolwait SUBDIR += xtrans SUBDIR += xtrlock SUBDIR += xtset SUBDIR += xvidtune SUBDIR += xvinfo SUBDIR += xvkbd SUBDIR += xvmcinfo SUBDIR += xvt SUBDIR += xwatchwin SUBDIR += xwd SUBDIR += xwininfo SUBDIR += xwinwrap SUBDIR += xwit SUBDIR += xwud SUBDIR += xxkb SUBDIR += xzoom SUBDIR += yad SUBDIR += yakuake SUBDIR += yalias SUBDIR += yeahconsole SUBDIR += yelp SUBDIR += zenity .include Index: head/x11/phosh/Makefile =================================================================== --- head/x11/phosh/Makefile (nonexistent) +++ head/x11/phosh/Makefile (revision 545083) @@ -0,0 +1,45 @@ +# $FreeBSD$ + +PORTNAME= phosh +DISTVERSIONPREFIX= v +DISTVERSION= 0.4.3 +CATEGORIES= x11 + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Pure Wayland shell prototype for mobile devices + +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= wayland-protocols>=1.12:graphics/wayland-protocols +LIB_DEPENDS= libfeedback-0.0.so:accessibility/feedbackd \ + libpulse-mainloop-glib.so:audio/pulseaudio \ + libwayland-client.so:graphics/wayland \ + libgcr-ui-3.so:security/gcr \ + libpolkit-agent-1.so:sysutils/polkit \ + libupower-glib.so:sysutils/upower \ + libhandy-0.0.so:x11-toolkits/libhandy +RUN_DEPENDS= phoc:x11-wm/phoc \ + gnome-session:x11/gnome-session + +USES= compiler:c11 gnome meson pkgconfig +USE_GITLAB= yes +USE_GNOME= cairo gdkpixbuf2 gnomedesktop3 +GL_SITE= https://source.puri.sm +GL_ACCOUNT= Librem5 +GL_COMMIT= 99d18088f1e44a19db870649559451e91adf204e +GL_TUPLE= https://gitlab.gnome.org:GNOME:libgnome-volume-control:ae1a34aafce7026b8c0f65a43c9192d756fe1057:gvc/subprojects/gvc +MESON_ARGS= -Dgvc:alsa=false +PLIST_FILES= bin/${PORTNAME} \ + bin/${PORTNAME}-osk-stub \ + libexec/${PORTNAME} \ + ${DATADIR}/phoc.ini \ + share/wayland-sessions/${PORTNAME}.desktop +GLIB_SCHEMAS= sm.puri.phosh.gschema.xml + +post-patch: + @${REINPLACE_CMD} -e 's/bash -l/sh -/' \ + -e 's,/etc,${PREFIX}&,' \ + ${WRKSRC}/data/phosh.in + +.include Property changes on: head/x11/phosh/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/phosh/distinfo =================================================================== --- head/x11/phosh/distinfo (nonexistent) +++ head/x11/phosh/distinfo (revision 545083) @@ -0,0 +1,5 @@ +TIMESTAMP = 1596442228 +SHA256 (Librem5-phosh-99d18088f1e44a19db870649559451e91adf204e_GL0.tar.gz) = 1bb107f432289594ca564839772cac3960d930ef1e281bdec442558632c40f5f +SIZE (Librem5-phosh-99d18088f1e44a19db870649559451e91adf204e_GL0.tar.gz) = 312123 +SHA256 (GNOME-libgnome-volume-control-ae1a34aafce7026b8c0f65a43c9192d756fe1057_GL0.tar.gz) = 780143bef70698e402b099f300f5c82bfbb38ef5c3b6d89b1efeb7a45a5d8dc1 +SIZE (GNOME-libgnome-volume-control-ae1a34aafce7026b8c0f65a43c9192d756fe1057_GL0.tar.gz) = 45245 Property changes on: head/x11/phosh/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/phosh/files/patch-glib-2.56 =================================================================== --- head/x11/phosh/files/patch-glib-2.56 (nonexistent) +++ head/x11/phosh/files/patch-glib-2.56 (revision 545083) @@ -0,0 +1,48 @@ +Drop after devel/glib20 is updated to 2.58 or later. + +meson.build:107:0: ERROR: Invalid version of dependency, need 'gio-2.0' ['>=2.58'] found '2.56.3'. + +../tools/dump-app-list.c:25:29: warning: implicit declaration of function 'G_SOURCE_FUNC' is invalid in C99 [-Wimplicit-function-declaration] + g_timeout_add_seconds (2, G_SOURCE_FUNC (g_main_loop_quit), loop); + ^ +ld: error: undefined symbol: G_SOURCE_FUNC +>>> referenced by dump-app-list.c +>>> tools/dump-app-list.p/dump-app-list.c.o:(main) + +--- meson.build.orig 2020-08-03 08:10:28 UTC ++++ meson.build +@@ -27,7 +27,7 @@ configure_file( + configuration: config_h, + ) + +-glib_ver = 'GLIB_VERSION_2_58' ++glib_ver = 'GLIB_VERSION_2_56' + + add_project_arguments([ + '-DHAVE_CONFIG_H', +@@ -104,9 +104,9 @@ gnome = import('gnome') + i18n = import('i18n') + + gcr_dep = dependency('gcr-3', version: '>= 3.7.5') +-gio_dep = dependency('gio-2.0', version: '>=2.58') +-gio_unix_dep = dependency('gio-unix-2.0', version: '>=2.58') +-glib_dep = dependency('glib-2.0', version: '>=2.58') ++gio_dep = dependency('gio-2.0', version: '>=2.56') ++gio_unix_dep = dependency('gio-unix-2.0', version: '>=2.56') ++glib_dep = dependency('glib-2.0', version: '>=2.56') + gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>=3.26') + gobject_dep = dependency('gobject-2.0', version: '>=2.50.0') + gtk_dep = dependency('gtk+-3.0', version: '>=3.22') +--- tools/dump-app-list.c.orig 2020-08-03 08:10:28 UTC ++++ tools/dump-app-list.c +@@ -10,6 +10,10 @@ + + #include + ++#if !GLIB_CHECK_VERSION(2, 58, 0) ++#define G_SOURCE_FUNC(f) ((GSourceFunc) (void (*)(void)) (f)) ++#endif ++ + int + main (int argc, char **argv) + { Property changes on: head/x11/phosh/files/patch-glib-2.56 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/phosh/files/patch-glib-types =================================================================== --- head/x11/phosh/files/patch-glib-types (nonexistent) +++ head/x11/phosh/files/patch-glib-types (revision 545083) @@ -0,0 +1,17 @@ +Don't use Linux-only types in otherwise portable code. + +../src/system-prompter.c:25:8: error: unknown type name 'ulong' +static ulong owner_id; + ^ + +--- src/system-prompter.c.orig 2020-08-03 08:10:28 UTC ++++ src/system-prompter.c +@@ -22,7 +22,7 @@ + * wide modal #PhoshSystemPrompt dialogs + */ + static GcrSystemPrompter *_prompter; +-static ulong owner_id; ++static gulong owner_id; + static gboolean registered_prompter; + static gboolean acquired_prompter; + Property changes on: head/x11/phosh/files/patch-glib-types ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/phosh/files/patch-no-libnm =================================================================== --- head/x11/phosh/files/patch-no-libnm (nonexistent) +++ head/x11/phosh/files/patch-no-libnm (revision 545083) @@ -0,0 +1,143 @@ +NetworkManager is Linux-only. FreeBSD has many alternatives but none +implements libnm-compatible API required by Phosh and GNOME. + +meson.build:134:0: ERROR: Dependency "libnm" not found, tried pkgconfig + +--- meson.build.orig 2020-08-03 08:10:28 UTC ++++ meson.build +@@ -131,9 +131,9 @@ libhandy_dep = dependency('libhandy-0.0', + fallback: ['libhandy', 'libhandy_dep'], + default_options: ['introspection=disabled'] + ) +-libnm_dep = dependency('libnm', version: '>= 1.14') ++libnm_dep = dependency('libnm', version: '>= 1.14', required: false) + libpolkit_agent_dep = dependency('polkit-agent-1', version: '>= 0.105') +-network_agent_dep = dependency('libsecret-1') ++network_agent_dep = dependency('libsecret-1', required: false) + upower_glib_dep = dependency('upower-glib', version: '>=0.99.1') + wayland_client_dep = dependency('wayland-client', version: '>=1.14') + wayland_protos_dep = dependency('wayland-protocols', version: '>=1.12') +--- src/meson.build.orig 2020-08-03 08:10:28 UTC ++++ src/meson.build +@@ -50,8 +50,6 @@ libphosh_tool_sources = [ + 'app-list-model.h', + 'background.c', + 'background.h', +- 'connectivity-info.c', +- 'connectivity-info.h', + 'favorite-list-model.c', + 'favorite-list-model.h', + 'feedback-manager.c', +@@ -92,8 +90,6 @@ libphosh_sources = [ + 'bt-info.h', + 'bt-manager.c', + 'bt-manager.h', +- 'contrib/shell-network-agent.c', +- 'contrib/shell-network-agent.h', + 'fader.c', + 'fader.h', + 'feedbackinfo.c', +@@ -110,8 +106,6 @@ libphosh_sources = [ + 'lockscreen.h', + 'monitor-manager.c', + 'monitor-manager.h', +- 'network-auth-prompt.c', +- 'network-auth-prompt.h', + 'osk-manager.c', + 'osk-manager.h', + 'panel.c', +@@ -144,10 +138,6 @@ libphosh_sources = [ + 'toplevel-thumbnail.h', + 'toplevel.c', + 'toplevel.h', +- 'wifiinfo.c', +- 'wifiinfo.h', +- 'wifimanager.c', +- 'wifimanager.h', + 'wwaninfo.c', + 'wwaninfo.h', + phosh_settings_sources, +--- src/panel.c.orig 2020-08-03 08:10:28 UTC ++++ src/panel.c +@@ -13,7 +13,6 @@ + #include "config.h" + + #include "bt-info.h" +-#include "connectivity-info.h" + #include "panel.h" + #include "shell.h" + #include "session.h" +@@ -371,7 +370,6 @@ phosh_panel_class_init (PhoshPanelClass *klass) + NULL, G_TYPE_NONE, 0); + + g_type_ensure (PHOSH_TYPE_BT_INFO); +- g_type_ensure (PHOSH_TYPE_CONNECTIVITY_INFO); + g_type_ensure (PHOSH_TYPE_SETTINGS); + + gtk_widget_class_set_template_from_resource (widget_class, +--- src/shell.c.orig 2020-08-03 08:10:28 UTC ++++ src/shell.c +@@ -43,7 +43,6 @@ + #include "session.h" + #include "system-prompter.h" + #include "util.h" +-#include "wifiinfo.h" + #include "wwaninfo.h" + #include "bt-manager.h" + +@@ -83,7 +82,6 @@ typedef struct + PhoshIdleManager *idle_manager; + PhoshOskManager *osk_manager; + PhoshToplevelManager *toplevel_manager; +- PhoshWifiManager *wifi_manager; + PhoshPolkitAuthAgent *polkit_auth_agent; + PhoshScreenSaverManager *screen_saver_manager; + PhoshNotifyManager *notify_manager; +@@ -332,7 +330,6 @@ phosh_shell_dispose (GObject *object) + g_clear_object (&priv->lockscreen_manager); + g_clear_object (&priv->monitor_manager); + g_clear_object (&priv->toplevel_manager); +- g_clear_object (&priv->wifi_manager); + g_clear_object (&priv->osk_manager); + g_clear_object (&priv->polkit_auth_agent); + g_clear_object (&priv->background_manager); +@@ -477,7 +474,6 @@ static void + type_setup (void) + { + phosh_battery_info_get_type(); +- phosh_wifi_info_get_type(); + phosh_wwan_info_get_type(); + } + +@@ -767,21 +763,6 @@ phosh_shell_get_monitor_manager (PhoshShell *self) + return priv->monitor_manager; + } + +- +-PhoshWifiManager * +-phosh_shell_get_wifi_manager (PhoshShell *self) +-{ +- PhoshShellPrivate *priv; +- +- g_return_val_if_fail (PHOSH_IS_SHELL (self), NULL); +- priv = phosh_shell_get_instance_private (self); +- +- if (!priv->wifi_manager) +- priv->wifi_manager = phosh_wifi_manager_new (); +- +- g_return_val_if_fail (PHOSH_IS_WIFI_MANAGER (priv->wifi_manager), NULL); +- return priv->wifi_manager; +-} + + PhoshBtManager * + phosh_shell_get_bt_manager (PhoshShell *self) +--- tests/meson.build.orig 2020-08-03 08:10:28 UTC ++++ tests/meson.build +@@ -57,7 +57,6 @@ tests = [ + 'activity', + 'app-grid-button', + 'app-list-model', +- 'connectivity-info', + 'favourite-model', + 'media-player', + 'notification', Property changes on: head/x11/phosh/files/patch-no-libnm ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/phosh/pkg-descr =================================================================== --- head/x11/phosh/pkg-descr (nonexistent) +++ head/x11/phosh/pkg-descr (revision 545083) @@ -0,0 +1,13 @@ +Phosh aims to be a Wayland shell for mobile phones. Currently, only +useful for developers. + +Features: +- a lockscreen +- brightness control and nighlight +- the gcr system-prompter interface +- acting as a polkit auth agent +- enough of org.gnome.Mutter.DisplayConfig to make gnome-settings-daemon happy +- a homebutton that toggles a simple favorites menu +- status icons for battery, wwan and wifi (WARNING: network is N/A on FreeBSD) + +WWW: https://source.puri.sm/Librem5/phosh Property changes on: head/x11/phosh/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property