Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde5.git;a=commitdiff;h=2d2fd2caaaba2e3b8aa554133b852e4ddd1e3b17
commit 2d2fd2caaaba2e3b8aa554133b852e4ddd1e3b17 Author: crazy <[email protected]> Date: Mon Apr 24 12:06:09 2017 +0200 kate-17.04.0-2-x86_64 * revert https://github.com/KDE/kate/commit/9adcebd3c2e476c8a32e9b455cc99f46b0e12a7e too diff --git a/source/kde5/kate/FrugalBuild b/source/kde5/kate/FrugalBuild index 05f9cc3..1d1215b 100644 --- a/source/kde5/kate/FrugalBuild +++ b/source/kde5/kate/FrugalBuild @@ -3,15 +3,17 @@ pkgname=kate pkgver=17.04.0 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Advanced Text Editor." archs=("x86_64") _F_kde_project="applications" Finclude kf5 +source+=(revert-9adcebd3c2e476c8a32e9b455cc99f46b0e12a7e.patch) depends=("ktexteditor>=$_F_kf5_full" "knewstuff>=$_F_kf5_full" "kitemmodels>=$_F_kf5_full" "threadweaver>=$_F_kf5_full" \ 'libgit2>=0.25.0' "plasma-framework>=$_F_kf5_full" "qt5-declarative>=$_F_kdever_qt5") makedepends+=('kdoctools') -sha1sums=('31634980d18b16b10c6ba473c67e3d79006260b2') +sha1sums=('31634980d18b16b10c6ba473c67e3d79006260b2' \ + '349fd85d828df0ff2069bc0e427daf248ed38e3b') replaces=('kate-interfaces' 'kate-plasma' 'libkdekate' 'kwrite') provides=("$replaces[@]") diff --git a/source/kde5/kate/revert-9adcebd3c2e476c8a32e9b455cc99f46b0e12a7e.patch b/source/kde5/kate/revert-9adcebd3c2e476c8a32e9b455cc99f46b0e12a7e.patch new file mode 100644 index 0000000..7fea5db --- /dev/null +++ b/source/kde5/kate/revert-9adcebd3c2e476c8a32e9b455cc99f46b0e12a7e.patch @@ -0,0 +1,55 @@ +diff -Naur kate-17.04.0/kate/main.cpp kate-17.04.0-p/kate/main.cpp +--- kate-17.04.0/kate/main.cpp 2017-04-12 13:35:11.000000000 +0200 ++++ kate-17.04.0-p/kate/main.cpp 2017-04-24 11:52:23.688256873 +0200 +@@ -51,24 +51,9 @@ + #include "qtsingleapplication/qtsingleapplication.h" + #endif + +-#ifndef Q_OS_WIN +-#include <unistd.h> +-#endif +-#include <iostream> +- + + int main(int argc, char **argv) + { +-#ifndef Q_OS_WIN +- /** +- * Check whether we are running as root +- **/ +- if (getuid() == 0) { +- std::cout << "Executing Kate as root is not possible. To edit files as root use:" << std::endl; +- std::cout << "SUDO_EDITOR=kate sudoedit <file>" << std::endl; +- return 0; +- } +-#endif + /** + * init resources from our static lib + */ +diff -Naur kate-17.04.0/kwrite/main.cpp kate-17.04.0-p/kwrite/main.cpp +--- kate-17.04.0/kwrite/main.cpp 2017-04-12 13:35:11.000000000 +0200 ++++ kate-17.04.0-p/kwrite/main.cpp 2017-04-24 11:53:56.374705471 +0200 +@@ -42,23 +42,8 @@ + + #include "../urlinfo.h" + +-#ifndef Q_OS_WIN +-#include <unistd.h> +-#endif +-#include <iostream> +- + extern "C" Q_DECL_EXPORT int main(int argc, char **argv) + { +-#ifndef Q_OS_WIN +- /** +- * Check whether we are running as root +- **/ +- if (getuid() == 0) { +- std::cout << "Executing KWrite as root is not possible. To edit files as root use:" << std::endl; +- std::cout << "SUDO_EDITOR=kwrite sudoedit <file>" << std::endl; +- return 0; +- } +-#endif + /** + * Create application first + * Enforce application name even if the executable is renamed _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
