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

2015-10-30 21:17:48 +03:00
parent f895129611 b92f335e8f
commit 2bf16d9390
15 changed files with 63 additions and 88 deletions
@@ -1,66 +1,62 @@
-<?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
    <Source>
        <Name>baloo-widgets</Name>
        <Homepage>http://www.kde.org</Homepage>
        <Packager>
-            <Name>Pisi Linux Admins</Name>
-            <Email>admin@pisilinux.org</Email>
+            <Name>Yusuf Aydemir</Name>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
        </Packager>
        <License>LGPLv2</License>
        <IsA>library</IsA>
        <IsA>app:console</IsA>
        <Summary>Framework for searching and managing metadata</Summary>
        <Description>Baloo is a framework for searching and managing metada</Description>
-        <Archive sha1sum="95a4e59632e0b1ea0ac30eb21b31bdd2071c5ad7" type="tarxz">mirrors://kde/stable/applications/15.08.2/src/baloo-widgets-15.08.2.tar.xz</Archive>
+        <Archive type="tarxz" sha1sum="95a4e59632e0b1ea0ac30eb21b31bdd2071c5ad7">mirrors://kde/stable/applications/15.08.2/src/baloo-widgets-15.08.2.tar.xz</Archive>
        <BuildDependencies>
-            <Dependency>qt5-base-devel</Dependency>
            <Dependency>baloo-devel</Dependency>
-            <Dependency>kdoctools-devel</Dependency>
-            <Dependency versionFrom="5.13">kfilemetadata-devel</Dependency>
-            <Dependency>kio-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
            <Dependency>kdelibs4-support-devel</Dependency>
            <Dependency>kdesignerplugin</Dependency>
+            <Dependency>kdoctools-devel</Dependency>
            <Dependency>kemoticons-devel</Dependency>
-            <Dependency>kunitconversion-devel</Dependency>
-            <Dependency>kitemmodels-devel</Dependency>
+            <Dependency versionFrom="5.15.0">kfilemetadata-devel</Dependency>
            <Dependency>kinit-devel</Dependency>
-            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>kio-devel</Dependency>
+            <Dependency>kitemmodels-devel</Dependency>
+            <Dependency>kunitconversion-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
        </BuildDependencies>
    </Source>
-
    <Package>
        <Name>baloo-widgets</Name>
+        <Summary>Development files for baloo-widgets</Summary>
        <RuntimeDependencies>
-            <Dependency>qt5-base</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>ki18n</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency>qt5-base</Dependency>
            <Dependency>baloo</Dependency>
            <Dependency>kconfig</Dependency>
-            <Dependency>kio</Dependency>
+            <Dependency>kcoreaddons</Dependency>
            <Dependency>kfilemetadata</Dependency>
+            <Dependency>ki18n</Dependency>
+            <Dependency>kio</Dependency>
+            <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>qt5-base</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="config">/etc</Path>
-            <Path fileType="data">/usr/share</Path>
-            <Path fileType="localedata">/usr/share/locale</Path>
            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib/qt5</Path>
            <Path fileType="library">/usr/lib</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="data">/usr/share</Path>
            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
        </Files>
    </Package>
-
    <Package>
        <Name>baloo-widgets-devel</Name>
        <Summary>Development files for baloo-widgets</Summary>
        <RuntimeDependencies>
-            <Dependency>qt5-base-devel</Dependency>
            <Dependency release="current">baloo-widgets</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="header">/usr/include</Path>
@@ -68,7 +64,6 @@
            <Path fileType="config">/usr/lib/pkgconfig</Path>
        </Files>
    </Package>
-
    <History>
        <Update release="3">
            <Date>2015-10-14</Date>
@@ -91,5 +86,5 @@
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-     </History>
+    </History>
 </PISI>
@@ -30,27 +30,24 @@
            <Dependency>kxmlgui</Dependency>
            <Dependency>kwidgetsaddons-devel</Dependency>
            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>libkeduvocdocument-devel</Dependency>
        </BuildDependencies>
    </Source>

    <Package>
        <Name>kanagram</Name>
        <RuntimeDependencies>
