Merge pull request #1046 from alihanozturk/master

kanagram:add dep
2016-01-07 23:19:07 +02:00
parent 89ffba9604 6a4d1d5f3f
commit b87cbd1cd8
4 changed files with 29 additions and 6 deletions
@@ -31,6 +31,7 @@
            <Dependency>kwidgetsaddons-devel</Dependency>
            <Dependency>extra-cmake-modules</Dependency>
            <Dependency>libkeduvocdocument-devel</Dependency>
+            <Dependency>qt5-multimedia-devel</Dependency>
        </BuildDependencies>
    </Source>

@@ -46,6 +47,7 @@
            <Dependency>knewstuff</Dependency>
            <Dependency>kcoreaddons</Dependency>
            <Dependency>kdeclarative</Dependency>
+            <Dependency>qt5-multimedia</Dependency>
            <Dependency>kconfigwidgets</Dependency>
            <Dependency>qt5-declarative</Dependency>
            <Dependency>libkeduvocdocument</Dependency>
@@ -16,15 +16,14 @@
        <BuildDependencies>
            <Dependency>qt5-base-devel</Dependency>
            <Dependency>qt5-multimedia-devel</Dependency>
-            <Dependency>qt5-multimedia</Dependency><!--düzenlenecek-->
            <Dependency>qt5-sql-mysql</Dependency>
            <Dependency>qt5-sql-sqlite</Dependency>
            <Dependency>qt5-sql-odbc</Dependency>
            <Dependency>qt5-sql-postgresql</Dependency>
-            <Dependency versionFrom="5.13">kfilemetadata-devel</Dependency>
+            <Dependency>kfilemetadata-devel</Dependency>
            <Dependency>kdeclarative-devel</Dependency>
-            <Dependency versionFrom="5.13">plasma-framework-devel</Dependency>
-            <Dependency versionFrom="5.13">baloo-devel</Dependency>
+            <Dependency>plasma-framework-devel</Dependency>
+            <Dependency>baloo-devel</Dependency>
            <Dependency>extra-cmake-modules</Dependency>
        </BuildDependencies>
    </Source>
@@ -33,9 +32,9 @@
        <Name>plasma-mediacenter</Name>
        <RuntimeDependencies>
            <Dependency>qt5-base</Dependency>
-            <Dependency versionFrom="5.13">baloo</Dependency>
+            <Dependency>baloo</Dependency>
            <Dependency>libgcc</Dependency>
-            <Dependency versionFrom="5.13">kfilemetadata</Dependency>
+            <Dependency>kfilemetadata</Dependency>
            <Dependency>kcoreaddons</Dependency>
            <Dependency>kactivities</Dependency>
            <Dependency>qt5-declarative</Dependency>
@@ -45,6 +44,11 @@
            <Dependency>ki18n</Dependency>
            <Dependency>kio</Dependency>
            <Dependency>taglib</Dependency>
+            <Dependency>qt5-multimedia</Dependency>
+            <Dependency>plasma-workspace</Dependency>
+            <Dependency>plasma-desktop</Dependency>
+            <Dependency>plasma-framework</Dependency>
+            <Dependency>ffmpegthumbs</Dependency>
    </RuntimeDependencies>
        <Files>
            <Path fileType="data">/usr/share</Path>
@@ -0,0 +1,13 @@
+diff --git a/daemon/BackendConfig.cmake b/daemon/BackendConfig.cmake
+index 54094e0..c9e4dc5 100644
+--- a/daemon/BackendConfig.cmake
+++ b/daemon/BackendConfig.cmake
+@@ -18,6 +18,8 @@ if (UDEV_FOUND)
+         backends/upower/udevqtdevice.cpp
+     )
+ 
+    add_definitions(-DHAVE_UDEV)
+
+     set_source_files_properties(
+     ${CMAKE_CURRENT_SOURCE_DIR}/backends/upower/dbus/org.freedesktop.UPower.xml
+     ${CMAKE_CURRENT_SOURCE_DIR}/backends/upower/dbus/org.freedesktop.UPower.Device.xml
@@ -29,6 +29,9 @@
            <Dependency versionFrom="5.5.2">plasma-workspace-devel</Dependency>
            <Dependency>extra-cmake-modules</Dependency>
        </BuildDependencies>
+        <Patches>
+            <Patch level="1">powerdevil-enable-upower.patch</Patch>
+        </Patches>
    </Source>

    <Package>
@@ -47,6 +50,7 @@
            <Dependency>kconfig</Dependency>
            <Dependency>kxmlgui</Dependency>
            <Dependency>kservice</Dependency>
+            <Dependency>kwayland</Dependency>
            <Dependency>qt5-x11extras</Dependency>
            <Dependency>libkscreen</Dependency>
            <Dependency>kactivities</Dependency>