diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-06-13 14:50:49 +0200 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-06-13 14:50:49 +0200 |
| commit | c779e019ac53019baa07eb843aba59bc55ffec20 (patch) | |
| tree | f4dd959f71cea6ac6a8741a1a8f9933a389f5bc7 /kde/pre-install | |
| parent | e0d005c66dbed44be15070995d9d9e9200c989fa (diff) | |
| download | ktown-c779e019ac53019baa07eb843aba59bc55ffec20.tar.gz ktown-c779e019ac53019baa07eb843aba59bc55ffec20.tar.xz | |
Updated 'testing' in preparation for June '18 release of Plasma 5.13
Diffstat (limited to 'kde/pre-install')
| -rw-r--r-- | kde/pre-install/kde-runtime.pre-install | 4 | ||||
| -rw-r--r-- | kde/pre-install/kdepimlibs4.pre-install | 2 | ||||
| -rw-r--r-- | kde/pre-install/messagelib.pre-install | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/kde/pre-install/kde-runtime.pre-install b/kde/pre-install/kde-runtime.pre-install index c32e2ce..deb906a 100644 --- a/kde/pre-install/kde-runtime.pre-install +++ b/kde/pre-install/kde-runtime.pre-install @@ -6,3 +6,7 @@ sed -i \ doc/kioslave/CMakeLists.txt mv -i doc/kioslave/{,kio}bookmarks mv -i doc/kioslave/{,kio}smb + +# Don't link to kactivities (>= 16.12.0): +sed -e '/plasmaextracomponents/d' -i plasma/declarativeimports/CMakeLists.txt + diff --git a/kde/pre-install/kdepimlibs4.pre-install b/kde/pre-install/kdepimlibs4.pre-install index a663cc6..d120701 100644 --- a/kde/pre-install/kdepimlibs4.pre-install +++ b/kde/pre-install/kdepimlibs4.pre-install @@ -5,3 +5,5 @@ if ! grep -q 'cmake_minimum_required' CMakeLists.txt ; then sed -i -e '1icmake_minimum_required(VERSION 2.8.9)\' CMakeLists.txt fi +# Don't build gpgme++ +sed -e '/gpgme++/d' -e '/qgpgme/d' -i CMakeLists.txt diff --git a/kde/pre-install/messagelib.pre-install b/kde/pre-install/messagelib.pre-install new file mode 100644 index 0000000..d4883ff --- /dev/null +++ b/kde/pre-install/messagelib.pre-install @@ -0,0 +1,3 @@ +# Temporary workaround for a gpgme cmake bug: +sed -e '/find_package.*QGpgme/d' -i CMakeLists.txt + |