From 2b2dabe12f98a401a992a4811691ba3d1c57c388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 27 Jul 2015 16:21:05 +0300 Subject: [PATCH] remove py3 dependency --- desktop/kde/framework/kapidox/pspec.xml | 7 ++-- desktop/kde/framework/kbookmarks/actions.py | 2 +- desktop/kde/framework/kbookmarks/pspec.xml | 3 +- desktop/kde/framework/kcmutils/actions.py | 2 +- .../kde/framework/kconfigwidgets/pspec.xml | 1 - desktop/kde/framework/kemoticons/actions.py | 2 +- desktop/kde/framework/kglobalaccel/actions.py | 2 +- desktop/kde/framework/kglobalaccel/pspec.xml | 1 - desktop/kde/framework/kiconthemes/actions.py | 2 +- desktop/kde/framework/kiconthemes/pspec.xml | 1 - .../kde/framework/knotifications/actions.py | 2 +- .../kde/framework/knotifications/pspec.xml | 1 - desktop/kde/framework/kpackage/actions.py | 2 +- desktop/kde/framework/kpackage/pspec.xml | 20 ++++++---- desktop/kde/framework/kpeople/actions.py | 2 +- desktop/kde/framework/kpeople/pspec.xml | 11 ++++-- desktop/kde/framework/kpty/actions.py | 2 +- desktop/kde/framework/kpty/pspec.xml | 1 - desktop/kde/framework/kservice/actions.py | 2 +- desktop/kde/framework/kservice/pspec.xml | 8 +++- desktop/kde/framework/ktextwidgets/actions.py | 2 +- desktop/kde/framework/ktextwidgets/pspec.xml | 1 - .../kde/framework/kunitconversion/actions.py | 2 +- .../kde/framework/kunitconversion/pspec.xml | 2 +- desktop/kde/framework/kwallet/actions.py | 2 +- desktop/kde/framework/kwallet/pspec.xml | 1 - desktop/kde/framework/kxmlgui/pspec.xml | 1 - .../kde/porting-aids/kmediaplayer/pspec.xml | 37 ++++++++++++------- 28 files changed, 68 insertions(+), 54 deletions(-) diff --git a/desktop/kde/framework/kapidox/pspec.xml b/desktop/kde/framework/kapidox/pspec.xml index b02b66f47e..d25a0c858d 100755 --- a/desktop/kde/framework/kapidox/pspec.xml +++ b/desktop/kde/framework/kapidox/pspec.xml @@ -15,9 +15,10 @@ http://download.kde.org/stable/frameworks/5.11/kapidox-5.11.0.tar.xz python-Jinja2 - python-PyYAML - qt5-base-devel - extra-cmake-modules + python-PyYAML + qt5-base-devel + extra-cmake-modules + cmake diff --git a/desktop/kde/framework/kbookmarks/actions.py b/desktop/kde/framework/kbookmarks/actions.py index e2f17d2484..01e8c95948 100755 --- a/desktop/kde/framework/kbookmarks/actions.py +++ b/desktop/kde/framework/kbookmarks/actions.py @@ -12,7 +12,7 @@ def setup(): -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ -DLIB_INSTALL_DIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DBUILD_TESTING=OFF") def build(): diff --git a/desktop/kde/framework/kbookmarks/pspec.xml b/desktop/kde/framework/kbookmarks/pspec.xml index 8e3d01d322..2e46c0d22a 100755 --- a/desktop/kde/framework/kbookmarks/pspec.xml +++ b/desktop/kde/framework/kbookmarks/pspec.xml @@ -15,10 +15,9 @@ http://download.kde.org/stable/frameworks/5.11/kbookmarks-5.11.0.tar.xz qt5-base-devel - python3 qt5-tools-devel kcoreaddons-devel - kauth-devel + kauth-devel kcodecs-devel kconfig-devel kconfigwidgets-devel diff --git a/desktop/kde/framework/kcmutils/actions.py b/desktop/kde/framework/kcmutils/actions.py index e2f17d2484..01e8c95948 100755 --- a/desktop/kde/framework/kcmutils/actions.py +++ b/desktop/kde/framework/kcmutils/actions.py @@ -12,7 +12,7 @@ def setup(): -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ -DLIB_INSTALL_DIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DBUILD_TESTING=OFF") def build(): diff --git a/desktop/kde/framework/kconfigwidgets/pspec.xml b/desktop/kde/framework/kconfigwidgets/pspec.xml index b5837c6afb..20ae64dfb6 100755 --- a/desktop/kde/framework/kconfigwidgets/pspec.xml +++ b/desktop/kde/framework/kconfigwidgets/pspec.xml @@ -17,7 +17,6 @@ http://download.kde.org/stable/frameworks/5.11/kconfigwidgets-5.11.0.tar.xz qt5-base-devel - python3 ki18n-devel kauth-devel kcodecs-devel diff --git a/desktop/kde/framework/kemoticons/actions.py b/desktop/kde/framework/kemoticons/actions.py index 4d62960137..bec9101233 100755 --- a/desktop/kde/framework/kemoticons/actions.py +++ b/desktop/kde/framework/kemoticons/actions.py @@ -12,7 +12,7 @@ def setup(): -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ -DLIB_INSTALL_DIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DBUILD_TESTING=OFF") def build(): diff --git a/desktop/kde/framework/kglobalaccel/actions.py b/desktop/kde/framework/kglobalaccel/actions.py index e2f17d2484..01e8c95948 100755 --- a/desktop/kde/framework/kglobalaccel/actions.py +++ b/desktop/kde/framework/kglobalaccel/actions.py @@ -12,7 +12,7 @@ def setup(): -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ -DLIB_INSTALL_DIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DBUILD_TESTING=OFF") def build(): diff --git a/desktop/kde/framework/kglobalaccel/pspec.xml b/desktop/kde/framework/kglobalaccel/pspec.xml index f903f4c7d1..2e5245553c 100755 --- a/desktop/kde/framework/kglobalaccel/pspec.xml +++ b/desktop/kde/framework/kglobalaccel/pspec.xml @@ -16,7 +16,6 @@ qt5-base-devel qt5-tools-devel - python3 qt5-base libgcc libxcb-devel diff --git a/desktop/kde/framework/kiconthemes/actions.py b/desktop/kde/framework/kiconthemes/actions.py index 648143a2e1..1fa7448a5d 100755 --- a/desktop/kde/framework/kiconthemes/actions.py +++ b/desktop/kde/framework/kiconthemes/actions.py @@ -14,7 +14,7 @@ def setup(): -DQML_INSTALL_DIR=lib/qt5/qml \ -DLIB_INSTALL_DIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DLOCALE_INSTALL_DIR=/usr/share/locale \ -DBUILD_TESTING=OFF") diff --git a/desktop/kde/framework/kiconthemes/pspec.xml b/desktop/kde/framework/kiconthemes/pspec.xml index c224b61e17..10a521a2cb 100755 --- a/desktop/kde/framework/kiconthemes/pspec.xml +++ b/desktop/kde/framework/kiconthemes/pspec.xml @@ -16,7 +16,6 @@ http://download.kde.org/stable/frameworks/5.11/kiconthemes-5.11.0.tar.xz qt5-base-devel - python3 qt5-svg-devel ki18n-devel kauth-devel diff --git a/desktop/kde/framework/knotifications/actions.py b/desktop/kde/framework/knotifications/actions.py index 0606439972..b85635a5ec 100755 --- a/desktop/kde/framework/knotifications/actions.py +++ b/desktop/kde/framework/knotifications/actions.py @@ -13,7 +13,7 @@ def setup(): -DLIB_INSTALL_DIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DPhonon4Qt5_DIR=/usr/lib/qt5/cmake/phonon4qt5 \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DBUILD_TESTING=OFF") def build(): diff --git a/desktop/kde/framework/knotifications/pspec.xml b/desktop/kde/framework/knotifications/pspec.xml index 6ba99d5dfb..dc94ff8dba 100755 --- a/desktop/kde/framework/knotifications/pspec.xml +++ b/desktop/kde/framework/knotifications/pspec.xml @@ -16,7 +16,6 @@ qt5-base-devel qt5-tools-devel - python3 kwindowsystem-devel qt5-x11extras-devel kservice-devel diff --git a/desktop/kde/framework/kpackage/actions.py b/desktop/kde/framework/kpackage/actions.py index eb0cad697c..8502d4edfe 100644 --- a/desktop/kde/framework/kpackage/actions.py +++ b/desktop/kde/framework/kpackage/actions.py @@ -15,7 +15,7 @@ def setup(): -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_INSTALL_DIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DBUILD_TESTING=OFF") def build(): diff --git a/desktop/kde/framework/kpackage/pspec.xml b/desktop/kde/framework/kpackage/pspec.xml index 64f335f33d..fc3c35a255 100644 --- a/desktop/kde/framework/kpackage/pspec.xml +++ b/desktop/kde/framework/kpackage/pspec.xml @@ -15,7 +15,6 @@ http://download.kde.org/stable/frameworks/5.11/kpackage-5.11.0.tar.xz qt5-base-devel - python3 libX11-devel kconfig-devel ki18n-devel @@ -46,22 +45,27 @@ /usr/bin /usr/lib/qt5 /usr/lib - /usr/share + /usr/share /usr/share/locale /usr/share/man/man1 - - + + + kpackage-devel - Development files for kpackage + Development files for kpackage - qt5-base-devel - kpackage + kpackage + qt5-base-devel + kconfig-devel + ki18n-devel + kcoreaddons-devel + karchive-devel /usr/include /usr/lib/cmake - /usr/lib/pkgconfig + /usr/lib/pkgconfig diff --git a/desktop/kde/framework/kpeople/actions.py b/desktop/kde/framework/kpeople/actions.py index 3ac5ef81de..cf92b6e2b0 100755 --- a/desktop/kde/framework/kpeople/actions.py +++ b/desktop/kde/framework/kpeople/actions.py @@ -16,7 +16,7 @@ def setup(): -DCMAKE_INSTALL_PREFIX=/usr \ -DLIBEXEC_INSTALL_DIR=libexec \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DQT_PLUGIN_INSTALL_DIR=lib/qt5/plugins \ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules ") diff --git a/desktop/kde/framework/kpeople/pspec.xml b/desktop/kde/framework/kpeople/pspec.xml index b781c480ff..c3a31454e7 100755 --- a/desktop/kde/framework/kpeople/pspec.xml +++ b/desktop/kde/framework/kpeople/pspec.xml @@ -15,7 +15,6 @@ http://download.kde.org/stable/frameworks/5.11/kpeople-5.11.0.tar.xz qt5-base-devel - python3 kconfig-devel qt5-declarative-devel kcoreaddons-devel @@ -26,7 +25,7 @@ kservice-devel kwidgetsaddons-devel ki18n-devel - kitemviews-devel + kitemviews-devel extra-cmake-modules cmake @@ -39,7 +38,6 @@ qt5-declarative libgcc kconfig - qt5-declarative kcoreaddons kservice kwidgetsaddons @@ -60,6 +58,13 @@ Development files for kpeople qt5-base-devel + qt5-declarative-devel + kconfig-devel + kcoreaddons-devel + kwidgetsaddons-devel + kservice-devel + ki18n-devel + kitemviews-devel kpeople diff --git a/desktop/kde/framework/kpty/actions.py b/desktop/kde/framework/kpty/actions.py index 15bcac6bf7..655efdc043 100644 --- a/desktop/kde/framework/kpty/actions.py +++ b/desktop/kde/framework/kpty/actions.py @@ -12,7 +12,7 @@ def setup(): -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ -DLIB_INSTALL_DIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DBUILD_TESTING=OFF") def build(): diff --git a/desktop/kde/framework/kpty/pspec.xml b/desktop/kde/framework/kpty/pspec.xml index a1c5191f33..bd98a4ad7c 100644 --- a/desktop/kde/framework/kpty/pspec.xml +++ b/desktop/kde/framework/kpty/pspec.xml @@ -15,7 +15,6 @@ http://download.kde.org/stable/frameworks/5.11/kpty-5.11.0.tar.xz qt5-base-devel - python3 utempter-devel kcoreaddons-devel ki18n-devel diff --git a/desktop/kde/framework/kservice/actions.py b/desktop/kde/framework/kservice/actions.py index 2603493149..8cc7aca4f3 100755 --- a/desktop/kde/framework/kservice/actions.py +++ b/desktop/kde/framework/kservice/actions.py @@ -11,7 +11,7 @@ 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 \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DSYSCONF_INSTALL_DIR=/etc \ -DBUILD_TESTING=OFF") diff --git a/desktop/kde/framework/kservice/pspec.xml b/desktop/kde/framework/kservice/pspec.xml index 42fd6bfdf1..fb0c221877 100755 --- a/desktop/kde/framework/kservice/pspec.xml +++ b/desktop/kde/framework/kservice/pspec.xml @@ -16,7 +16,6 @@ http://download.kde.org/stable/frameworks/5.11/kservice-5.11.0.tar.xz qt5-base-devel - python3 kdoctools-devel kconfig-devel kcoreaddons-devel @@ -57,8 +56,13 @@ kservice-devel Development files for kservice + kservice qt5-base-devel - kservice + kconfig-devel + kcoreaddons-devel + kcrash-devel + kdbusaddons-devel + ki18n-devel /usr/include diff --git a/desktop/kde/framework/ktextwidgets/actions.py b/desktop/kde/framework/ktextwidgets/actions.py index c14cef5133..b6e9b6a5f3 100755 --- a/desktop/kde/framework/ktextwidgets/actions.py +++ b/desktop/kde/framework/ktextwidgets/actions.py @@ -13,7 +13,7 @@ def setup(): -DSYSCONF_INSTALL_DIR=/etc \ -DLIB_INSTALL_DIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DBUILD_TESTING=OFF") def build(): diff --git a/desktop/kde/framework/ktextwidgets/pspec.xml b/desktop/kde/framework/ktextwidgets/pspec.xml index e591ccea9e..104e87ee4e 100755 --- a/desktop/kde/framework/ktextwidgets/pspec.xml +++ b/desktop/kde/framework/ktextwidgets/pspec.xml @@ -16,7 +16,6 @@ http://download.kde.org/stable/frameworks/5.11/ktextwidgets-5.11.0.tar.xz qt5-base-devel - python3 kconfig-devel kcompletion-devel kcodecs-devel diff --git a/desktop/kde/framework/kunitconversion/actions.py b/desktop/kde/framework/kunitconversion/actions.py index 6b4f921b4d..90e8b60552 100755 --- a/desktop/kde/framework/kunitconversion/actions.py +++ b/desktop/kde/framework/kunitconversion/actions.py @@ -13,7 +13,7 @@ def setup(): -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ -DLIB_INSTALL_DIR=lib \ -DPLUGIN_INSTALL_DIR=/usr/lib/qt5/plugins \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF") diff --git a/desktop/kde/framework/kunitconversion/pspec.xml b/desktop/kde/framework/kunitconversion/pspec.xml index c751a6834c..077bd37982 100755 --- a/desktop/kde/framework/kunitconversion/pspec.xml +++ b/desktop/kde/framework/kunitconversion/pspec.xml @@ -15,7 +15,6 @@ http://download.kde.org/stable/frameworks/5.11/kunitconversion-5.11.0.tar.xz qt5-base-devel - python3 ki18n-devel extra-cmake-modules cmake @@ -43,6 +42,7 @@ Development files for kunitconversion qt5-base-devel + ki18n-devel kunitconversion diff --git a/desktop/kde/framework/kwallet/actions.py b/desktop/kde/framework/kwallet/actions.py index 6da79e6628..cdc2d515da 100755 --- a/desktop/kde/framework/kwallet/actions.py +++ b/desktop/kde/framework/kwallet/actions.py @@ -12,7 +12,7 @@ def setup(): -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ -DLIB_INSTALL_DIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DBUILD_TESTING=OFF") def build(): diff --git a/desktop/kde/framework/kwallet/pspec.xml b/desktop/kde/framework/kwallet/pspec.xml index 9341f0a714..edb2d8f2c6 100755 --- a/desktop/kde/framework/kwallet/pspec.xml +++ b/desktop/kde/framework/kwallet/pspec.xml @@ -16,7 +16,6 @@ http://download.kde.org/stable/frameworks/5.11/kwallet-5.11.0.tar.xz qt5-base-devel - python3 libgcrypt-devel kconfig-devel kcoreaddons-devel diff --git a/desktop/kde/framework/kxmlgui/pspec.xml b/desktop/kde/framework/kxmlgui/pspec.xml index a1a830a592..6135b0181d 100755 --- a/desktop/kde/framework/kxmlgui/pspec.xml +++ b/desktop/kde/framework/kxmlgui/pspec.xml @@ -15,7 +15,6 @@ http://download.kde.org/stable/frameworks/5.11/kxmlgui-5.11.0.tar.xz qt5-base-devel - python3 libgcc attica-devel kcoreaddons-devel diff --git a/desktop/kde/porting-aids/kmediaplayer/pspec.xml b/desktop/kde/porting-aids/kmediaplayer/pspec.xml index 14bd7b7aee..89c2428adb 100755 --- a/desktop/kde/porting-aids/kmediaplayer/pspec.xml +++ b/desktop/kde/porting-aids/kmediaplayer/pspec.xml @@ -14,38 +14,47 @@ KMediaPlayer builds on the KParts framework to provide a common interface for KParts that can play media files. http://download.kde.org/stable/frameworks/5.11/portingAids/kmediaplayer-5.11.0.tar.xz - qt5-base-devel - extra-cmake-modules + qt5-base-devel + kio-devel + kauth-devel + kparts-devel + ktextwidgets-devel + sonnet-devel + kxmlgui-devel + extra-cmake-modules + cmake kmediaplayer - qt5-base - libgcc - kparts - kxmlgui + qt5-base + libgcc + kparts + kxmlgui - /usr/share - /usr/lib/qt5 - /usr/lib - /usr/share/doc + /usr/share + /usr/lib/qt5 + /usr/lib + /usr/share/doc kmediaplayer-devel - Development files for kmediaplayer + Development files for kmediaplayer - qt5-base-devel - kmediaplayer + kmediaplayer + qt5-base-devel + kparts-devel + kxmlgui-devel /usr/include /usr/lib/cmake - /usr/lib/pkgconfig + /usr/lib/pkgconfig