Merge pull request #332 from ertugerata/plasma-5.4

fix for Plasma 5.4
This commit is contained in:
Ertuğrul Erata
2015-08-26 16:53:13 +03:00
5 changed files with 28 additions and 30 deletions
+4 -4
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA> <IsA>library</IsA>
<Summary>Qt wrapper for KDE 5 Bluez DBus API</Summary> <Summary>Qt wrapper for KDE 5 Bluez DBus API</Summary>
<Description>Qt wrapper for KDE 5 DBus API.</Description> <Description>Qt wrapper for KDE 5 DBus API.</Description>
<Archive sha1sum="c897f80c8400101b28be3f9ad1250a8c03cd6901" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/bluez-qt-5.3.2.tar.xz</Archive> <Archive sha1sum="736af3076b2b6cb9c8dc13fc91eceb96bdbfb692" type="tarxz">http://download.kde.org/stable/frameworks/5.13/bluez-qt-5.13.0.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>bluez</Dependency> <Dependency>bluez</Dependency>
<Dependency>bluez-libs-devel</Dependency> <Dependency>bluez-libs-devel</Dependency>
@@ -53,9 +53,9 @@
<History> <History>
<Update release="3"> <Update release="3">
<Date>2015-08-17</Date> <Date>2015-08-26</Date>
<Version>5.3.2</Version> <Version>5.13.0</Version>
<Comment>Rebuild for new bluez.</Comment> <Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name> <Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email> <Email>ertugrulerata@gmail.com</Email>
</Update> </Update>
+3 -1
View File
@@ -19,7 +19,7 @@
<Dependency>qt5-declarative</Dependency> <Dependency>qt5-declarative</Dependency>
<Dependency>kded-devel</Dependency> <Dependency>kded-devel</Dependency>
<Dependency>plasma-framework-devel</Dependency> <Dependency>plasma-framework-devel</Dependency>
<Dependency>bluez-qt-devel</Dependency> <Dependency versionFrom="5.13.0">bluez-qt-devel</Dependency>
<Dependency>kio-devel</Dependency> <Dependency>kio-devel</Dependency>
<Dependency>ki18n-devel</Dependency> <Dependency>ki18n-devel</Dependency>
<Dependency>kconfig-devel</Dependency> <Dependency>kconfig-devel</Dependency>
@@ -28,6 +28,7 @@
<Dependency>kdbusaddons-devel</Dependency> <Dependency>kdbusaddons-devel</Dependency>
<Dependency>kiconthemes-devel</Dependency> <Dependency>kiconthemes-devel</Dependency>
<Dependency>kconfigwidgets-devel</Dependency> <Dependency>kconfigwidgets-devel</Dependency>
<Dependency>kwindowsystem-devel</Dependency>
<Dependency>knotifications-devel</Dependency> <Dependency>knotifications-devel</Dependency>
<Dependency>kwidgetsaddons-devel</Dependency> <Dependency>kwidgetsaddons-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules</Dependency>
@@ -50,6 +51,7 @@
<Dependency>kiconthemes</Dependency> <Dependency>kiconthemes</Dependency>
<Dependency>kconfigwidgets</Dependency> <Dependency>kconfigwidgets</Dependency>
<Dependency>knotifications</Dependency> <Dependency>knotifications</Dependency>
<Dependency>kwindowsystem</Dependency>
<Dependency>kwidgetsaddons</Dependency> <Dependency>kwidgetsaddons</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
-3
View File
@@ -17,8 +17,6 @@
<BuildDependencies> <BuildDependencies>
<Dependency>qt5-base-devel</Dependency> <Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-declarative</Dependency> <Dependency>qt5-declarative</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>kdoctools-devel</Dependency> <Dependency>kdoctools-devel</Dependency>
<Dependency>kdeclarative-devel</Dependency> <Dependency>kdeclarative-devel</Dependency>
<Dependency>ki18n-devel</Dependency> <Dependency>ki18n-devel</Dependency>
@@ -28,7 +26,6 @@
<Dependency>kservice-devel</Dependency> <Dependency>kservice-devel</Dependency>
<Dependency>kcoreaddons-devel</Dependency> <Dependency>kcoreaddons-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
@@ -11,7 +11,6 @@ def setup():
cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \
-DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \
-DLIB_INSTALL_DIR=lib \ -DLIB_INSTALL_DIR=lib \
-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-DQML_INSTALL_DIR=lib/qt5/qml \ -DQML_INSTALL_DIR=lib/qt5/qml \
-DQT_PLUGIN_INSTALL_DIR=lib/qt5/plugins \ -DQT_PLUGIN_INSTALL_DIR=lib/qt5/plugins \
-DSYSCONF_INSTALL_DIR=/etc \ -DSYSCONF_INSTALL_DIR=/etc \