From 08bb8398e0d218daaefdfe95c44940e370802508 Mon Sep 17 00:00:00 2001
From: lukefromdc <lukefromdc@hushmail.com>
Date: Tue, 11 Jul 2023 21:28:01 -0400
Subject: Allow building all applets in or out of process

*Use --enable-in-process selector for in-process builds

*Accessx-status: mark as incompatable with wayland

*Accessx-status: Fix in-process runtime warning

*Stickynote, Geyes: style fixes
---
 drivemount/data/Makefile.am                        | 37 ++++++++++++++++------
 ...riveMountApplet.mate-panel-applet.desktop.in.in |  2 +-
 ...panel.applet.DriveMountAppletFactory.service.in |  3 ++
 3 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in

(limited to 'drivemount/data')

diff --git a/drivemount/data/Makefile.am b/drivemount/data/Makefile.am
index 642baf0d..5c7205a7 100644
--- a/drivemount/data/Makefile.am
+++ b/drivemount/data/Makefile.am
@@ -1,36 +1,55 @@
 NULL =
 
-APPLET_LOCATION = $(libdir)/mate-applets/libmate-drivemount-applet.so
+applet_in_files = org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in
+service_in_files = org.mate.panel.applet.DriveMountAppletFactory.service.in
+gschema_in_files = org.mate.drivemount.gschema.xml.in
+
+if ENABLE_IN_PROCESS
+APPLET_LOCATION = $(pkglibdir)/libmate-drivemount-applet.so
+else !ENABLE_IN_PROCESS
+APPLET_LOCATION = $(libexecdir)/mate-drivemount-applet
+endif !ENABLE_IN_PROCESS
 
-drivemount_gschema_in_files = org.mate.drivemount.gschema.xml.in
-gsettings_SCHEMAS = $(drivemount_gschema_in_files:.xml.in=.xml)
+gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in
 applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
             -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
+            -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
             -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
             $< > $@
 
 $(applet_DATA): $(applet_in_files) Makefile
 	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
+if !ENABLE_IN_PROCESS
+servicedir = $(datadir)/dbus-1/services
+service_DATA = $(service_in_files:.service.in=.service)
+
+$(service_DATA): $(service_in_files) Makefile
+	$(AM_V_GEN)sed \
+		-e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
+		$< > $@
+endif !ENABLE_IN_PROCESS
+
 CLEANFILES =				\
 	$(applet_DATA)			\
 	$(applet_in_files)		\
+	$(service_DATA)			\
 	$(gsettings_SCHEMAS)		\
 	*.gschema.valid			\
 	$(NULL)
 
-EXTRA_DIST =				\
-	$(applet_in_files:=.in)		\
-	$(drivemount_gschema_in_files)	\
-	drivemount-applet-menu.xml	\
-	drivemount-resources.gresource.xml \
+EXTRA_DIST =					\
+	$(applet_in_files:=.in)			\
+	$(gschema_in_files)			\
+	$(service_in_files)			\
+	drivemount-applet-menu.xml		\
+	drivemount-resources.gresource.xml	\
 	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in b/drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
index 852b7678..01e12296 100644
--- a/drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
+++ b/drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
@@ -1,7 +1,7 @@
 [Applet Factory]
 Id=DriveMountAppletFactory
 Location=@APPLET_LOCATION@
-InProcess=true
+InProcess=@APPLET_IN_PROCESS@
 Name=Drive Mount Applet Factory
 Description=Factory for drive mount applet
 
diff --git a/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in b/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in
new file mode 100644
index 00000000..8034ae4d
--- /dev/null
+++ b/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.mate.panel.applet.DriveMountAppletFactory
+Exec=@APPLET_LOCATION@
-- 
cgit v1.2.1