Merge branch 'master' into master

This commit is contained in:
groni
2017-03-19 12:47:30 +01:00
committed by GitHub
103 changed files with 123591 additions and 122574 deletions
+15
View File
@@ -236,6 +236,14 @@
<Dependency>glib2</Dependency>
<Dependency>libxcb</Dependency>
<Dependency>icu4c-32bit</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>cups</Dependency>
<Dependency>dbus</Dependency>
<Dependency>gtk2-32bit</Dependency>
<Dependency>mesa</Dependency>
<Dependency>zlib</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libxcb</Dependency>
<Dependency>pango</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libdrm</Dependency>
@@ -256,6 +264,13 @@
</Package>
<History>
<Update release="7">
<Date>2017-03-18</Date>
<Version>5.7.1</Version>
<Comment>Rebuild.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2017-03-19</Date>
<Version>5.7.1</Version>
+4 -4
View File
@@ -16,7 +16,7 @@
<BuildDependencies>
<Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-declarative-devel</Dependency>
<Dependency>qt5-quick1-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-quickcontrols2-devel</Dependency>
<Dependency versionFrom="2.50.2">glib2-devel</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
<Dependency>cmake</Dependency>
@@ -36,7 +36,7 @@
<RuntimeDependencies>
<Dependency versionFrom="5.7.1">qt5-base</Dependency>
<Dependency versionFrom="5.7.1">qt5-declarative</Dependency>
<Dependency>qt5-quick1</Dependency>
<!-- <Dependency>qt5-quick1</Dependency> -->
<Dependency>gstreamer-next</Dependency>
<Dependency versionFrom="1.10.3">gst-plugins-base-next</Dependency>
<Dependency versionFrom="13.0.4">mesa</Dependency>
@@ -70,9 +70,9 @@
<History>
<Update release="6">
<Date>2017-02-20</Date>
<Date>2017-03-19</Date>
<Version>1.2.0</Version>
<Comment>Rebuild for new Toolchain</Comment>
<Comment>Rebuild for new Toolchain.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
+8 -1
View File
@@ -70,6 +70,13 @@
</Package>
-->
<History>
<Update release="6">
<Date>2017-03-19</Date>
<Version>5.5.1</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2016-10-22</Date>
<Version>5.5.1</Version>
@@ -106,4 +113,4 @@
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>
+7
View File
@@ -46,6 +46,13 @@
</Files>
</Package>
<History>
<Update release="4">
<Date>2017-03-18</Date>
<Version>0.7.1</Version>
<Comment>Rebuild.</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2017-03-08</Date>
<Version>0.7.1</Version>