Compare commits

..

8 Commits

10
debian/changelog vendored

@ -1,8 +1,12 @@
lxqt-panel (1.4.0-0ubuntu2~ppa23.10.1) mantic; urgency=medium lxqt-panel (2.0.1-0ubuntu1) oracular; urgency=medium
* Backport to Mantic. * New upstream release.
* Update copyright file.
* Bump Standards-Version to 4.7.0, no changes necessary.
* Dropped trim-custom-commands-prevent-crash.patch, applied upstream.
* Adjust build dependencies.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 22 Dec 2023 16:44:56 -0600 -- Aaron Rainbolt <arraybolt3@ubuntu.com> Thu, 15 Aug 2024 16:25:54 -0500
lxqt-panel (1.4.0-0ubuntu2) noble; urgency=medium lxqt-panel (1.4.0-0ubuntu2) noble; urgency=medium

26
debian/control vendored

@ -7,21 +7,21 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
Section: x11 Section: x11
Priority: optional Priority: optional
Build-Depends: debhelper-compat (= 13), Build-Depends: debhelper-compat (= 13),
layer-shell-qt,
libasound2-dev, libasound2-dev,
libdbusmenu-qt5-dev, libdbusmenu-lxqt0-dev,
libglib2.0-dev, libglib2.0-dev,
libicu-dev, libicu-dev,
libkf5solid-dev, libkf6solid-dev,
libkf5windowsystem-dev, libkf6windowsystem-dev,
liblxqt-globalkeys-ui1-dev (>= 1.4.0), liblayershellqtinterface-dev,
liblxqt-globalkeys1-dev (>= 1.4.0), liblxqt-globalkeys-ui2-dev (>= 2.0.0),
liblxqt1-dev (>= 1.4.0), liblxqt-globalkeys2-dev (>= 2.0.0),
liblxqt2-dev (>= 2.0.0),
libpulse-dev, libpulse-dev,
libqt5svg5-dev,
libqt5x11extras5-dev,
libsensors-dev [!hurd-any], libsensors-dev [!hurd-any],
libstatgrab-dev [linux-any], libstatgrab-dev [linux-any],
libsysstat-qt5-0-dev (>= 0.4.5), libsysstat-qt6-1-dev (>= 1.0.0),
libx11-dev, libx11-dev,
libxcb-composite0-dev, libxcb-composite0-dev,
libxcb-damage0-dev, libxcb-damage0-dev,
@ -36,8 +36,10 @@ Build-Depends: debhelper-compat (= 13),
libxkbcommon-x11-dev, libxkbcommon-x11-dev,
libxrender-dev, libxrender-dev,
libxtst-dev, libxtst-dev,
lxqt-menu-data (>= 1.4.0) lxqt-menu-data (>= 2.0.0),
Standards-Version: 4.6.2 qt6-svg-dev,
qt6-wayland-dev
Standards-Version: 4.7.0
Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-panel-packaging Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-panel-packaging
Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-panel-packaging.git Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-panel-packaging.git
XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-panel XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-panel
@ -67,7 +69,7 @@ Package: lxqt-panel-l10n
Architecture: all Architecture: all
Multi-Arch: foreign Multi-Arch: foreign
Section: localization Section: localization
Depends: qttranslations5-l10n, ${misc:Depends} Depends: qt6-translations-l10n, ${misc:Depends}
Description: Language package for lxqt-panel Description: Language package for lxqt-panel
The l10n files for lxqt-panel. The l10n files for lxqt-panel.
. .

4
debian/copyright vendored

@ -4,7 +4,7 @@ Source: https://github.com/lxqt/lxqt-panel
Files: * Files: *
Copyright: 2010-2013 Razor team Copyright: 2010-2013 Razor team
2012-2023 LXQt team 2012-2024 LXQt team
License: LGPL-2.1+ License: LGPL-2.1+
Files: panel/lxqtpanelapplication_p.h Files: panel/lxqtpanelapplication_p.h
@ -21,7 +21,7 @@ Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
2020-2021 Raman Sarda <theloudspeaker@lubuntu.me> 2020-2021 Raman Sarda <theloudspeaker@lubuntu.me>
2021 apt-ghetto <apt-ghetto@protonmail.com> 2021 apt-ghetto <apt-ghetto@protonmail.com>
2018-2023 Simon Quigley <tsimonq2@ubuntu.com> 2018-2023 Simon Quigley <tsimonq2@ubuntu.com>
2023 Aaron Rainbolt <arraybolt3@gmail.com> 2023-2024 Aaron Rainbolt <arraybolt3@gmail.com>
License: LGPL-2.1+ License: LGPL-2.1+
License: LGPL-2.1+ License: LGPL-2.1+

