jsm222

diff --git a/x11-fm/Makefile b/x11-fm/Makefile
index 3fe702533..48fcbacb7 100644
--- a/x11-fm/Makefile
+++ b/x11-fm/Makefile
@@ -9,6 +9,7 @@
     SUBDIR += fsv2
     SUBDIR += gentoo
     SUBDIR += gprename
+    SUBDIR += hellodesktop-filer
     SUBDIR += konqueror

jsm222

diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 6664746fb..121e0e806 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -41,6 +41,7 @@
     SUBDIR += fvwm3
     SUBDIR += gamescope
     SUBDIR += gcompmgr
+    SUBDIR += hellodesktop-dock
     SUBDIR += herbstluftwm

jsm222

diff --git a/x11-themes/Makefile b/x11-themes/Makefile
index d00d324ef..df3020048 100644
--- a/x11-themes/Makefile
+++ b/x11-themes/Makefile
@@ -82,6 +82,7 @@
     SUBDIR += gtk-xfce-engine
     SUBDIR += gtk3-oxygen-engine
     SUBDIR += gtk3-unico-engine
+    SUBDIR += hellodesktop-icons
     SUBDIR += icewm-extra-themes

jsm222

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 9151f2c32..1776b9214 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -487,6 +487,7 @@
     SUBDIR += hdrecover
     SUBDIR += healthd
     SUBDIR += heirloom
+    SUBDIR += hellodesktop-qtplugin
     SUBDIR += helm

jsm222

diff --git a/override.cpp b/override.cpp
index a5a38e3..119a2a9 100644
--- a/override.cpp
+++ b/override.cpp
@@ -11,57 +11,111 @@
 #include <cstdlib>
 
 #define _GNU_SOURCE
-#include <dlfcn.h>
 

jsm222

dbus-send --session --print-reply --type="method_call" --dest=com.canonical.AppMenu.Registrar /com/canonical/AppMenu/Registrar com.canonical.AppMenu.Registrar.GetMenuForWindow uint32:<XWINDI>
export QT_LOGGING_RULES=qt.qpa.menu.debug=true

Retrive a registered menu:
--dest and menu number are variable.
dbus-send --session --print-reply --dest=:1.68 /com/canonical/menu/4000002 com.canonical.dbusmenu.GetLayout int32:0 int32:100 array:string:

For gtk menus caugth by /usr/local/bin/gmenudbusmenuproxy 

dbus-send --session --print-reply --dest=org.kde.plasma.gmenu_dbusmenu_proxy /MenuBar/3 com.canonical.dbusmenu.GetLayout int32:0 int32:100 array:string:

jsm222

--- src/appmenu/menuimporter.cpp.orig	2021-06-20 16:59:06 UTC
+++ src/appmenu/menuimporter.cpp
@@ -27,7 +27,7 @@
 #include "menuimporter.h"
 #include "menuimporteradaptor.h"
 #include "dbusmenutypes_p.h"
-
+#include <QX11Info>
 #include <QDBusMessage>
 #include <QDBusObjectPath>

jsm222

diff --git a/src/appmenu/appmenumodel.cpp b/src/appmenu/appmenumodel.cpp
index 1ea190f..e65b716 100644
--- a/src/appmenu/appmenumodel.cpp
+++ b/src/appmenu/appmenumodel.cpp
@@ -34,6 +34,7 @@
 #include <QDBusServiceWatcher>
 #include <QGuiApplication>
 
+#include <QTimer>
 #include <QDebug>

jsm222

diff --git a/src/appmenu/appmenumodel.cpp b/src/appmenu/appmenumodel.cpp
index 1ea190f..7aca717 100644
--- a/src/appmenu/appmenumodel.cpp
+++ b/src/appmenu/appmenumodel.cpp
@@ -544,6 +544,7 @@ void AppMenuModel::updateApplicationMenu(const QString &serviceName, const QStri
                         const QModelIndex modelIdx = index(actionIdx, 0);
                         emit dataChanged(modelIdx, modelIdx);
                     }
+		    emit modelNeedsUpdate();
                 }

jsm222

--- xf86drm.c.orig	2021-12-02 07:16:12 UTC
+++ xf86drm.c
@@ -3572,8 +3572,14 @@ static int drmParseSubsystemType(int maj, int min)
             return DRM_BUS_VIRTIO;
      }
     return subsystem_type;
-#elif defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
+#elif defined(__OpenBSD__) || defined(__DragonFly__)
+    
     return DRM_BUS_PCI;