From 80b951977507418b66d3903f227d8a7cc41f4eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Wed, 26 Aug 2015 09:43:51 +0300 Subject: [PATCH 1/2] bluez-qt is freamework, bluedevil need this --- desktop/kde/framework/bluez-qt/pspec.xml | 8 ++++---- desktop/kde/plasma/bluedevil/pspec.xml | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/desktop/kde/framework/bluez-qt/pspec.xml b/desktop/kde/framework/bluez-qt/pspec.xml index 580a698e89..4868111525 100644 --- a/desktop/kde/framework/bluez-qt/pspec.xml +++ b/desktop/kde/framework/bluez-qt/pspec.xml @@ -12,7 +12,7 @@ library Qt wrapper for KDE 5 Bluez DBus API Qt wrapper for KDE 5 DBus API. - http://download.kde.org/stable/plasma/5.3.2/bluez-qt-5.3.2.tar.xz + http://download.kde.org/stable/frameworks/5.13/bluez-qt-5.13.0.tar.xz bluez bluez-libs-devel @@ -53,9 +53,9 @@ - 2015-08-17 - 5.3.2 - Rebuild for new bluez. + 2015-08-26 + 5.13.0 + Version bump. Ertuğrul Erata ertugrulerata@gmail.com diff --git a/desktop/kde/plasma/bluedevil/pspec.xml b/desktop/kde/plasma/bluedevil/pspec.xml index c0d6861c14..16eb83ae50 100644 --- a/desktop/kde/plasma/bluedevil/pspec.xml +++ b/desktop/kde/plasma/bluedevil/pspec.xml @@ -19,7 +19,7 @@ qt5-declarative kded-devel plasma-framework-devel - bluez-qt-devel + bluez-qt-devel kio-devel ki18n-devel kconfig-devel @@ -28,6 +28,7 @@ kdbusaddons-devel kiconthemes-devel kconfigwidgets-devel + kwindowsystem-devel knotifications-devel kwidgetsaddons-devel extra-cmake-modules @@ -50,6 +51,7 @@ kiconthemes kconfigwidgets knotifications + kwindowsystem kwidgetsaddons From 8e82dd5ec874d36ad72105a2b97e478cb6c748c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Wed, 26 Aug 2015 16:42:33 +0300 Subject: [PATCH 2/2] remove py3 dependency --- desktop/kde/plasma/milou/pspec.xml | 39 +++++++++---------- .../plasma-workspace-wallpapers/actions.py | 1 - .../kde/plasma/plasma-workspace/actions.py | 6 +-- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/desktop/kde/plasma/milou/pspec.xml b/desktop/kde/plasma/milou/pspec.xml index 7c63a2ea2f..203fd0fb21 100644 --- a/desktop/kde/plasma/milou/pspec.xml +++ b/desktop/kde/plasma/milou/pspec.xml @@ -16,19 +16,16 @@ http://download.kde.org/stable/plasma/5.4.0/milou-5.4.0.tar.xz qt5-base-devel - qt5-declarative - python3-devel - libgcc - kdoctools-devel - kdeclarative-devel - ki18n-devel - krunner-devel - plasma-framework-devel - kconfig-devel - kservice-devel - kcoreaddons-devel - extra-cmake-modules - cmake + qt5-declarative + kdoctools-devel + kdeclarative-devel + ki18n-devel + krunner-devel + plasma-framework-devel + kconfig-devel + kservice-devel + kcoreaddons-devel + extra-cmake-modules @@ -36,19 +33,19 @@ milou qt5-base - qt5-declarative - krunner + qt5-declarative + krunner libgcc - kconfig - kservice - kcoreaddons + kconfig + kservice + kcoreaddons /usr/share - /usr/share/locale - /usr/bin + /usr/share/locale + /usr/bin /usr/lib/qt5 - /usr/lib + /usr/lib /usr/share/doc diff --git a/desktop/kde/plasma/plasma-workspace-wallpapers/actions.py b/desktop/kde/plasma/plasma-workspace-wallpapers/actions.py index 8f1b9185ee..83be0cc2db 100644 --- a/desktop/kde/plasma/plasma-workspace-wallpapers/actions.py +++ b/desktop/kde/plasma/plasma-workspace-wallpapers/actions.py @@ -11,7 +11,6 @@ def setup(): cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ -DLIB_INSTALL_DIR=lib \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DQML_INSTALL_DIR=lib/qt5/qml \ -DQT_PLUGIN_INSTALL_DIR=lib/qt5/plugins \ -DSYSCONF_INSTALL_DIR=/etc \ diff --git a/desktop/kde/plasma/plasma-workspace/actions.py b/desktop/kde/plasma/plasma-workspace/actions.py index 9737c14ca2..5ba35f53da 100644 --- a/desktop/kde/plasma/plasma-workspace/actions.py +++ b/desktop/kde/plasma/plasma-workspace/actions.py @@ -18,9 +18,9 @@ def setup(): def build(): cmaketools.make() -def install(): +def install(): cmaketools.install() pisitools.dosym("/usr/lib/drkonqi", "/usr/lib/libexec/drkonqi") - + pisitools.dodoc("COPYING", "HACKING") - +