Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bac8922d44b596866b73f46641756c77ad2bfb3f
commit bac8922d44b596866b73f46641756c77ad2bfb3f Author: crazy <[email protected]> Date: Fri Apr 28 11:14:02 2017 +0200 plasma-workspace-5.9.5-3-x86_64 * test patch for the ksplash hangs * lower interval step to 0.7 secs and the max timer to 8 secs from 30 secs diff --git a/source/plasma/plasma-workspace/FrugalBuild b/source/plasma/plasma-workspace/FrugalBuild index 71ba3ee..0ed268f 100644 --- a/source/plasma/plasma-workspace/FrugalBuild +++ b/source/plasma/plasma-workspace/FrugalBuild @@ -4,20 +4,20 @@ pkgname=plasma-workspace pkgver=5.9.5 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Plasma Workspace." groups=('plasma') archs=("x86_64") _F_kde_project="plasma" Finclude kf5 -source+=(kde fix-autostart-stuff.patch) +source+=(kde fix-autostart-stuff.patch ksplash-test.patch) depends=("libksysguard5>=$_F_kdever_plasma" "knewstuff>=$_F_kf5_full" "krunner5>=$_F_kf5_full" "kdesu>=$_F_kf5_full" \ "baloo5>=$_F_kf5_full" "kjsembed>=$_F_kf5_full" "knotifyconfig>=$_F_kf5_full" "libkscreen5>=$_F_kdever_plasma" \ "ktexteditor>=$_F_kf5_full" "kinit>=$_F_kf5_full" "kcmutils>=$_F_kf5_full" "kwin5>=$_F_kdever_plasma" \ "kidletime>=$_F_kf5_full" "kdelibs4support>=$_F_kf5_full" "networkmanager-qt>=$_F_kf5_full" "prison>=$_F_kf5_full" \ "kxmlrpcclient>=$_F_kf5_full" "plasma-integration>=$_F_kdever_plasma" 'libqalculate>=0.9.11' 'cln>=1.3.4-3' 'gpsd>=3.16-3' \ 'iso-codes>=3.70-2' "kxmlgui>=$_F_kf5_full" "kholidays>=$_F_kdever_apps" "qt5-quickcontrols2>=$_F_kdever_qt5" "qt5-quickcontrols>=$_F_kdever_qt5") -makedepends+=("kdoctools>=$_F_kf5_full" "kemoticons>=$_F_kf5_full" "kitemmodels>=$_F_kf5_full" "kinit>=$_F_kf5_full") +makedepends+=("kdoctools>=$_F_kf5_full" "kemoticons>=$_F_kf5_full" "kitemmodels>=$_F_kf5_full" "kinit>=$_F_kf5_full" "baloo5>=$_F_kf5_full") options+=('scriptlet') ## these all are needed by startkde and startplasma* @@ -51,7 +51,8 @@ conflicts=("${replaces[@]}") sha1sums=('5034b2dd3fad3261a1badd9047270d9d6252642c' \ '6216aad404aa0b846c835a0e8f9df4941bf74d37' \ - '533b18e9291208b3edfa48c3b523e7a5c6fa852e') + '533b18e9291208b3edfa48c3b523e7a5c6fa852e' \ + '949d9caac57eb799b9c7bb72aca324133f83aa99') subpkgs=('plasma-wayland-session') subdescs='Plasma Wayland session' diff --git a/source/plasma/plasma-workspace/ksplash-test.patch b/source/plasma/plasma-workspace/ksplash-test.patch new file mode 100644 index 0000000..d5518be --- /dev/null +++ b/source/plasma/plasma-workspace/ksplash-test.patch @@ -0,0 +1,34 @@ +diff -Naur plasma-workspace-5.9.5/ksplash/ksplashqml/splashapp.cpp plasma-workspace-5.9.5-p/ksplash/ksplashqml/splashapp.cpp +--- plasma-workspace-5.9.5/ksplash/ksplashqml/splashapp.cpp 2017-04-25 15:34:07.000000000 +0200 ++++ plasma-workspace-5.9.5-p/ksplash/ksplashqml/splashapp.cpp 2017-04-28 10:49:58.872488986 +0200 +@@ -35,7 +35,8 @@ + #include <KWayland/Client/registry.h> + #include <KWayland/Client/plasmashell.h> + +-#define TEST_STEP_INTERVAL 2000 ++#define TEST_STEP_INTERVAL 2000 // 2 sec ++#define STEP_INTERVAL 700 // 0,7 sec + + /** + * There are 6 used stages in ksplash +@@ -104,7 +105,7 @@ + + setStage(m_stage + 1); + +- m_timer.start(TEST_STEP_INTERVAL, this); ++ m_timer.start(STEP_INTERVAL, this); + } + } + +diff -Naur plasma-workspace-5.9.5/ksplash/ksplashqml/splashwindow.cpp plasma-workspace-5.9.5-p/ksplash/ksplashqml/splashwindow.cpp +--- plasma-workspace-5.9.5/ksplash/ksplashqml/splashwindow.cpp 2017-04-25 15:34:07.000000000 +0200 ++++ plasma-workspace-5.9.5-p/ksplash/ksplashqml/splashwindow.cpp 2017-04-28 10:50:27.420242985 +0200 +@@ -70,7 +70,7 @@ + + //be sure it will be eventually closed + //FIXME: should never be stuck +- QTimer::singleShot(30000, this, &QWindow::close); ++ QTimer::singleShot(8000, this, &QWindow::close); + } + + void SplashWindow::setStage(int stage) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