@ -1 +0,0 @@
trim-custom-commands-prevent-crash.patch

@ -1,69 +0,0 @@
Description: LXQtCustomCommand: trim command to remove spaces
This fixes crash when command is made of only whitespace characters.
It's not detected as empty and upon argument split, it tries to access
first element of an empty list.
.
Also trim when saving settings in LXQtCustomCommandConfiguration
so placeholder text shows up on next run
Author: Filippo Gentile <42845724+gfgit@users.noreply.github.com>
Origin: upstream, https://github.com/lxqt/lxqt-panel/pull/1964
Applied-Upstream: bd637abafc9e8e9c7727a89e5d86e0f07f213c23
Last-Update: 2023-12-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/plugin-customcommand/lxqtcustomcommand.cpp
+++ b/plugin-customcommand/lxqtcustomcommand.cpp
@@ -109,7 +109,7 @@ void LXQtCustomCommand::settingsChanged(
mAutoRotate = settings()->value(QStringLiteral("autoRotate"), true).toBool();
mFont = settings()->value(QStringLiteral("font"), QString()).toString(); // the default font should be empty
- mCommand = settings()->value(QStringLiteral("command"), QStringLiteral("echo Configure...")).toString();
+ mCommand = settings()->value(QStringLiteral("command"), QStringLiteral("echo Configure...")).toString().trimmed();
mRunWithBash = settings()->value(QStringLiteral("runWithBash"), true).toBool();
mOutputImage = settings()->value(QStringLiteral("outputImage"), false).toBool();
mRepeat = settings()->value(QStringLiteral("repeat"), true).toBool();
@@ -118,9 +118,9 @@ void LXQtCustomCommand::settingsChanged(
mIcon = settings()->value(QStringLiteral("icon"), QString()).toString();
mText = settings()->value(QStringLiteral("text"), QStringLiteral("%1")).toString();
mMaxWidth = settings()->value(QStringLiteral("maxWidth"), 200).toInt();
- mClick = settings()->value(QStringLiteral("click"), QString()).toString();
- mWheelUp = settings()->value(QStringLiteral("wheelUp"), QString()).toString();
- mWheelDown = settings()->value(QStringLiteral("wheelDown"), QString()).toString();
+ mClick = settings()->value(QStringLiteral("click"), QString()).toString().trimmed();
+ mWheelUp = settings()->value(QStringLiteral("wheelUp"), QString()).toString().trimmed();
+ mWheelDown = settings()->value(QStringLiteral("wheelDown"), QString()).toString().trimmed();
if (oldFont != mFont) {
QFont newFont;
--- a/plugin-customcommand/lxqtcustomcommandconfiguration.cpp
+++ b/plugin-customcommand/lxqtcustomcommandconfiguration.cpp
@@ -108,7 +108,7 @@ void LXQtCustomCommandConfiguration::fon
void LXQtCustomCommandConfiguration::commandPlainTextEditChanged()
{
if (!mLockSettingChanges)
- settings().setValue(QStringLiteral("command"), ui->commandPlainTextEdit->toPlainText());
+ settings().setValue(QStringLiteral("command"), ui->commandPlainTextEdit->toPlainText().trimmed());
}
void LXQtCustomCommandConfiguration::runWithBashCheckBoxChanged(bool runWithBash)
@@ -163,17 +163,17 @@ void LXQtCustomCommandConfiguration::max
void LXQtCustomCommandConfiguration::clickLineEditChanged(QString click)
{
if (!mLockSettingChanges)
- settings().setValue(QStringLiteral("click"), click);
+ settings().setValue(QStringLiteral("click"), click.trimmed());
}
void LXQtCustomCommandConfiguration::wheelUpLineEditChanged(QString wheelUp)
{
if (!mLockSettingChanges)
- settings().setValue(QStringLiteral("wheelUp"), wheelUp);
+ settings().setValue(QStringLiteral("wheelUp"), wheelUp.trimmed());
}
void LXQtCustomCommandConfiguration::wheelDownLineEditChanged(QString wheelDown)
{
if (!mLockSettingChanges)
- settings().setValue(QStringLiteral("wheelDown"), wheelDown);
+ settings().setValue(QStringLiteral("wheelDown"), wheelDown.trimmed());
}
Loading…
Cancel
Save