Merge branch 'master' of github.com:pisilinux/main

desktop/kde/framework/plasma-framework/pspec.xml

@@ -16,7 +16,7 @@
         <Archive sha1sum="497e7f9496492cbf627f1de9bdf01325986cbfaf" type="tarxz">http://download.kde.org/stable/frameworks/5.13/plasma-framework-5.13.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-            <Dependency>qt5-tools-devel</Dependency>
+            <!--<Dependency>qt5-tools-devel</Dependency>-->
             <Dependency>qt5-quickcontrols</Dependency>
             <Dependency>kdoctools-devel</Dependency>
             <Dependency>qt5-svg-devel</Dependency>

desktop/kde/phonon/qt5-phonon-backend-vlc/actions.py

@@ -1,3 +1,4 @@
+
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
@@ -6,10 +7,16 @@
 
 from pisi.actionsapi import kde5
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import get
 
 def setup():
-    kde5.configure("-DPHONON_BUILD_PHONON4QT5=ON \
+    kde5.configure("-DCMAKE_BUILD_TYPE=Release \
-                     -DCMAKE_INSTALL_LIBDIR=/usr/lib/qt5")
+                    -DCMAKE_SKIP_RPATH=ON \
+                    -DCMAKE_INSTALL_PREFIX=/usr \
+                    -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+                    -DPHONON_BUILD_PHONON4QT5=ON \
+                    -D__KDE_HAVE_GCC_VISIBILITY=NO \
+                    -DCMAKE_INSTALL_LIBDIR=lib")
 
 def build():
     kde5.make()

desktop/kde/phonon/qt5-phonon-backend-vlc/pspec.xml

@@ -15,7 +15,6 @@
         <Archive sha1sum="bc7d57d3ecce0293b77b88eba94d091741d33e78" type="tarxz">mirrors://kde/stable/phonon/phonon-backend-vlc/0.8.2/src/phonon-backend-vlc-0.8.2.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-            <Dependency>automoc4</Dependency>
             <Dependency>qt5-phonon-devel</Dependency>
             <Dependency>pulseaudio</Dependency>
             <Dependency>vlc-devel</Dependency>
@@ -25,6 +24,7 @@
     <Package>
         <Name>qt5-phonon-backend-vlc</Name>
         <RuntimeDependencies>
+            <Dependency>libgcc</Dependency>
             <Dependency>qt5-base</Dependency>	    
             <Dependency>qt5-phonon</Dependency>
             <Dependency>vlc-libs</Dependency>

desktop/kde/porting-aids/kdelibs4-support/pspec.xml

@@ -16,7 +16,6 @@
         <Archive sha1sum="928a9b65f14f308d967ff56b08784951969976d8" type="tarxz">http://download.kde.org/stable/frameworks/5.13/portingAids/kdelibs4support-5.13.0.tar.xz</Archive>
         <BuildDependencies>
              <Dependency>qt5-base-devel</Dependency>
-             <Dependency>qt5-tools-devel</Dependency>
              <Dependency>qt5-svg-devel</Dependency>
              <Dependency>perl-URI</Dependency>
              <Dependency>libSM-devel</Dependency>

desktop/kde/porting-aids/kjsembed/pspec.xml

@@ -16,7 +16,7 @@
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>qt5-svg-devel</Dependency>
-            <Dependency>qt5-tools-devel</Dependency>
+            <Dependency>qt5-designer-devel</Dependency>
             <Dependency>kdoctools-devel</Dependency>
             <Dependency>ki18n-devel</Dependency>
             <Dependency>kjs-devel</Dependency>

desktop/kde/porting-aids/kross/pspec.xml

@@ -16,7 +16,6 @@
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>qt5-script-devel</Dependency>
-            <Dependency>qt5-tools-devel</Dependency>
             <Dependency>kcoreaddons-devel</Dependency>
             <Dependency>kdoctools-devel</Dependency>
             <Dependency>kconfigwidgets-devel</Dependency>