From be995d4882cc753ae7ae12a0af01a29ef0393d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Tue, 18 Aug 2015 19:15:10 +0300 Subject: [PATCH 1/3] change deps for separed qt5-tools --- desktop/toolkit/qt5/qt5-doc/pspec.xml | 3 ++- desktop/toolkit/qt5/qt5-serialport/pspec.xml | 2 +- desktop/toolkit/qt5/qt5-translations/pspec.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/desktop/toolkit/qt5/qt5-doc/pspec.xml b/desktop/toolkit/qt5/qt5-doc/pspec.xml index e351e423b7..b23649afc7 100644 --- a/desktop/toolkit/qt5/qt5-doc/pspec.xml +++ b/desktop/toolkit/qt5/qt5-doc/pspec.xml @@ -15,7 +15,8 @@ http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtdoc-opensource-src-5.4.2.tar.xz qt5-base-devel - qt5-tools-devel + qt5-sql-sqlite + qt5-assistant diff --git a/desktop/toolkit/qt5/qt5-serialport/pspec.xml b/desktop/toolkit/qt5/qt5-serialport/pspec.xml index 2f0202044b..5010f1869f 100644 --- a/desktop/toolkit/qt5/qt5-serialport/pspec.xml +++ b/desktop/toolkit/qt5/qt5-serialport/pspec.xml @@ -15,7 +15,7 @@ qt5-base-devel eudev-devel - qt5-tools-devel + diff --git a/desktop/toolkit/qt5/qt5-translations/pspec.xml b/desktop/toolkit/qt5/qt5-translations/pspec.xml index 8fc17745eb..a2f85b1e16 100644 --- a/desktop/toolkit/qt5/qt5-translations/pspec.xml +++ b/desktop/toolkit/qt5/qt5-translations/pspec.xml @@ -14,7 +14,7 @@ http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qttranslations-opensource-src-5.4.2.tar.xz qt5-base-devel - qt5-tools-devel + qt5-linguist From 57558c24997ce042f4e428ef7a12f5bf0d7255cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Tue, 18 Aug 2015 21:53:25 +0300 Subject: [PATCH 2/3] fix deps separed qt5-tools. --- desktop/kde/framework/kconfig/pspec.xml | 2 +- desktop/kde/framework/kwindowsystem/pspec.xml | 2 +- desktop/kde/framework/solid/actions.py | 3 +++ desktop/kde/framework/solid/pspec.xml | 2 +- desktop/kde/framework/sonnet/pspec.xml | 2 +- desktop/kde/phonon/qt5-phonon/pspec.xml | 6 +++--- desktop/toolkit/qt5/qt5-doc/pspec.xml | 2 +- desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml | 2 +- desktop/toolkit/qt5/qt5-serialport/pspec.xml | 1 - 9 files changed, 12 insertions(+), 10 deletions(-) diff --git a/desktop/kde/framework/kconfig/pspec.xml b/desktop/kde/framework/kconfig/pspec.xml index db6122c6d3..a02a5ccf12 100755 --- a/desktop/kde/framework/kconfig/pspec.xml +++ b/desktop/kde/framework/kconfig/pspec.xml @@ -17,7 +17,7 @@ http://download.kde.org/stable/frameworks/5.13/kconfig-5.13.0.tar.xz qt5-base-devel - qt5-tools-devel + qt5-linguist extra-cmake-modules diff --git a/desktop/kde/framework/kwindowsystem/pspec.xml b/desktop/kde/framework/kwindowsystem/pspec.xml index db9057a1f0..be57535cb7 100755 --- a/desktop/kde/framework/kwindowsystem/pspec.xml +++ b/desktop/kde/framework/kwindowsystem/pspec.xml @@ -16,7 +16,7 @@ http://download.kde.org/stable/frameworks/5.13/kwindowsystem-5.13.0.tar.xz qt5-base-devel - qt5-tools-devel + qt5-linguist qt5-x11extras-devel libX11-devel libgcc diff --git a/desktop/kde/framework/solid/actions.py b/desktop/kde/framework/solid/actions.py index 5dc89c38d1..9d75318d04 100755 --- a/desktop/kde/framework/solid/actions.py +++ b/desktop/kde/framework/solid/actions.py @@ -12,6 +12,9 @@ def setup(): -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ -DQML_INSTALL_DIR=lib/qt5/qml \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DWITH_NEW_POWER_ASYNC_API=ON \ + -DWITH_NEW_POWER_ASYNC_FREEDESKTOP=ON \ + -DWITH_NEW_SOLID_JOB=ON \ -DLIB_INSTALL_DIR=lib \ -DBUILD_TESTING=OFF") diff --git a/desktop/kde/framework/solid/pspec.xml b/desktop/kde/framework/solid/pspec.xml index d568ddd266..0a19a64456 100755 --- a/desktop/kde/framework/solid/pspec.xml +++ b/desktop/kde/framework/solid/pspec.xml @@ -17,7 +17,7 @@ qt5-base-devel eudev-devel - qt5-tools-devel + qt5-linguist qt5-declarative-devel udisks2-devel upower-devel diff --git a/desktop/kde/framework/sonnet/pspec.xml b/desktop/kde/framework/sonnet/pspec.xml index 25bff8ff0f..11b0d8ad80 100644 --- a/desktop/kde/framework/sonnet/pspec.xml +++ b/desktop/kde/framework/sonnet/pspec.xml @@ -16,7 +16,7 @@ http://download.kde.org/stable/frameworks/5.13/sonnet-5.13.0.tar.xz qt5-base-devel - qt5-tools-devel + qt5-linguist hunspell-devel aspell-devel extra-cmake-modules diff --git a/desktop/kde/phonon/qt5-phonon/pspec.xml b/desktop/kde/phonon/qt5-phonon/pspec.xml index f916e4b370..3ecb8dbf16 100644 --- a/desktop/kde/phonon/qt5-phonon/pspec.xml +++ b/desktop/kde/phonon/qt5-phonon/pspec.xml @@ -15,7 +15,7 @@ mirrors://kde/stable/phonon/4.8.3/src/phonon-4.8.3.tar.xz qt5-base-devel - qt5-tools-devel + qt5-designer-devel qt5-quick1-devel alsa-lib-devel gst-plugins-base-devel @@ -34,7 +34,7 @@ libgcc qt5-base - qt5-tools + qt5-designer qt5-quick1 pulseaudio-libs @@ -51,7 +51,7 @@ qt5-phonon qt5-base-devel - qt5-tools-devel + qt5-designer-devel pulseaudio-libs-devel diff --git a/desktop/toolkit/qt5/qt5-doc/pspec.xml b/desktop/toolkit/qt5/qt5-doc/pspec.xml index b23649afc7..eda2855e0a 100644 --- a/desktop/toolkit/qt5/qt5-doc/pspec.xml +++ b/desktop/toolkit/qt5/qt5-doc/pspec.xml @@ -27,7 +27,7 @@ qt5-script qt5-svg qt5-xmlpatterns - qt5-tools + qt5-assistant qt5-declarative diff --git a/desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml b/desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml index 1e0d8d7d1f..93231988bd 100644 --- a/desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml +++ b/desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml @@ -15,7 +15,7 @@ qt5-base-devel qt5-declarative-devel - qt5-tools + qt5-assistant qt5-sql-sqlite diff --git a/desktop/toolkit/qt5/qt5-serialport/pspec.xml b/desktop/toolkit/qt5/qt5-serialport/pspec.xml index 5010f1869f..edaf5a1b7d 100644 --- a/desktop/toolkit/qt5/qt5-serialport/pspec.xml +++ b/desktop/toolkit/qt5/qt5-serialport/pspec.xml @@ -15,7 +15,6 @@ qt5-base-devel eudev-devel - From aca770f6016295a3725920b4463255a59f5b58ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Tue, 18 Aug 2015 22:26:56 +0300 Subject: [PATCH 3/3] fix deps for qt5-tools --- desktop/kde/framework/kcodecs/pspec.xml | 2 +- desktop/kde/framework/kcoreaddons/pspec.xml | 2 +- desktop/kde/framework/kdbusaddons/pspec.xml | 2 +- desktop/kde/framework/kdnssd/pspec.xml | 2 +- desktop/kde/framework/kitemviews/pspec.xml | 3 +-- desktop/kde/framework/kwidgetsaddons/pspec.xml | 3 ++- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/desktop/kde/framework/kcodecs/pspec.xml b/desktop/kde/framework/kcodecs/pspec.xml index 7d686c98ba..b9613a8a78 100755 --- a/desktop/kde/framework/kcodecs/pspec.xml +++ b/desktop/kde/framework/kcodecs/pspec.xml @@ -15,7 +15,7 @@ http://download.kde.org/stable/frameworks/5.13/kcodecs-5.13.0.tar.xz qt5-base-devel - qt5-tools-devel + qt5-linguist extra-cmake-modules diff --git a/desktop/kde/framework/kcoreaddons/pspec.xml b/desktop/kde/framework/kcoreaddons/pspec.xml index 400531db77..dae7a0bace 100755 --- a/desktop/kde/framework/kcoreaddons/pspec.xml +++ b/desktop/kde/framework/kcoreaddons/pspec.xml @@ -16,7 +16,7 @@ http://download.kde.org/stable/frameworks/5.13/kcoreaddons-5.13.0.tar.xz qt5-base-devel - qt5-tools-devel + qt5-linguist shared-mime-info extra-cmake-modules diff --git a/desktop/kde/framework/kdbusaddons/pspec.xml b/desktop/kde/framework/kdbusaddons/pspec.xml index 254c1b033c..ff1180deee 100755 --- a/desktop/kde/framework/kdbusaddons/pspec.xml +++ b/desktop/kde/framework/kdbusaddons/pspec.xml @@ -16,7 +16,7 @@ http://download.kde.org/stable/frameworks/5.13/kdbusaddons-5.13.0.tar.xz qt5-base-devel - qt5-tools-devel + qt5-linguist qt5-x11extras-devel extra-cmake-modules diff --git a/desktop/kde/framework/kdnssd/pspec.xml b/desktop/kde/framework/kdnssd/pspec.xml index 48a2b66a24..67de429747 100644 --- a/desktop/kde/framework/kdnssd/pspec.xml +++ b/desktop/kde/framework/kdnssd/pspec.xml @@ -15,7 +15,7 @@ http://download.kde.org/stable/frameworks/5.13/kdnssd-5.13.0.tar.xz qt5-base-devel - qt5-tools + qt5-linguist avahi-devel avahi-compat-libdns_sd-devel extra-cmake-modules diff --git a/desktop/kde/framework/kitemviews/pspec.xml b/desktop/kde/framework/kitemviews/pspec.xml index 609f262d07..84ee85dfec 100755 --- a/desktop/kde/framework/kitemviews/pspec.xml +++ b/desktop/kde/framework/kitemviews/pspec.xml @@ -16,8 +16,7 @@ http://download.kde.org/stable/frameworks/5.13/kitemviews-5.13.0.tar.xz qt5-base-devel - libgcc - qt5-tools-devel + qt5-linguist extra-cmake-modules diff --git a/desktop/kde/framework/kwidgetsaddons/pspec.xml b/desktop/kde/framework/kwidgetsaddons/pspec.xml index 45e68f9683..0938daf7a7 100755 --- a/desktop/kde/framework/kwidgetsaddons/pspec.xml +++ b/desktop/kde/framework/kwidgetsaddons/pspec.xml @@ -16,7 +16,8 @@ http://download.kde.org/stable/frameworks/5.13/kwidgetsaddons-5.13.0.tar.xz qt5-base-devel - qt5-tools-devel + qt5-linguist + qt5-designer-devel extra-cmake-modules