-            <Dependency>qt5-base</Dependency>
-            <Dependency>qt5-declarative</Dependency>
-            <Dependency>kdoctools</Dependency>
-            <Dependency>knewstuff</Dependency>
-            <Dependency>kdeclarative</Dependency>
-            <Dependency>libgcc</Dependency>
            <Dependency>ki18n</Dependency>
-            <Dependency>kio</Dependency>
-            <Dependency>kcrash</Dependency>
+            <Dependency>libgcc</Dependency>
            <Dependency>sonnet</Dependency>
            <Dependency>kconfig</Dependency>
-            <Dependency>kconfigwidgets</Dependency>
-            <Dependency>kcoreaddons</Dependency>
            <Dependency>kxmlgui</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>qt5-base</Dependency>
+            <Dependency>knewstuff</Dependency>
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>kdeclarative</Dependency>
+            <Dependency>kconfigwidgets</Dependency>
+            <Dependency>qt5-declarative</Dependency>
            <Dependency>libkeduvocdocument</Dependency>
        </RuntimeDependencies>
        <Files>
@@ -100,4 +100,4 @@
            <Email>groni@pisilinux.org</Email>
        </Update>
    </History>
-</PISI>
+</PISI>
@@ -54,7 +54,7 @@
            <Path fileType="doc">/usr/share/doc</Path>
        </Files>
    </Package>
-    
+
    <Package>
        <Name>kdewebkit-devel</Name>
        <Summary>Development files for kdewebkit</Summary>
@@ -112,6 +112,6 @@
            <Comment>First Release.</Comment>
            <Name>Stefan Gronewold(groni)</Name>
            <Email>groni@pisilinux.org</Email>
-        </Update>                
+        </Update>
    </History>
-</PISI>
+</PISI>
@@ -43,9 +43,6 @@
            <Dependency>docbook-xsl</Dependency>
            <Dependency>extra-cmake-modules</Dependency>
        </BuildDependencies>
-        <Patches>
-        <!--<Patch level="1">0001-Use-run-for-ksysguardd-s-pid-file.patch</Patch> -->
-        </Patches>
    </Source>

    <Package>
@@ -119,6 +116,6 @@
            <Comment>First Release.</Comment>
            <Name>Stefan Gronewold(groni)</Name>
            <Email>groni@pisilinux.org</Email>
-        </Update>                
+        </Update>
    </History>
-</PISI>
+</PISI>
@@ -24,10 +24,7 @@
            <Dependency>zlib-devel</Dependency>
            <Dependency>plasma-framework-devel</Dependency>
            <Dependency>extra-cmake-modules</Dependency>
-        </BuildDependencies>        
-        <Patches>
-            <!--<Patch level="1">libksysguard_kauth.diff</Patch> -->
-        </Patches>
+        </BuildDependencies>
    </Source>

    <Package>
@@ -57,7 +54,7 @@
            <Path fileType="doc">/usr/share/doc</Path>
        </Files>
    </Package>
-    
+
    <Package>
        <Name>libksysguard-devel</Name>
        <Summary>Development files for libksysguard</Summary>
@@ -81,7 +78,7 @@
            <Path fileType="header">/usr/include</Path>
            <Path fileType="data">/usr/lib/cmake</Path>
            <Path fileType="config">/usr/lib/pkgconfig</Path>
-        </Files>                
+        </Files>
    </Package>

    <History>
@@ -119,6 +116,6 @@
            <Comment>First Release.</Comment>
            <Name>Stefan Gronewold(groni)</Name>
            <Email>groni@pisilinux.org</Email>
-        </Update>                
+        </Update>
    </History>
-</PISI>
+</PISI>
@@ -17,9 +17,8 @@
        <Archive sha1sum="f2c9ca98b39f3e8b615feafedb620c6e05acb213" type="tarxz">mirrors://kde/stable/plasma/5.4.2/plasma-workspace-5.4.2.tar.xz</Archive>
        <BuildDependencies>
            <Dependency>baloo-devel</Dependency>
-            <!--Dependency>gpsd-devel</Dependency-->
            <Dependency>kactivities-devel</Dependency>
-            <Dependency versionFrom="5.4.2">kde-cli-tools</Dependency><!--2-->
+            <Dependency versionFrom="5.4.2">kde-cli-tools</Dependency>
            <Dependency>kdelibs4-support-devel</Dependency>
            <Dependency>kdesignerplugin</Dependency>
            <Dependency>kdesu-devel</Dependency>
