Use openbox-session instead of openbox to pick up autostart config

4 files changed, 24 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9ff8bf0d7600..071f8453161e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,13 +20,15 @@ pkgbase = pantheon-lite
 	source = pantheon-openbox.session
 	source = picom-dbus.desktop
 	source = picom-inverter
+	source = openbox-session.desktop
 	source = rc.xml
 	source = menu.xml
 	source = autostart
 	sha512sums = 1f950c641343e766cdd5b222dcac8f596e197fd5a9e3659a2bfce9da7020cf8575b0a64b9b7a0d810054303f03bb65f095222297682a5419eb6581517eb36e81
-	sha512sums = d7fdf807af0452c35116a053e1ea858a3f38a0e5bf9f83efb567db7d75eb42307dbb63f8eb307cddc501dcfa90e9f287648ef29279dc8b56e5d3c212075ae9a2
+	sha512sums = 452248551571ab5de2cce1e1220a2f9593a8d145b341ef6eab466be8b6396f0fbf312952b6ad0028934fc6ad4d1bf4213c8e222635aa47e39c7171f252ed7eb1
 	sha512sums = bff6d45fc78471ed9312d7be6381b541fa9a93adedef58f6ce7e09c2740e07c2a3fcf076dcaf25dd480a9164764933ba7850c7332e173acac161f36597d2786d
 	sha512sums = 3f1e515717bca482f4250645845baf73fadee81219684a6f3c5490f1cce48c129c5e0a32df55f26b556298e41545eca4b7d4bdea96556ca42380ff6d79acafbb
+	sha512sums = 79d4c9f13fde13e31dbacd9f93de66278f35932367e32493d39cb99475ae638f706701e743f3796df4ac36913c91424170fb2053bd55036af0a23764d234b22b
 	sha512sums = d93a0d7ddf70ee10d14b7f1e46257fb432cbfd9fcce7ab3b6bc3443876e0dad6453e0bcda3cf148e0dab47ce5d1d79ae22ef2921bbde46ff7f555a25a1e7bbae
 	sha512sums = 809ba5d0637a0ffbd0506b1b5d7e0500d5e53f06aae27d8180202c4d89d86d43661aac1dd78a3ecc5395385358c61da0b7e82857e41ab2e9be8dc6b56ba81dce
 	sha512sums = 01070c3553605e0148cfe67b4f02401c8b8d43084f785f141ccf3735d9a0d56c856c286693f535f3635ce68fb29ea625b9f302fb9c33402a8f7f6a3b2e359244
diff --git a/PKGBUILD b/PKGBUILD
index 3f2207939d12..0488ab7d8849 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,11 +19,13 @@ optdepends=("obconf: openbox configuration utility"
             "dbus: set window color inversion with picom-inverter")
 source=(pantheon-openbox.{desktop,session} 
         picom-{dbus.desktop,inverter}
+        openbox-session.desktop
         {rc,menu}.xml autostart)
 sha512sums=('1f950c641343e766cdd5b222dcac8f596e197fd5a9e3659a2bfce9da7020cf8575b0a64b9b7a0d810054303f03bb65f095222297682a5419eb6581517eb36e81'
-            'd7fdf807af0452c35116a053e1ea858a3f38a0e5bf9f83efb567db7d75eb42307dbb63f8eb307cddc501dcfa90e9f287648ef29279dc8b56e5d3c212075ae9a2'
+            '452248551571ab5de2cce1e1220a2f9593a8d145b341ef6eab466be8b6396f0fbf312952b6ad0028934fc6ad4d1bf4213c8e222635aa47e39c7171f252ed7eb1'
             'bff6d45fc78471ed9312d7be6381b541fa9a93adedef58f6ce7e09c2740e07c2a3fcf076dcaf25dd480a9164764933ba7850c7332e173acac161f36597d2786d'
             '3f1e515717bca482f4250645845baf73fadee81219684a6f3c5490f1cce48c129c5e0a32df55f26b556298e41545eca4b7d4bdea96556ca42380ff6d79acafbb'
+            '79d4c9f13fde13e31dbacd9f93de66278f35932367e32493d39cb99475ae638f706701e743f3796df4ac36913c91424170fb2053bd55036af0a23764d234b22b'
             'd93a0d7ddf70ee10d14b7f1e46257fb432cbfd9fcce7ab3b6bc3443876e0dad6453e0bcda3cf148e0dab47ce5d1d79ae22ef2921bbde46ff7f555a25a1e7bbae'
             '809ba5d0637a0ffbd0506b1b5d7e0500d5e53f06aae27d8180202c4d89d86d43661aac1dd78a3ecc5395385358c61da0b7e82857e41ab2e9be8dc6b56ba81dce'
             '01070c3553605e0148cfe67b4f02401c8b8d43084f785f141ccf3735d9a0d56c856c286693f535f3635ce68fb29ea625b9f302fb9c33402a8f7f6a3b2e359244')
@@ -33,4 +35,5 @@ package() {
   install -Dm644 {,"${pkgdir}"/usr/share/gnome-session/sessions/}pantheon-openbox.session
   install -Dm644 {,"${pkgdir}"/usr/share/applications/}picom-dbus.desktop
   install -Dm755 {,"${pkgdir}"/usr/bin/}picom-inverter
+  install -Dm644 {,"${pkgdir}"/usr/share/applications/}openbox-session.desktop
 }
diff --git a/openbox-session.desktop b/openbox-session.desktop
new file mode 100644
index 000000000000..eb5e9143a838
--- /dev/null
+++ b/openbox-session.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Type=Application
+Name=Openbox-session
+Comment=Initiate openbox without a session manager.
+Exec=openbox-session
+Icon=openbox
+NoDisplay=true
+# name we put on the WM spec check window
+X-GNOME-WMName=Openbox
+# gnome-session autostart
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+# Ubuntu stuff
+X-Ubuntu-Gettext-Domain=openbox
+# back compat
+X-GNOME-Autostart-Notify=true
diff --git a/pantheon-openbox.session b/pantheon-openbox.session
index 67cc898ffa10..cf6501a727f3 100644
--- a/pantheon-openbox.session
+++ b/pantheon-openbox.session
@@ -1,5 +1,5 @@
 [GNOME Session]
 Name=Pantheon
-RequiredComponents=openbox;io.elementary.cerbere;
+RequiredComponents=openbox-session;io.elementary.cerbere;
 FallbackSession=openbox
 DesktopNames=Pantheon