Copy over GTK 3 settings by default (LP: #2047705).

This reverts commit 8837be7937.

debian/changelog

@@ -1,3 +1,21 @@
+lxqt-session (1.4.0-0ubuntu3~ppa22.04.1) jammy; urgency=medium
+
+  * Backport to Jammy.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 01 Jan 2024 14:02:49 -0600
+
+lxqt-session (1.4.0-0ubuntu3) noble; urgency=medium
+
+  * Copy over GTK 3 settings by default (LP: #2047705).
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 29 Dec 2023 12:36:24 -0600
+
+lxqt-session (1.4.0-0ubuntu2) noble; urgency=medium
+
+  * Add an upstream patch polishing the autostart UX.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 22 Dec 2023 16:32:05 -0600
+
 lxqt-session (1.4.0-0ubuntu1) noble; urgency=medium
 
   * New upstream release.

debian/control

@@ -9,7 +9,7 @@ Priority: optional
 Build-Depends: debhelper-compat (= 13),
                libkf5windowsystem-dev,
                liblxqt1-dev (>= 1.4.0),
-               libproc2-dev,
+               libprocps-dev,
                libqt5svg5-dev,
                libqt5x11extras5-dev,
                libudev-dev [linux-any],

debian/patches/autostart-ux-polish.patch

@@ -0,0 +1,55 @@
+Description: lxqt-config-session/autostart: More strict user inputs
+ Makes name and command mandatory when adding or editing a autostart an
+ application. Check for already existing files when editing.
+ .
+ TODO: Add and Edit functions are almost indentical. Candidates to some
+ refactoring.
+Author: Luís Pereira <luis.artur.pereira@gmail.com>
+Origin: upstream
+Bug: https://github.com/lxqt/lxqt-session/issues/486
+Applied-Upstream: 35acc5e7fe64ab78616968a5b73b150fdf2f002a
+Last-Update: 2023-12-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lxqt-config-session/autostartpage.cpp
++++ b/lxqt-config-session/autostartpage.cpp
+@@ -133,6 +133,11 @@ void AutoStartPage::addButton_clicked()
+     while (!success && edit.exec() == QDialog::Accepted)
+     {
+         QModelIndex index = ui->autoStartView->selectionModel()->currentIndex();
++        if (edit.name().isEmpty() || edit.command().isEmpty() )
++        {
++            QMessageBox::critical(this, tr("Error"), tr("Please provide Name and Command"));
++            continue;
++        }
+         XdgDesktopFile file(XdgDesktopFile::ApplicationType, edit.name(), edit.command());
+         if (edit.needTray())
+             file.setValue(QL1S("X-LXQt-Need-Tray"), true);
+@@ -148,8 +153,14 @@ void AutoStartPage::editButton_clicked()
+     QModelIndex index = ui->autoStartView->selectionModel()->currentIndex();
+     XdgDesktopFile file = mXdgAutoStartModel->desktopFile(index);
+     AutoStartEdit edit(file.name(), file.value(QL1S("Exec")).toString(), file.contains(QL1S("X-LXQt-Need-Tray")));
+-    if (edit.exec() == QDialog::Accepted)
++    bool success = false;
++    while (!success && edit.exec() == QDialog::Accepted)
+     {
++        if (edit.name().isEmpty() || edit.command().isEmpty() )
++        {
++            QMessageBox::critical(this, tr("Error"), tr("Please provide Name and Command"));
++            continue;
++        }
+         file.setLocalizedValue(QL1S("Name"), edit.name());
+         file.setValue(QL1S("Exec"), edit.command());
+         if (edit.needTray())
+@@ -157,7 +168,10 @@ void AutoStartPage::editButton_clicked()
+         else
+             file.removeEntry(QL1S("X-LXQt-Need-Tray"));
+ 
+-        mXdgAutoStartModel->setEntry(index, file, true);
++        if (mXdgAutoStartModel->setEntry(index, file, true))
++            success = true;
++        else
++            QMessageBox::critical(this, tr("Error"), tr("File '%1' already exists!").arg(file.fileName()));
+     }
+ }
+ 

debian/patches/gtk-3-configuration-copy.patch

@@ -0,0 +1,34 @@
+Description: Copy over GTK 3 settings from XDG_CONFIG_DIRS
+ This is a workaround for GTK 3 settings not being applied by default from XDG.
+ Ideally, all desktop environments would do this, and it would be fixed in GTK itself.
+Author: Simon Quigley <tsimonq2@ubuntu.com>
+Origin: vendor
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gtk+3.0/+bug/2047705
+Forwarded: no
+Last-Update: 2023-12-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/startlxqt.in
++++ b/startlxqt.in
+@@ -32,6 +32,21 @@ else
+         fi
+     done
+ fi
++# Handle GTK 3 configuration files
++echo "$XDG_CONFIG_DIRS" | tr ':' '\n' | while read -r dir; do
++    dir_path="$dir/gtk-3.0/"
++    if [ -d "$dir_path" ]; then
++        mkdir -p "$HOME/.config/gtk-3.0"
++        for file in "$dir_path"*; do
++            if [ -f "$file" ]; then
++                target_file="$HOME/.config/gtk-3.0/$(basename "$file")"
++                if [ ! -f "$target_file" ]; then
++                    cp "$file" "$target_file"
++                fi
++            fi
++        done
++    fi
++done
+ 
+ if [ -z "$XDG_CACHE_HOME" ]; then
+     export XDG_CACHE_HOME="$HOME/.cache"

debian/patches/series

@@ -1 +1,3 @@
 ensure-necessary-paths-are-pulled-from.patch
+autostart-ux-polish.patch
+gtk-3-configuration-copy.patch