Merge pull request #715 from aydemir/master

kanagram
This commit is contained in:
yusuf
2015-10-30 17:40:45 +02:00
13 changed files with 40 additions and 53 deletions
+8 -11
View File
@@ -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>
+3 -3
View File
@@ -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>
+2 -5
View File
@@ -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>
+5 -8
View File
@@ -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>
+12 -13
View File
@@ -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>
+3 -3
View File
@@ -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")
+1 -3
View File
@@ -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 -->
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -66,4 +66,4 @@
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>
-1
View File
@@ -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>
+2 -2
View File
@@ -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>