Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package koi for openSUSE:Factory checked in at 2023-11-06 21:14:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/koi (Old) and /work/SRC/openSUSE:Factory/.koi.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "koi" Mon Nov 6 21:14:02 2023 rev:2 rq:1123432 version:0.2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/koi/koi.changes 2023-11-03 22:21:58.140075478 +0100 +++ /work/SRC/openSUSE:Factory/.koi.new.17445/koi.changes 2023-11-06 21:14:10.163024023 +0100 @@ -1,0 +2,6 @@ +Sat Nov 4 18:08:48 UTC 2023 - Martin von Reichenberg <[email protected]> + +- Update to new upstream release version 0.2.4 + * Some small improvements + +------------------------------------------------------------------- Old: ---- 0.2.3.tar.gz New: ---- 0.2.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ koi.spec ++++++ --- /var/tmp/diff_new_pack.5PorlQ/_old 2023-11-06 21:14:10.839048908 +0100 +++ /var/tmp/diff_new_pack.5PorlQ/_new 2023-11-06 21:14:10.843049055 +0100 @@ -17,7 +17,7 @@ Name: koi -Version: 0.2.3 +Version: 0.2.4 Release: 0 Summary: Theme scheduling for the KDE Plasma Desktop License: LGPL-3.0-only ++++++ 0.2.3.tar.gz -> 0.2.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Koi-0.2.3/.github/ISSUE_TEMPLATE/bug_report.md new/Koi-0.2.4/.github/ISSUE_TEMPLATE/bug_report.md --- old/Koi-0.2.3/.github/ISSUE_TEMPLATE/bug_report.md 2022-08-30 15:25:09.000000000 +0200 +++ new/Koi-0.2.4/.github/ISSUE_TEMPLATE/bug_report.md 2023-11-04 17:51:56.000000000 +0100 @@ -25,7 +25,9 @@ **Desktop (please complete the following information):** - Distro: [e.g. KDE Neon] - - Version [e.g. 0.1] + - Koi Version: [e.g. 0.1] + - Plasma Version: [e.g. 5.25.5] + - Intallation method: [e.g. AppImage/nix/aur/copr/OBS/compiled from source] **Additional context** Add any other context about the problem here. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Koi-0.2.3/README.md new/Koi-0.2.4/README.md --- old/Koi-0.2.3/README.md 2022-08-30 15:25:09.000000000 +0200 +++ new/Koi-0.2.4/README.md 2023-11-04 17:51:56.000000000 +0100 @@ -32,64 +32,94 @@ ## Get Koi -Lastest Koi version: 0.2.2 +Lastest version: 0.2.3 -### Arch Linux +### Build from source -Install it from the [AUR](https://aur.archlinux.org/packages/koi/). Packaged by AUR user [dasbaumwolltier](https://aur.archlinux.org/account/dasbaumwolltier), bug them if it's out of date, not me. +**GENERIC Dependencies** -### OpenSUSE Tumbleweed +- Qt [Development files] -Available from [OBS](https://build.opensuse.org/package/show/home:VaiTon/koi). Packaged by [VaiTon](https://github.com/VaiTon), bug them if it's out of date, not me. +- KDE Plasma Desktop Environment -### Fedora +- KDE Frameworks [Development files] -Available from [copr](https://copr.fedorainfracloud.org/coprs/birkch/Koi/). Packaged by [h3o66](https://github.com/h3o66), bug them if it's out of date, not me. +- cmake [Build dependencies] + +**Build Instructions** -### NixOS +1. `git clone https://github.com/baduhai/Koi.git` -Available from my [NUR](https://nur.nix-community.org/repos/baduhai/) repo. Packaged by yours truly. -Install to your nix profile with `nix-env -iA koi -f https://github.com/baduhai/nur/tarball/master`, to add to you nixos configuration, follow the [instructions](https://github.com/nix-community/nur#installation) on the NUR repo. +2. `cd Koi` -### Other Distros +3. `mkdir build` -Install with [nix](https://nixos.org/download.html) (See *NixOS* above) or grab the AppImage of the latest release. +4. `cd build` -### Build from source +5. `cmake ../src/` + +6. `sudo make` + +7. `sudo make install` + +These instructions also apply to building the latest release version of Koi. Instead of cloning the repository, download and extract the latest *Source Code* archive, from then follow step 2 and beyond. + +**Building with NIX** + +`nix-build -E 'with import <nixpkgs> {}; pkgs.libsForQt5.callPackage ./dev.nix {}'` + +## Downloads + +### Arch Linux **Dependencies** +- `qt5-base` +- `plasma-desktop | kconfig | kcoreaddons | kwidgetsaddons` -- Qt +**Download** -- Plasma +Install it from the [AUR](https://aur.archlinux.org/packages/koi/). Packaged by AUR user [dasbaumwolltier](https://aur.archlinux.org/account/dasbaumwolltier), let them know if it's out of date, not me. -- KDE Frameworks +### openSUSE Tumbleweed + Leap -- cmake [build dependency] +**Dependencies** -Koi targets the latest version of the above deps. Since I can't know the name of every dependency for every distro, these are the dependencies on ubuntu: `g++ qtbase5-dev cmake libkf5coreaddons-dev libkf5widgetsaddons-dev libkf5config-dev libkf5package-dev libkf5service-dev` +- `cmake | cmake-full | extra-cmake-modules | patterns-kde-devel_kde_frameworks | patterns-kde-devel_qt5 | fdupes` +- `patterns-kde-kde | patterns-kde-kde_plasma | desktop-file-utils` -**Build Instructions** +**Download** -1. `git clone https://github.com/baduhai/Koi.git` +Available from [OBS](https://build.opensuse.org/package/show/home:ozu/koi) | [REPO](https://download.opensuse.org/repositories/home:/ozu:/). Packaged by [Fabio Pesari-fpesari](https://github.com/fpesari) + [Martin von Reichenberg](https://github.com/MartinVonReichenberg), let them know if it's out of date, not me. -2. `cd Koi` +### Fedora -3. `mkdir build` +**Dependencies** +- `cmake | desktop-file-utils` -4. `cd build` +**Download** +Available from [copr](https://copr.fedorainfracloud.org/coprs/birkch/Koi/). Packaged by [h3o66](https://github.com/h3o66), let them know if it's out of date, not me. -5. `cmake ../src/` +### NixOS and distros with nix. -6. `make` +**Download** -7. `make install` +Available from me [NUR](https://nur.nix-community.org/repos/baduhai/) repo. Packaged by yours truly. +Install to your NIX profile with `nix-env -iA koi -f https://github.com/baduhai/nur/tarball/master`, to add to you nixos configuration, follow the [Instructions](https://github.com/nix-community/nur#installation) on the NUR repo. -These instructions also apply to building the latest release version of Koi. Instead of cloning the repository, download and extract the latest *Source Code* archive, from then follow step 2 and beyond. +### Debian/Ubuntu -**Building with nix** +**Dependencies** +- `g++ | qtbase5-dev | cmake | libkf5coreaddons-dev | libkf5widgetsaddons-dev | libkf5config-dev | libkf5package-dev | libkf5service-dev` + +**Download** +_Not yet available . . ._ + +### Other Distributions + +Install with [NIX](https://nixos.org/download.html) (See *NixOS* above) or grab the AppImage of the latest release. + +_Koi targets the latest version of the above deps. Since I can't know the name of every dependency for every distribution . . ._ -`nix-build -E 'with import <nixpkgs> {}; pkgs.libsForQt5.callPackage ./dev.nix {}'` ## References diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Koi-0.2.3/src/CMakeLists.txt new/Koi-0.2.4/src/CMakeLists.txt --- old/Koi-0.2.3/src/CMakeLists.txt 2022-08-30 15:25:09.000000000 +0200 +++ new/Koi-0.2.4/src/CMakeLists.txt 2023-11-04 17:51:56.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(Koi VERSION 0.2.3 LANGUAGES CXX) +project(Koi VERSION 0.2.4 LANGUAGES CXX) configure_file(headers/config.h.in config.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -19,12 +19,14 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/icons/koi.svg DESTINATION share/icons/hicolor/scalable/apps) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/icons/koi_tray.svg DESTINATION share/icons/hicolor/scalable/apps) -find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS DBus Gui Network Test) -find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Widgets) find_package(KF5Config) find_package(KF5CoreAddons) find_package(KF5WidgetsAddons) +find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS DBus Gui Network Test) +find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Widgets) +find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Xml) + add_executable(koi libs/Cron.h @@ -68,6 +70,7 @@ Qt::Network Qt::Test Qt::Widgets + Qt::Xml ) install(TARGETS koi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Koi-0.2.3/src/headers/plasmastyle.h new/Koi-0.2.4/src/headers/plasmastyle.h --- old/Koi-0.2.3/src/headers/plasmastyle.h 2022-08-30 15:25:09.000000000 +0200 +++ new/Koi-0.2.4/src/headers/plasmastyle.h 2023-11-04 17:51:56.000000000 +0100 @@ -15,8 +15,6 @@ void setPlasmaStyle(QString plasmaStyle); - void setPlasmaStyleBreeze(); - private: QProcess *styleProcess; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Koi-0.2.3/src/headers/utils.h new/Koi-0.2.4/src/headers/utils.h --- old/Koi-0.2.3/src/headers/utils.h 2022-08-30 15:25:09.000000000 +0200 +++ new/Koi-0.2.4/src/headers/utils.h 2023-11-04 17:51:56.000000000 +0100 @@ -72,8 +72,9 @@ QDBusInterface *notifyInterface; QProcess *plasmaDesktopProcess; QProcess *latteProcess; - QProcess *killAllProcess; + QProcess *kquitapp5Process; QProcess *kstart5Process; + QProcess *krunnerProcess; }; #endif // UTILS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Koi-0.2.3/src/koi.desktop new/Koi-0.2.4/src/koi.desktop --- old/Koi-0.2.3/src/koi.desktop 2022-08-30 15:25:09.000000000 +0200 +++ new/Koi-0.2.4/src/koi.desktop 2023-11-04 17:51:56.000000000 +0100 @@ -1,10 +1,14 @@ [Desktop Entry] -Categories=Utility; -Comment=Switch between light and dark. -Exec=koi -Icon=koi +Type=Application +Version=1.4 Name=Koi +GenericName=Theme Switcher +Comment=Scheduled LIGHT/DARK Theme Switching for the KDE Plasma Desktop +Icon=koi +Exec=koi +Path=/usr/bin +Terminal=false +Categories=Utility +Keywords=Theme; Switch; Light; Dark; Schedule; Sunrise; Sunset; Dusk; Dawn; Timer; Kvantum StartupNotify=true StartupWMClass=koi -Terminal=false -Type=Application diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Koi-0.2.3/src/plasmastyle.cpp new/Koi-0.2.4/src/plasmastyle.cpp --- old/Koi-0.2.3/src/plasmastyle.cpp 2022-08-30 15:25:09.000000000 +0200 +++ new/Koi-0.2.4/src/plasmastyle.cpp 2023-11-04 17:51:56.000000000 +0100 @@ -7,12 +7,10 @@ void PlasmaStyle::setPlasmaStyle(QString plasmaStyle) { - KSharedConfigPtr plasmarc = KSharedConfig::openConfig(QStandardPaths::locate(QStandardPaths::GenericConfigLocation, "plasmarc"), KSharedConfig::CascadeConfig); - KConfigGroup(plasmarc, "Theme").writeEntry("name", plasmaStyle); -} - -void PlasmaStyle::setPlasmaStyleBreeze() -{ - KSharedConfigPtr plasmarc = KSharedConfig::openConfig(QStandardPaths::locate(QStandardPaths::GenericConfigLocation, "plasmarc"), KSharedConfig::CascadeConfig); - KConfigGroup(plasmarc, "Theme").deleteGroup(); + styleProcess = new QProcess; + QString style = "/usr/bin/plasma-apply-desktoptheme"; + QStringList styleArgs = {plasmaStyle}; + styleProcess->start(style, styleArgs); + styleProcess->waitForFinished(); + styleProcess->close(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Koi-0.2.3/src/utils.cpp new/Koi-0.2.4/src/utils.cpp --- old/Koi-0.2.3/src/utils.cpp 2022-08-30 15:25:09.000000000 +0200 +++ new/Koi-0.2.4/src/utils.cpp 2023-11-04 17:51:56.000000000 +0100 @@ -22,7 +22,7 @@ QString body = notifyBody; // Notification body. QStringList actions; // No idea how to use. QVariantMap hints; // Provide .desktop file for notification sorting in the DE - hints.insert("desktop-entry", "koi"); + hints.insert("desktop-entry", "Koi"); int timeout = timeoutms; // Notification timeout, there's no way to assume system has a default timeout unfortunately. notifyInterface->call("Notify", app_name, replaces_id, app_icon, summary, body, actions, hints, timeout); } @@ -280,28 +280,14 @@ { if (settings->value("PlasmaStyle/enabled").toBool()) { - if (settings->value("PlasmaStyle/light") == "breeze") // Breeze style is set differently from others - { - plasmastyle.setPlasmaStyleBreeze(); - } - else - { - plasmastyle.setPlasmaStyle(settings->value("PlasmaStyle/light").toString()); - } + plasmastyle.setPlasmaStyle(settings->value("PlasmaStyle/light").toString()); } } void Utils::goDarkStyle() { if (settings->value("PlasmaStyle/enabled").toBool()) { - if (settings->value("PlasmaStyle/dark") == "breeze") // Breeze style is set differently from others - { - plasmastyle.setPlasmaStyleBreeze(); - } - else - { - plasmastyle.setPlasmaStyle(settings->value("PlasmaStyle/dark").toString()); - } + plasmastyle.setPlasmaStyle(settings->value("PlasmaStyle/dark").toString()); } } void Utils::goLightColors() @@ -389,20 +375,31 @@ } } /* this updates the style of both the plasma shell and latte dock if it is available + * It also restart krunner to force the theme on it */ void Utils::restartProcess() { if (settings->value("KvantumStyle/enabled").toBool()) { - killAllProcess = new QProcess; - QString killAll = "/usr/bin/killall"; //used to kill a process + kquitapp5Process = new QProcess; + QString kquitapp5 = "/usr/bin/kquitapp5"; kstart5Process = new QProcess; QString kstart5 = "/usr/bin/kstart5"; QStringList plasmashell = {"plasmashell"}; - killAllProcess->start(killAll, plasmashell); - kstart5Process->start(kstart5, plasmashell); + // kill plasma shell and wait for it + kquitapp5Process->start(kquitapp5, plasmashell); + kquitapp5Process->waitForFinished(); + kquitapp5Process->close(); + // start new process + kstart5Process->start(kstart5, plasmashell); } + + // restart krunner + krunnerProcess = new QProcess; + QString krunner = "/usr/bin/krunner"; + QStringList krunner_args = {"--replace", "-d"}; + krunnerProcess->start(krunner, krunner_args); }
