Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=d0593bf7f5c74caafe18cb2a14794e42323f044e
commit d0593bf7f5c74caafe18cb2a14794e42323f044e
Author: crazy <cr...@frugalware.org>
Date: Thu Feb 15 02:39:10 2018 +0100
plasma-workspace-5.12.1-1-x86_64
* Version bump
diff --git a/source/plasma/plasma-workspace/FrugalBuild
b/source/plasma/plasma-workspace/FrugalBuild
index 2b50af2..19340a6 100644
--- a/source/plasma/plasma-workspace/FrugalBuild
+++ b/source/plasma/plasma-workspace/FrugalBuild
@@ -3,20 +3,20 @@
pkgname=plasma-workspace
-pkgver=5.11.5
-pkgrel=3
+pkgver=5.12.1
+pkgrel=1
pkgdesc="KDE Plasma Workspace."
groups=('plasma')
archs=("x86_64")
_F_kde_project="plasma"
Finclude kf5
-source+=(kde ksplash-fix-bug-380495.patch)
+source+=(kde)
depends=("libksysguard5>=$_F_kdever_plasma" "knewstuff>=$_F_kf5_full"
"kio>=$_F_kf5_full" "kdesu>=$_F_kf5_full" "kdelibs4support>=$_F_kf5_full" \
"baloo5>=$_F_kf5_full" "krunner5>=$_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" "libxtst" \
"kidletime>=$_F_kf5_full" "networkmanager-qt>=$_F_kf5_full"
"prison>=$_F_kf5_full" "frameworkintegration>=$_F_kf5_full" \
"kxmlrpcclient>=$_F_kf5_full" "plasma-integration>=$_F_kdever_plasma"
'libqalculate>=2.2.1' '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")
+ 'iso-codes>=3.70-2' "kxmlgui>=$_F_kf5_full" "kholidays>=$_F_kf5_full"
"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" "ki18n>=$_F_kf5_full")
options+=('scriptlet')
@@ -49,9 +49,8 @@ replaces+=('kdelibs' 'kdelibs-core' 'kdelibs-data'
'kdelibs-interfaces' 'libkdec
conflicts=("${replaces[@]}")
-sha1sums=('fd24972b5ea77ef901a7f68dc47b36f3679cf2dd' \
- '6216aad404aa0b846c835a0e8f9df4941bf74d37' \
- '346a6587194b97f504144e7136c04655ee876d22')
+sha1sums=('349f2d9f1f829b73406f1e8518e39b446de2f778' \
+ '6216aad404aa0b846c835a0e8f9df4941bf74d37')
subpkgs=('plasma-wayland-session')
subdescs='Plasma Wayland session'
diff --git a/source/plasma/plasma-workspace/ksplash-fix-bug-380495.patch
b/source/plasma/plasma-workspace/ksplash-fix-bug-380495.patch
deleted file mode 100644
index 3bc2010..0000000
--- a/source/plasma/plasma-workspace/ksplash-fix-bug-380495.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur plasma-workspace-5.10.3/ksplash/ksplashqml/main.cpp
plasma-workspace-5.10.3-p/ksplash/ksplashqml/main.cpp
---- plasma-workspace-5.10.3/ksplash/ksplashqml/main.cpp 2017-06-27
12:00:38.000000000 +0200
-+++ plasma-workspace-5.10.3-p/ksplash/ksplashqml/main.cpp 2017-06-27
20:48:03.948002742 +0200
-@@ -24,6 +24,9 @@
- #include <QTextStream>
-
- #include <iostream>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
- #include <unistd.h>
-
- void logMessageHandler(QtMsgType type, const char *msg)
-@@ -83,6 +86,16 @@
-
- return 0;
- }
-+
-+ int devNull = open("/dev/null", O_RDWR);
-+ if (devNull == -1) {
-+ return -1;
-+ }
-+ // replace stdin,stdout,stderr, otherwise startkde will block
-+ dup2(devNull, 0);
-+ dup2(devNull, 1);
-+ dup2(devNull, 2);
-+ close(devNull);
- }
-
- //enable to send log output to /tmp/ksplash
-@@ -91,13 +104,6 @@
- QQuickWindow::setDefaultAlphaBuffer(true);
- SplashApp app(argc, argv);
-
-- if (!test && !nofork) {
-- // close stdin,stdout,stderr, otherwise startkde will block
-- close(0);
-- close(1);
-- close(2);
-- }
--
- return app.exec();
- }
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
