Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6731 from Rmys/master

Browse Source 
qt5-5.12.2:ver.bump
This commit is contained in:
Rmys
2019-04-14 11:11:21 +03:00
committed by GitHub
parent c4ae1d7aa7 5bd57e5c07
commit 4309ee344d
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-base/actions.py
+1 -1
View File
@@ -22,7 +22,7 @@ absoluteWorkDir = "%s/%s" % (get.workDIR(), WorkDir)
bindirQt5="/usr/bin"
def setup():
shelltools.system("patch -Rp1 < qt5-base-nouveau-freeze.patch")
#shelltools.system("patch -Rp1 < qt5-base-nouveau-freeze.patch")
checkdeletepath="%s/qtbase/src/3rdparty" % absoluteWorkDir
for dir in ('libjpeg', 'freetype', 'libpng', 'zlib', "xcb", "sqlite"):
desktop/toolkit/qt5/qt5-base/pspec.xml
+11 -4
View File
@@ -11,9 +11,9 @@
<Summary>Cross platform application and UI framework</Summary>
<Description>Cross platform application and UI development framework</Description>
<License>'GPL3' 'LGPL3' 'FDL' 'custom'</License>
<Archive sha1sum="e48e91f343a7b02dc7012c787a2e3fcb3589f16d" type="tarxz">http://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtbase-everywhere-src-5.12.1.tar.xz</Archive>
<Archive sha1sum="d12a34ef75ac344e29dad4400b844cbda6c447f1" type="tarxz">http://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtbase-everywhere-src-5.12.2.tar.xz</Archive>
<AdditionalFiles>
<AdditionalFile target="qt5-base-nouveau-freeze.patch">qt5-base-nouveau-freeze.patch</AdditionalFile>
<!-- <AdditionalFile target="qt5-base-nouveau-freeze.patch">qt5-base-nouveau-freeze.patch</AdditionalFile> -->
</AdditionalFiles>
<BuildDependencies>
<Dependency>at-spi2-core-devel</Dependency>
@@ -78,8 +78,8 @@
<Patches>
<!-- Pisilinux Patches -->
<Patch>mkspecs.patch</Patch>
<Patch level="1">qt-delayed-highlight.patch</Patch>
<Patch level="1">qtbug-69310.patch</Patch>
<!-- <Patch level="1">qt-delayed-highlight.patch</Patch> -->
<!-- <Patch level="1">qtbug-69310.patch</Patch> -->
</Patches>
</Source>
@@ -262,6 +262,13 @@
</Package>-->
<History>
<Update release="17">
<Date>2019-04-14</Date>
<Version>5.12.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="16">
<Date>2019-02-23</Date>
<Version>5.12.1</Version>