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

This commit is contained in:
Rmys
2020-02-03 20:03:58 +03:00
23 changed files with 199 additions and 129 deletions
@@ -43,6 +43,7 @@
<Dependency>kitemmodels-devel</Dependency>
<Dependency>kdesignerplugin</Dependency>
<Dependency>kio-devel</Dependency>
<Dependency>libaccounts-qt5-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
</BuildDependencies>
<Patches>
@@ -75,11 +76,13 @@
<Dependency>mariadb-server</Dependency>
<Dependency>kdesignerplugin</Dependency>
<Dependency>postgresql-server</Dependency>
<Dependency>libaccounts-qt5</Dependency>
<Dependency versionFrom="5.7.1">qt5-sql-mysql</Dependency>
<Dependency versionFrom="5.7.1">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.7.1">qt5-sql-postgresql</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="config">/etc/xdg</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
@@ -41,6 +41,7 @@
<Dependency>R-devel</Dependency>
<Dependency>luajit-devel</Dependency>
<Dependency>syntax-highlighting-devel</Dependency>
<Dependency>poppler-qt5-devel</Dependency>
</BuildDependencies>
</Source>
@@ -15,4 +15,4 @@ def build():
def install():
kde5.install()
pisitools.dodoc("COPYING", "TODO", "README")
pisitools.dodoc("COPYING", "README")
@@ -1,7 +1,7 @@
diff -Nuar a/kate/main.cpp b/kate/main.cpp
--- a/kate/main.cpp 2018-10-03 20:00:34.000000000 +0300
+++ b/kate/main.cpp 2018-10-13 09:30:25.415054269 +0300
@@ -52,26 +52,9 @@
--- a/kate/main.cpp 2020-01-06 21:00:06.000000000 +0300
+++ b/kate/main.cpp 2020-02-03 19:10:43.509887401 +0300
@@ -50,25 +50,8 @@
#include "qtsingleapplication/qtsingleapplication.h"
#endif
@@ -10,7 +10,6 @@ diff -Nuar a/kate/main.cpp b/kate/main.cpp
-#endif
-#include <iostream>
-
int main(int argc, char **argv)
{
-#ifndef Q_OS_WIN
@@ -1,7 +1,7 @@
diff -Nuar a/kwrite/main.cpp b/kwrite/main.cpp
--- a/kwrite/main.cpp 2019-04-09 10:03:07.000000000 +0300
+++ b/kwrite/main.cpp 2019-04-18 21:54:45.688862069 +0300
@@ -43,25 +43,8 @@
--- a/kwrite/main.cpp 2020-01-06 21:00:06.000000000 +0300
+++ b/kwrite/main.cpp 2020-02-03 19:11:37.589883499 +0300
@@ -44,25 +44,8 @@
#include "../urlinfo.h"
@@ -24,6 +24,6 @@ diff -Nuar a/kwrite/main.cpp b/kwrite/main.cpp
- }
- }
-#endif
/**
* Create application first
* Enforce application name even if the executable is renamed
* enable high dpi support
+8 -1
View File
@@ -13,7 +13,7 @@
<IsA>app:gui</IsA>
<Summary>Address book API for KDE.</Summary>
<Description>Address book for KDE for Contacts.</Description>
<Archive sha1sum="ede415c4288cd3c3a1ca6c4d85e0fe4b433ac830" type="tarxz">mirrors://kde/stable/applications/19.08.3/src/kcontacts-19.08.3.tar.xz</Archive>
<Archive sha1sum="d911891b2706dbc34733b11be3580793df787502" type="tarxz">https://download.kde.org/stable/frameworks/5.66/kcontacts-5.66.0.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
<Dependency>ki18n-devel</Dependency>
@@ -61,6 +61,13 @@
</Package>
<History>
<Update release="30">
<Date>2020-02-03</Date>
<Version>5.66.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="29">
<Date>2020-02-02</Date>
<Version>19.08.3</Version>
@@ -47,6 +47,7 @@
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="config">/etc</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="doc">/usr/share/doc</Path>
@@ -31,6 +31,7 @@
<Dependency>kwidgetsaddons-devel</Dependency>
<Dependency>kdoctools-devel</Dependency>
<Dependency>kwidgetsaddons-devel</Dependency>
<Dependency>qca2-qt5-devel</Dependency>
</BuildDependencies>
</Source>
@@ -22,6 +22,7 @@
<Dependency>ki18n-devel</Dependency>
<Dependency>cmake</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>qca2-qt5-devel</Dependency>
</BuildDependencies>
</Source>
@@ -37,6 +37,7 @@
<Dependency>kemoticons-devel</Dependency>
<Dependency>kitemmodels-devel</Dependency>
<Dependency>kunitconversion-devel</Dependency>
<Dependency>llvm</Dependency>
<Dependency>llvm-clang-devel</Dependency>
</BuildDependencies>
<!--Patches>
+2
View File
@@ -31,6 +31,7 @@
<Dependency>extra-cmake-modules</Dependency>
<Dependency>plasma-framework-devel</Dependency>
<Dependency versionFrom="5.50.0">kdeclarative-devel</Dependency>
<Dependency versionFrom="5.55.0">kcmutils-devel</Dependency>
</BuildDependencies>
</Source>
@@ -50,6 +51,7 @@
<Dependency>ki18n</Dependency>
<Dependency>kxmlgui</Dependency>
<Dependency>kdeclarative</Dependency>
<Dependency versionFrom="5.66.0">kcmutils</Dependency>
<Dependency>plasma-framework</Dependency>
</RuntimeDependencies>
<Files>