@@ -83,7 +82,7 @@
            <Dependency>kcrash</Dependency>
            <Dependency>kdbusaddons</Dependency>
            <Dependency>kdeclarative</Dependency>
-	    <Dependency versionFrom="5.4.2">kde-cli-tools</Dependency><!--fazla ? -->
+            <Dependency versionFrom="5.4.2">kde-cli-tools</Dependency>
            <Dependency>kdelibs4-support</Dependency>
            <Dependency>kdesu</Dependency>
            <Dependency>kdewebkit</Dependency>
@@ -128,8 +127,8 @@
            <Dependency>pam</Dependency>
            <Dependency>prison-qt5</Dependency>
            <Dependency>plasma-framework</Dependency>
-            <Dependency>qt5-base</Dependency>    
-            <Dependency>qt5-declarative</Dependency>     
+            <Dependency>qt5-base</Dependency>
+            <Dependency>qt5-declarative</Dependency>
            <Dependency>qt5-phonon</Dependency>
            <Dependency>qt5-script</Dependency>
            <Dependency>qt5-webkit</Dependency>
@@ -144,7 +143,7 @@
        <Files>
            <Path fileType="config">/etc/pam.d</Path>
            <Path fileType="config">/etc/env.d</Path>
-            <Path fileType="config">/etc/xdg</Path>            
+            <Path fileType="config">/etc/xdg</Path>
            <Path fileType="data">/usr/share</Path>
            <Path fileType="applications">/usr/share/applications</Path>
            <Path fileType="localedata">/usr/share/locale</Path> 
@@ -160,7 +159,7 @@
            <AdditionalFile target="/etc/env.d/40Kde5" permission="0644" owner="root">kde-env.sh</AdditionalFile>
        </AdditionalFiles>
    </Package>
-    
+
    <Package>
        <Name>plasma-workspace-devel</Name>
        <Summary>Development files for kde5 plasma-workspace</Summary>
@@ -222,8 +221,8 @@
            <Dependency>networkmanager-qt-devel</Dependency>
            <Dependency>pam-devel</Dependency>
            <Dependency versionFrom="5.13">plasma-framework-devel</Dependency>
-            <Dependency>qt5-base-devel</Dependency>    
-            <Dependency>qt5-declarative-devel</Dependency>     
+            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-declarative-devel</Dependency>
            <Dependency>qt5-phonon-devel</Dependency>
            <Dependency>qt5-script-devel</Dependency>
            <Dependency>qt5-webkit-devel</Dependency>
@@ -239,7 +238,7 @@
            <Path fileType="config">/usr/lib/pkgconfig</Path>
        </Files>
    </Package>
-    
+
    <Package>
        <Name>drkonqi</Name>
        <Summary>KDE crash handler</Summary>
@@ -252,7 +251,7 @@
            <Path fileType="executable">/usr/lib/libexec</Path>
        </Files>
    </Package>
-    
+
    <History>
        <Update release="5">
            <Date>2015-10-28</Date>
@@ -288,6 +287,6 @@
            <Comment>First Release.</Comment>
            <Name>Stefan Gronewold(groni)</Name>
            <Email>groni@pisilinux.org</Email>
-        </Update>                
+        </Update>
    </History>
-</PISI>
+</PISI>
@@ -34,17 +34,17 @@ def build():
    shelltools.system("cp -rf Python Python3")
    shelltools.cd("Qt4Qt5")
    qt5.make()
-    
+
    shelltools.cd("../designer-Qt4Qt5/")
    qt5.make()
-    
+
    # Get Makefile of qscintilla-python via sip
    shelltools.cd("../Python")
    pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5 -c --pyqt=PyQt5 --pyqt-sipdir=/usr/share/sip/Py2Qt5 --qsci-sipdir=/usr/share/sip/Py2Qt5 --sip-incdir=/usr/lib/python2.7/site-packages --qmake /usr/bin/qmake-qt5")
    pisitools.dosed("Makefile", "/usr/include/qt/QtPrintSupport", "/usr/include/qt5/QtPrintSupport")
    pisitools.dosed("Makefile", "/usr/include/qt/QtWidgets", "/usr/include/qt5/QtWidgets")
    autotools.make()
