From da1be5a21ba06235b67a999f696ec66e35dc17a1 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 9 Jan 2015 00:06:49 +0100 Subject: Prepare for new KDE 5: Frameworks 5.6.0, Plasma 5.1.2, Applications 14.12.0. KDE 5_1501 ========== This is going to be KDE 5 for Slackware-current, composed of Frameworks 5.6.0, Plasma 5.1.2 and Applications 14.12.0. Note that there is still a lot of KDE 4 stuff in here, which is necessary to support all the Applications that have not yet been ported to KDE Frameworks 5. The Applications 15.04 (march 2015) release should offer a lot more KF5 ports. Preliminary build procedure (not verified 100% yet): ---------------------------------------------------- - (crude) get rid of Slackware's KDE: removepkg /var/log/packages/*-4.10.5-* - build all the deps using "updates.SlackBuild" script in the "deps/" directory - note that extra-cmake-modules is required here as well as when building the frameworks, so I just copied it from frameworks to deps. - logoff/login to activate Qt5 profile script. - removepkg akonadi-qt5 or else kdepimlibs-4.14.3 picks up Qt5 dependencies and its compilation will fail as a result - build all the KDE 4 stuff in the "kde/" directory, using "./KDE.SlackBuild kde libs kdebase:nepomuk-core kdepimlibs kdebase kdebindings kdebase:kde-workspace k depim extragear" - installpkg akonadi-qt5 - build the remaining KDE 5 stuff in the "kde/" directory, using "./KDE.SlackBui ld frameworks plasma plasma-extra polkit-kde applications" - build kdei ============================================================================== Eric Hameleers / alien at slackware dot com / 09-jan-2015 --- kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch | 11 ++++ kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch.gz | Bin 237 -> 0 bytes .../kde-cli-tools/kde-cli-tools_kaboutdata.diff | 59 +++++++++++++++++++++ .../kde-cli-tools/kde-cli-tools_kaboutdata.diff.gz | Bin 1073 -> 0 bytes 4 files changed, 70 insertions(+) create mode 100644 kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch delete mode 100644 kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch.gz create mode 100644 kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff delete mode 100644 kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff.gz (limited to 'kde/patch/kde-cli-tools') diff --git a/kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch b/kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch new file mode 100644 index 0000000..1ff1f84 --- /dev/null +++ b/kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch @@ -0,0 +1,11 @@ +--- kde-cli-tools-20140602git/CMakeLists.txt.orig 2014-06-02 13:45:49.000000000 +0200 ++++ kde-cli-tools-20140602git/CMakeLists.txt 2014-06-02 23:45:22.337682384 +0200 +@@ -21,7 +21,7 @@ + Test + ) + +-find_package(KF5 CONFIG REQUIRED COMPONENTS ++find_package(KF5 REQUIRED COMPONENTS + Config + Init + KCMUtils diff --git a/kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch.gz b/kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch.gz deleted file mode 100644 index 41dc277..0000000 Binary files a/kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch.gz and /dev/null differ diff --git a/kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff b/kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff new file mode 100644 index 0000000..e88a512 --- /dev/null +++ b/kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff @@ -0,0 +1,59 @@ +diff -uar kde-cli-tools-20140602git.orig/kdesu/kdesu.cpp kde-cli-tools-20140602git/kdesu/kdesu.cpp +--- kde-cli-tools-20140602git.orig/kdesu/kdesu.cpp 2014-06-02 13:45:49.000000000 +0200 ++++ kde-cli-tools-20140602git/kdesu/kdesu.cpp 2014-06-03 00:41:16.998697492 +0200 +@@ -81,9 +81,9 @@ + if (duser.isEmpty()) + duser = "root"; + +- KAboutData aboutData("kdesu", 0, i18n("KDE su"), ++ KAboutData aboutData("kdesu", i18n("KDE su"), + Version, i18n("Runs a program with elevated privileges."), +- KAboutData::License_Artistic, ++ KAboutLicense::Artistic, + i18n("Copyright (c) 1998-2000 Geert Jansen, Pietro Iglio")); + aboutData.addAuthor(i18n("Geert Jansen"), i18n("Maintainer"), + "jansen@kde.org", "http://www.stack.nl/~geertj/"); +diff -uar kde-cli-tools-20140602git.orig/kioclient/kioclient.cpp kde-cli-tools-20140602git/kioclient/kioclient.cpp +--- kde-cli-tools-20140602git.orig/kioclient/kioclient.cpp 2014-06-02 13:45:49.000000000 +0200 ++++ kde-cli-tools-20140602git/kioclient/kioclient.cpp 2014-06-03 00:41:50.446696159 +0200 +@@ -133,7 +133,7 @@ + QString programName = i18n("KIO Client"); + QString description = i18n("Command-line tool for network-transparent operations"); + QString version = "2.0"; +- KAboutData data(appName, appName, programName, version, description, KAboutData::License_LGPL_V2); ++ KAboutData data(appName, programName, version, description, KAboutLicense::LGPL_V2); + + QCommandLineParser parser; + parser.addOption(QCommandLineOption("noninteractive", i18n("Non-interactive use: no message boxes. If you don't want a" +diff -uar kde-cli-tools-20140602git.orig/kreadconfig/kreadconfig.cpp kde-cli-tools-20140602git/kreadconfig/kreadconfig.cpp +--- kde-cli-tools-20140602git.orig/kreadconfig/kreadconfig.cpp 2014-06-02 13:45:49.000000000 +0200 ++++ kde-cli-tools-20140602git/kreadconfig/kreadconfig.cpp 2014-06-03 00:40:33.820702023 +0200 +@@ -53,10 +53,10 @@ + int main(int argc, char **argv) + { + QCoreApplication app(argc, argv); +- KAboutData aboutData("kreadconfig", 0, i18n("KReadConfig"), ++ KAboutData aboutData("kreadconfig", i18n("KReadConfig"), + "1.0.1", + i18n("Read KConfig entries - for use in shell scripts"), +- KAboutData::License_GPL, ++ KAboutLicense::GPL, + i18n("(c) 2001 Red Hat, Inc.")); + aboutData.addAuthor(i18n("Bernhard Rosenkraenzer"), QString(), "bero@redhat.com"); + +diff -uar kde-cli-tools-20140602git.orig/kreadconfig/kwriteconfig.cpp kde-cli-tools-20140602git/kreadconfig/kwriteconfig.cpp +--- kde-cli-tools-20140602git.orig/kreadconfig/kwriteconfig.cpp 2014-06-02 13:45:49.000000000 +0200 ++++ kde-cli-tools-20140602git/kreadconfig/kwriteconfig.cpp 2014-06-03 00:39:54.811701204 +0200 +@@ -31,10 +31,10 @@ + int main(int argc, char **argv) + { + QCoreApplication app(argc, argv); +- KAboutData aboutData("kwriteconfig", 0, i18n("KWriteConfig"), ++ KAboutData aboutData("kwriteconfig", i18n("KWriteConfig"), + "1.0.0", + i18n("Write KConfig entries - for use in shell scripts"), +- KAboutData::License_GPL, ++ KAboutLicense::GPL, + i18n("(c) 2001 Red Hat, Inc. & Luís Pedro Coelho")); + aboutData.addAuthor("Luís Pedro Coelho", QString(), "luis_pedro@netcabo.pt"); + aboutData.addAuthor("Bernhard Rosenkraenzer", i18n("Wrote kreadconfig on which this is based"), "bero@redhat.com"); diff --git a/kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff.gz b/kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff.gz deleted file mode 100644 index 80650da..0000000 Binary files a/kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff.gz and /dev/null differ -- cgit v1.2.3-65-gdbad