From 63815cb3bce281c3f745f1da4ddc86f4ae4c1701 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 23 Jan 2015 13:42:30 +0100 Subject: Plasma: updated to 5.2.0. New dependency added: wayland (in order to compile KWin). --- kde/KDE.SlackBuild | 1 - kde/cmake/bluedevil | 14 +------------- kde/cmake/kde-gtk-config | 1 + kde/cmake/kdecoration | 1 + kde/cmake/ksshaskpass | 1 + kde/cmake/libbluedevil | 1 + kde/cmake/muon | 1 + kde/cmake/plasma | 1 + kde/modularize | 15 ++++++++++----- kde/modules/plasma | 11 +++++++++++ kde/modules/plasma-extra | 2 -- kde/modules/polkit-kde | 1 - kde/package-blacklist | 2 +- kde/patch/kdeconnect-framework.patch | 3 ++- kde/pkgsrc/kscreen2 | 2 +- kde/pkgsrc/polkit-kde-framework | 2 +- kde/slack-desc/kde-gtk-config | 19 +++++++++++++++++++ kde/slack-desc/kdecoration | 19 +++++++++++++++++++ kde/slack-desc/ksshaskpass | 19 +++++++++++++++++++ kde/slack-desc/libbluedevil | 19 +++++++++++++++++++ kde/slack-desc/muon | 19 +++++++++++++++++++ 21 files changed, 128 insertions(+), 26 deletions(-) mode change 100644 => 120000 kde/cmake/bluedevil create mode 120000 kde/cmake/kde-gtk-config create mode 120000 kde/cmake/kdecoration create mode 120000 kde/cmake/ksshaskpass create mode 120000 kde/cmake/libbluedevil create mode 120000 kde/cmake/muon delete mode 100644 kde/modules/polkit-kde create mode 100644 kde/slack-desc/kde-gtk-config create mode 100644 kde/slack-desc/kdecoration create mode 100644 kde/slack-desc/ksshaskpass create mode 100644 kde/slack-desc/libbluedevil create mode 100644 kde/slack-desc/muon (limited to 'kde') diff --git a/kde/KDE.SlackBuild b/kde/KDE.SlackBuild index 4017525..273fb90 100755 --- a/kde/KDE.SlackBuild +++ b/kde/KDE.SlackBuild @@ -537,7 +537,6 @@ KDEMODS=" \ frameworks \ plasma \ plasma-extra \ - polkit-kde \ applications \ " diff --git a/kde/cmake/bluedevil b/kde/cmake/bluedevil deleted file mode 100644 index d855f53..0000000 --- a/kde/cmake/bluedevil +++ /dev/null @@ -1,13 +0,0 @@ -mkdir -p build -cd build - cmake \ - $KDE_OPT_ARGS \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DBUILD_tests:BOOL=OFF \ - .. - diff --git a/kde/cmake/bluedevil b/kde/cmake/bluedevil new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/bluedevil @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/kde-gtk-config b/kde/cmake/kde-gtk-config new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/kde-gtk-config @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/kdecoration b/kde/cmake/kdecoration new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/kdecoration @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/ksshaskpass b/kde/cmake/ksshaskpass new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/ksshaskpass @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/libbluedevil b/kde/cmake/libbluedevil new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/libbluedevil @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/muon b/kde/cmake/muon new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/muon @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/plasma b/kde/cmake/plasma index 111d30c..de786f3 100644 --- a/kde/cmake/plasma +++ b/kde/cmake/plasma @@ -15,6 +15,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ -DHAVE_SHADOW=TRUE \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ diff --git a/kde/modularize b/kde/modularize index 86d6eb8..a1d90d9 100644 --- a/kde/modularize +++ b/kde/modularize @@ -22,9 +22,6 @@ # The Frameworks 5, Plasma 5 and Applications: # -# polkit-kde -polkit-kde-framework - # frameworks # Tier 1, depends on Qt5, system libraries: attica-framework @@ -99,6 +96,7 @@ khtml kfilemetadata5 kdepimlibs-framework baloo5 +kdecoration breeze kde-cli-tools khelpcenter @@ -113,6 +111,7 @@ milou oxygen oxygen-fonts systemsettings +kwayland plasma-desktop plasma-workspace kdeplasma-addons @@ -121,14 +120,20 @@ libmm-qt5 libnm-qt5 plasma5-nm powerdevil +#libbluedevil +#bluedevil khotkeys kmenuedit +polkit-kde-framework +kscreen2 +sddm-kcm +kde-gtk-config +muon +ksshaskpass # plasma-extra sddm-qt5 -sddm-kcm sddm-theme-breeze -kscreen2 kdeconnect-framework # applications diff --git a/kde/modules/plasma b/kde/modules/plasma index 3bb54b8..aff2ae3 100644 --- a/kde/modules/plasma +++ b/kde/modules/plasma @@ -2,6 +2,7 @@ kfilemetadata5 #kdepimlibs-framework baloo5 +kdecoration breeze kde-cli-tools khelpcenter @@ -16,6 +17,7 @@ milou oxygen oxygen-fonts systemsettings +kwayland plasma-workspace plasma-desktop kdeplasma-addons @@ -24,5 +26,14 @@ libmm-qt5 #libnm-qt5 plasma5-nm powerdevil +#libbluedevil +#bluedevil khotkeys kmenuedit +polkit-kde-framework +kscreen2 +sddm-kcm +kde-gtk-config +muon +ksshaskpass + diff --git a/kde/modules/plasma-extra b/kde/modules/plasma-extra index eef9258..53fa9c0 100644 --- a/kde/modules/plasma-extra +++ b/kde/modules/plasma-extra @@ -1,6 +1,4 @@ sddm-qt5 -#sddm-kcm sddm-theme-breeze -kscreen2 kdeconnect-framework diff --git a/kde/modules/polkit-kde b/kde/modules/polkit-kde deleted file mode 100644 index a047f04..0000000 --- a/kde/modules/polkit-kde +++ /dev/null @@ -1 +0,0 @@ -polkit-kde-framework diff --git a/kde/package-blacklist b/kde/package-blacklist index 7aeedf7..f6ab382 100644 --- a/kde/package-blacklist +++ b/kde/package-blacklist @@ -8,4 +8,4 @@ kimono qyoto # We need to support Wayland first. -kwayland +#kwayland diff --git a/kde/patch/kdeconnect-framework.patch b/kde/patch/kdeconnect-framework.patch index 8615714..835a0de 100644 --- a/kde/patch/kdeconnect-framework.patch +++ b/kde/patch/kdeconnect-framework.patch @@ -1,4 +1,5 @@ # We now use Qca-qt5, not Qca. # Change the lines with #include to #include : -cat $CWD/patch/kdeconnect-framework/kdeconnect-kde_qca.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +# No longer needed for kdeconnect-kde 5.2.0: +#cat $CWD/patch/kdeconnect-framework/kdeconnect-kde_qca.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/pkgsrc/kscreen2 b/kde/pkgsrc/kscreen2 index e81056c..97f2e26 100644 --- a/kde/pkgsrc/kscreen2 +++ b/kde/pkgsrc/kscreen2 @@ -1 +1 @@ -plasma-extra/kscreen +plasma/kscreen diff --git a/kde/pkgsrc/polkit-kde-framework b/kde/pkgsrc/polkit-kde-framework index 16f7f03..28ce6dc 100644 --- a/kde/pkgsrc/polkit-kde-framework +++ b/kde/pkgsrc/polkit-kde-framework @@ -1,2 +1,2 @@ -polkit-kde/polkit-kde-agent-1 +plasma/polkit-kde-agent-1 diff --git a/kde/slack-desc/kde-gtk-config b/kde/slack-desc/kde-gtk-config new file mode 100644 index 0000000..d59bfb6 --- /dev/null +++ b/kde/slack-desc/kde-gtk-config @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +kde-gtk-config: kde-gtk-config (configure GTK application look & feel in KDE) +kde-gtk-config: +kde-gtk-config: KDE systemsettings kcm to set GTK application look and feel. +kde-gtk-config: +kde-gtk-config: +kde-gtk-config: +kde-gtk-config: +kde-gtk-config: +kde-gtk-config: +kde-gtk-config: For more information, visit: http://projects.kde.org/kde-gtk-config +kde-gtk-config: diff --git a/kde/slack-desc/kdecoration b/kde/slack-desc/kdecoration new file mode 100644 index 0000000..499a27b --- /dev/null +++ b/kde/slack-desc/kdecoration @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +kdecoration: kdecoration (library to create themes for kwin) +kdecoration: +kdecoration: This library makes it easier and more reliable to make themes +kdecoration: for KWin, Plasma's window manager. +kdecoration: It has impressive memory, performance and stability improvements. +kdecoration: +kdecoration: +kdecoration: +kdecoration: +kdecoration: For more information, visit: http://www.kde.org +kdecoration: diff --git a/kde/slack-desc/ksshaskpass b/kde/slack-desc/ksshaskpass new file mode 100644 index 0000000..3c98517 --- /dev/null +++ b/kde/slack-desc/ksshaskpass @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +ksshaskpass: ksshaskpass (GUI for entering ssh key passwords) +ksshaskpass: +ksshaskpass: If you access computers with ssh keys but those keys have passwords +ksshaskpass: this module will give you a graphical UI to enter those passwords. +ksshaskpass: +ksshaskpass: +ksshaskpass: +ksshaskpass: +ksshaskpass: +ksshaskpass: For more information, visit: http://www.kde.org +ksshaskpass: diff --git a/kde/slack-desc/libbluedevil b/kde/slack-desc/libbluedevil new file mode 100644 index 0000000..eb4e2ee --- /dev/null +++ b/kde/slack-desc/libbluedevil @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +libbluedevil: libbluedevil (Qt wrapper for bluez used in the KDE bluetooth stack) +libbluedevil: +libbluedevil: Qt wrapper for bluez used in the KDE bluetooth stack. +libbluedevil: +libbluedevil: +libbluedevil: +libbluedevil: +libbluedevil: +libbluedevil: +libbluedevil: For more information, visit: http://www.kde.org +libbluedevil: diff --git a/kde/slack-desc/muon b/kde/slack-desc/muon new file mode 100644 index 0000000..5759b49 --- /dev/null +++ b/kde/slack-desc/muon @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +muon: muon (install and manage software and other addons for your computer) +muon: +muon: Muon lets you install and manage software and other addons +muon: for your computer. +muon: +muon: +muon: +muon: +muon: +muon: For more information, visit: http://www.kde.org +muon: -- cgit v1.2.3