From fd1d3373721082f7dc874cb504a776d82461be60 Mon Sep 17 00:00:00 2001 From: Lana Black Date: Sun, 11 Sep 2022 20:39:27 +0000 Subject: [PATCH] latte-dock: 0.10.4 -> unstable-2022-09-06 --- .../latte-dock/0001-Disable-autostart.patch | 34 +++++++++++++++++++ .../0001-close-user-autostart.patch | 25 -------------- pkgs/applications/misc/latte-dock/default.nix | 23 +++++++------ 3 files changed, 47 insertions(+), 35 deletions(-) create mode 100644 pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch delete mode 100644 pkgs/applications/misc/latte-dock/0001-close-user-autostart.patch diff --git a/pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch b/pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch new file mode 100644 index 00000000000..a639b465c92 --- /dev/null +++ b/pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch @@ -0,0 +1,34 @@ +From ad3f083de2dca2b2c5189430d33a78acfbd9d694 Mon Sep 17 00:00:00 2001 +From: Lana Black +Date: Wed, 8 Jun 2022 12:42:31 +0000 +Subject: [PATCH] Disable autostart. + +--- + app/settings/universalsettings.cpp | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/app/settings/universalsettings.cpp b/app/settings/universalsettings.cpp +index c95371db..4efd3ffe 100644 +--- a/app/settings/universalsettings.cpp ++++ b/app/settings/universalsettings.cpp +@@ -74,17 +74,6 @@ UniversalSettings::~UniversalSettings() + + void UniversalSettings::load() + { +- //! check if user has set the autostart option +- bool autostartUserSet = m_universalGroup.readEntry("userConfiguredAutostart", false); +- +- if (!autostartUserSet && !autostart()) { +- //! the first time the application is running and autostart is not set, autostart is enabled +- //! and from now own it will not be recreated in the beginning +- +- setAutostart(true); +- m_universalGroup.writeEntry("userConfiguredAutostart", true); +- } +- + //! init screen scales + m_screenScalesGroup = m_universalGroup.group("ScreenScales"); + +-- +2.36.1 + diff --git a/pkgs/applications/misc/latte-dock/0001-close-user-autostart.patch b/pkgs/applications/misc/latte-dock/0001-close-user-autostart.patch deleted file mode 100644 index 63d5ecd798a..00000000000 --- a/pkgs/applications/misc/latte-dock/0001-close-user-autostart.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a162c54ed1fcc39434edf8666c72c305d05e79e6 Mon Sep 17 00:00:00 2001 -From: diffumist -Date: Mon, 4 Oct 2021 16:58:37 +0800 -Subject: [PATCH] close user config autostart - ---- - app/settings/universalsettings.cpp | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/app/settings/universalsettings.cpp b/app/settings/universalsettings.cpp -index e0010542..82b9e785 100644 ---- a/app/settings/universalsettings.cpp -+++ b/app/settings/universalsettings.cpp -@@ -77,9 +77,6 @@ void UniversalSettings::load() - //! check if user has set the autostart option - bool autostartUserSet = m_universalGroup.readEntry("userConfiguredAutostart", false); - -- if (!autostartUserSet && !autostart()) { -- setAutostart(true); -- } - - //! init screen scales - m_screenScalesGroup = m_universalGroup.group("ScreenScales"); --- -2.33.0 diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 695fe938a9e..7e48781f5c4 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,24 +1,27 @@ -{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchurl -, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash, knewstuff }: +{ mkDerivation, lib, cmake, xorg, plasma-framework, plasma-wayland-protocols, fetchFromGitLab +, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, qtwayland, kcrash, knewstuff, wayland }: mkDerivation rec { pname = "latte-dock"; - version = "0.10.4"; + version = "unstable-2022-09-06"; - src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "XRop+MNcbeCcbnL2LM1i67QvMudW3CjWYEPLkT/qbGM="; - name = "${pname}-${version}.tar.xz"; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "plasma"; + repo = "latte-dock"; + rev = "cd36798a61a37652eb549d7dfcdf06d2028eddc4"; + sha256 = "sha256-X2PzI2XJje4DpPh7gTtYnMIwerR1IDY53HImvEtFmF4="; }; - buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ]; + buildInputs = [ plasma-framework plasma-wayland-protocols qtwayland xorg.libpthreadstubs xorg.libXdmcp xorg.libSM wayland ]; nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem qtx11extras kcrash knewstuff ]; patches = [ - ./0001-close-user-autostart.patch + ./0001-Disable-autostart.patch ]; + fixupPhase = '' mkdir -p $out/etc/xdg/autostart cp $out/share/applications/org.kde.latte-dock.desktop $out/etc/xdg/autostart @@ -26,7 +29,7 @@ mkDerivation rec { meta = with lib; { description = "Dock-style app launcher based on Plasma frameworks"; - homepage = "https://github.com/psifidotos/Latte-Dock"; + homepage = "https://invent.kde.org/plasma/latte-dock"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.ysndr ];