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

This commit is contained in:
blue-devil
2020-01-18 22:25:55 +03:00
7 changed files with 39 additions and 10 deletions
+7
View File
@@ -29,6 +29,13 @@
</Package>
<History>
<Update release="8">
<Date>2020-01-18</Date>
<Version>0.6.0</Version>
<Comment>rebuild for qt5.14.0</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="8">
<Date>2019-09-15</Date>
<Version>0.6.0</Version>
@@ -4,7 +4,7 @@
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
NoStrip = "/"
#NoStrip = "/"
from pisi.actionsapi import shelltools
from pisi.actionsapi import autotools
@@ -13,6 +13,9 @@ from pisi.actionsapi import qt5
from pisi.actionsapi import get
def setup():
shelltools.system("sed -i 's/python /python3 /' qtdeclarative.pro \
src/3rdparty/masm/masm.pri")
#shelltools.system("sed -i 's/python /python3 /' qtdeclarative/src/3rdparty/masm/masm.pri")
shelltools.export("CFLAGS", "CXXFLAGS")
qt5.configure()
@@ -32,4 +35,4 @@ def install():
#for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()):
#pisitools.dosym("/usr/lib/qt5/bin/%s" % bin, "/usr/bin/%s-qt5" % bin)
#pisitools.insinto("/usr/share/licenses/qt5-declarative/", "LICENSE*")
pisitools.insinto("/usr/share/licenses/qt5-declarative/", "LICENSE*")
@@ -13,6 +13,7 @@
<License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="2ea4a2ffe698987423f6ee63d58fbba433fe0910" type="tarxz">http://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtdeclarative-everywhere-src-5.14.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>python3</Dependency>
<Dependency versionFrom="5.14.0">qt5-base-devel</Dependency>
<Dependency>libxkbcommon-devel</Dependency>
<Dependency versionFrom="13.0.4">mesa-devel</Dependency>
@@ -29,6 +30,7 @@
<Name>qt5-declarative</Name>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency>libglvnd</Dependency>
<Dependency versionFrom="5.14.0">qt5-base</Dependency>
<Dependency versionFrom="13.0.4">mesa</Dependency>
<!-- <Dependency versionFrom="5.14.0">qt5-xmlpatterns</Dependency> -->
@@ -56,7 +58,7 @@
</RuntimeDependencies>
</Package>
<Package>
<!--Package>
<Name>qt5-declarative-docs</Name>
<RuntimeDependencies>
<Dependency versionFrom="5.14.0">qt5-base</Dependency>
@@ -64,7 +66,7 @@
<Files>
<Path fileType="doc">/usr/share/doc/qt5</Path>
</Files>
</Package>
</Package-->
<History>
<Update release="18">
+2
View File
@@ -11,6 +11,8 @@ from pisi.actionsapi import qt5
from pisi.actionsapi import get
def setup():
shelltools.export("CC", "clang -fuse-ld=lld")
shelltools.export("CXX", "clang++ -fuse-ld=lld")
qt5.configure()
def build():
+3 -2
View File
@@ -15,7 +15,7 @@
<BuildDependencies>
<Dependency>llvm</Dependency>
<Dependency versionFrom="13.0.4">mesa-devel</Dependency>
<Dependency versionFrom="7.1.0">llvm-clang-devel</Dependency> <!--qtdoc for qt5-x11extras-->
<Dependency versionFrom="7.1.0">llvm-clang-devel</Dependency>
<Dependency versionFrom="5.14.0">qt5-base-devel</Dependency>
<Dependency>icon-theme-hicolor</Dependency>
<Dependency versionFrom="5.14.0">qt5-declarative-devel</Dependency>
@@ -31,7 +31,8 @@
<Dependency versionFrom="5.14.0">qt5-base</Dependency>
<Dependency versionFrom="5.14.0">qt5-declarative</Dependency>
</RuntimeDependencies>
<Files>
<Files>
<Path fileType="executable">/usr/bin/qdistancefieldgenerator</Path>
<Path fileType="executable">/usr/bin/assistant</Path>
<Path fileType="executable">/usr/bin/qhelpgenerator</Path>
<Path fileType="executable">/usr/bin/qhelpconverter</Path>
+10 -3
View File
@@ -16,8 +16,8 @@
<Dependency>cmake</Dependency>
<Dependency>libgcc</Dependency>
<Dependency versionFrom="0.6.0">lxqt-build-tools</Dependency>
<Dependency versionFrom="5.13.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-linguist</Dependency>
<Dependency versionFrom="5.14.0">qt5-base-devel</Dependency>
<Dependency versionFrom="5.14.0">qt5-linguist</Dependency>
</BuildDependencies>
</Source>
<Package>
@@ -25,7 +25,7 @@
<Summary>Development files for qtermwidget5</Summary>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency versionFrom="5.13.2">qt5-base</Dependency>
<Dependency versionFrom="5.14.0">qt5-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/consoleq</Path>
@@ -48,6 +48,13 @@
</Files>
</Package>
<History>
<Update release="15">
<Date>2020-01-18</Date>
<Version>0.14.1</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="14">
<Date>2019-11-04</Date>
<Version>0.14.1</Version>
+8 -1
View File
@@ -13,7 +13,7 @@
<IsA>library</IsA>
<Summary>A free implementation of the unicode bidirectional algorithm</Summary>
<Description>GNU FriBidi is the Free Implementation of the Unicode Bidirectional Algorithm.</Description>
<Archive sha1sum="39d2bcb3ef93365222e7cdaf648cd167785ec3bf" type="tarbz2">https://github.com/fribidi/fribidi/releases/download/v1.0.5/fribidi-1.0.5.tar.bz2</Archive>
<Archive sha1sum="0489f1f9b6e19fd3060ee4da36e7e5f7b8ad21c9" type="tarbz2">https://github.com/fribidi/fribidi/releases/download/v1.0.8/fribidi-1.0.8.tar.bz2</Archive>
</Source>
<Package>
@@ -55,6 +55,13 @@
</Package>
<History>
<Update release="7">
<Date>2020-01-18</Date>
<Version>1.0.8</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Date>2019-01-15</Date>
<Version>1.0.5</Version>