-    
+
    shelltools.cd("../Python3")
    pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5 -c --pyqt=PyQt5 --qmake /usr/bin/qmake-qt5", pyVer = "3")
    pisitools.dosed("Makefile", "/usr/include/qt/QtPrintSupport", "/usr/include/qt5/QtPrintSupport")
@@ -25,7 +25,7 @@
            <Dependency>qt5-script-devel</Dependency>
            <Dependency>qt5-xmlpatterns-devel</Dependency>
            <Dependency>mesa-devel</Dependency>
-        </BuildDependencies>        
+        </BuildDependencies>
        <Patches>
            <Patch>configure.py.patch</Patch>
            <Patch>libname.patch</Patch>
@@ -138,5 +138,3 @@
        </Update>
    </History>
 </PISI>
-
-<!-- By PiSiDo 2.3.1 -->
@@ -37,7 +37,6 @@
            <Dependency>zlib-devel</Dependency>
            <Dependency>libxslt-devel</Dependency>
            <Dependency>libxml2-devel</Dependency>
-            <!--Dependency>leveldb-devel</Dependency-->
            <Dependency>libXcomposite-devel</Dependency>
            <Dependency>libX11-devel</Dependency>
            <Dependency>libXrender-devel</Dependency>
@@ -49,10 +48,6 @@
            <Dependency>flex</Dependency>
            <Dependency>qt5-phonon-devel</Dependency>
        </BuildDependencies>
-
-        <Patches>
-            <!--<Patch level="2">glib.patch</Patch>-->
-        </Patches>
    </Source>

    <Package>
@@ -84,7 +79,6 @@
            <Dependency>libjpeg-turbo</Dependency>
            <Dependency>gstreamer</Dependency>
            <Dependency>gst-plugins-base</Dependency>
-            <!--Dependency>qt5-webchannel</Dependency-->
            <Dependency>qt5-declarative</Dependency>
        </RuntimeDependencies>
    </Package>
@@ -114,7 +108,6 @@
            <Dependency>libjpeg-turbo-devel</Dependency>
            <Dependency>gstreamer-devel</Dependency>
            <Dependency>gst-plugins-base-devel</Dependency>
-            <!--Dependency>qt5-webchannel</Dependency-->
            <Dependency>qt5-declarative-devel</Dependency>
        </RuntimeDependencies>
    </Package>
@@ -142,4 +135,4 @@
            <Email>ayhanyalcinsoy@pisilinux.org</Email>
        </Update>
    </History>
-</PISI>
+</PISI>
@@ -55,4 +55,4 @@
            <Email>admins@pisilinux.org</Email>
        </Update>
    </History>
-</PISI>
+</PISI>
@@ -84,4 +84,4 @@
            <Email>admins@pisilinux.org</Email>
        </Update>
    </History>
-</PISI>
+</PISI>
@@ -66,4 +66,4 @@
            <Email>admins@pisilinux.org</Email>
        </Update>
    </History>
-</PISI>
+</PISI>
@@ -14,7 +14,6 @@
        <Description>Tool to convert pnm data to ppa data for Hp Deskjet 710, 712, 720, 722, 820, 1000 series printer drivers.</Description>
        <Archive type="targz" sha1sum="3de33786e9d3f35a73d7e4acb5281f30654cef7c">mirrors://sourceforge/pnm2ppa/pnm2ppa-1.13.tar.gz</Archive>
        <Patches>
-<!--             <Patch>pnm2ppa-1.12-pisilinux.diff</Patch> -->
            <Patch level="1">pnm2ppa-default_config.patch</Patch>
        </Patches>
    </Source>
@@ -50,7 +50,7 @@

    <History>
        <Update release="5">
-            <Date>2015-10-28</Date>
+            <Date>2015-10-30</Date>
            <Version>5.1.3</Version>
            <Comment>Version bump.</Comment>
            <Name>Ayhan Yalçınsoy</Name>
@@ -85,4 +85,4 @@
            <Email>marcin@pisilinux.org</Email>
        </Update>
    </History>
-</PISI>
+</PISI>