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

qt5-5.15.2 ver. bump

Browse Source
This commit is contained in:
Rmys
2020-12-18 23:55:41 +03:00
committed by GitHub
parent e0aacfad24
commit 8d5bbb275d
5 changed files with 116 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-gstreamer/pspec.xml
+14 -7
View File
@@ -22,10 +22,10 @@
<Dependency>gobject-introspection-devel</Dependency> <Dependency>gobject-introspection-devel</Dependency>
<Dependency versionFrom="13.0.4">mesa-devel</Dependency> <Dependency versionFrom="13.0.4">mesa-devel</Dependency>
<Dependency versionFrom="2.50.2">glib2-devel</Dependency> <Dependency versionFrom="2.50.2">glib2-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
<Dependency versionFrom="1.10.3">gst-plugins-base-devel</Dependency> <Dependency versionFrom="1.10.3">gst-plugins-base-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-quickcontrols2-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-quickcontrols2-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<Patch level="1">qt-gstreamer-1.6.patch</Patch> <Patch level="1">qt-gstreamer-1.6.patch</Patch>
@@ -40,8 +40,8 @@
<Dependency>gstreamer</Dependency> <Dependency>gstreamer</Dependency>
<Dependency versionFrom="13.0.4">mesa</Dependency> <Dependency versionFrom="13.0.4">mesa</Dependency>
<Dependency versionFrom="2.50.2">glib2</Dependency> <Dependency versionFrom="2.50.2">glib2</Dependency>
<Dependency versionFrom="5.15.1">qt5-base</Dependency> <Dependency versionFrom="5.15.2">qt5-base</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative</Dependency> <Dependency versionFrom="5.15.2">qt5-declarative</Dependency>
<Dependency versionFrom="1.10.3">gst-plugins-base</Dependency> <Dependency versionFrom="1.10.3">gst-plugins-base</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -58,8 +58,8 @@
<Dependency>glib2-devel</Dependency> <Dependency>glib2-devel</Dependency>
<Dependency>gstreamer-devel</Dependency> <Dependency>gstreamer-devel</Dependency>
<Dependency release="current">qt5-gstreamer</Dependency> <Dependency release="current">qt5-gstreamer</Dependency>
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="1.10.3">gst-plugins-base-devel</Dependency> <Dependency versionFrom="1.10.3">gst-plugins-base-devel</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -70,6 +70,13 @@
</Package> </Package>
<History> <History>
<Update release="22">
<Date>2020-12-14</Date>
<Version>1.2.0</Version>
<Comment>Rebuild qt5-5.15.2</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="21"> <Update release="21">
<Date>2020-09-09</Date> <Date>2020-09-09</Date>
<Version>1.2.0</Version> <Version>1.2.0</Version>
desktop/toolkit/qt5/qt5-webengine/actions.py
+4
View File
@@ -11,6 +11,9 @@ from pisi.actionsapi import qt5
from pisi.actionsapi import get from pisi.actionsapi import get
def setup(): def setup():
# Disable jumbo build https://bugreports.qt.io/browse/QTBUG-88657 gcc10
shelltools.system("sed -i 's|use_jumbo_build=true|use_jumbo_build=false|' -i src/buildtools/config/common.pri")
shelltools.makedirs("build") shelltools.makedirs("build")
shelltools.cd("build") shelltools.cd("build")
#shelltools.export("QT5LINK", "/usr/lib/qt5/bin") #shelltools.export("QT5LINK", "/usr/lib/qt5/bin")
@@ -18,6 +21,7 @@ def setup():
#shelltools.export("CFLAGS", "%s -I/usr/lib/sqlite3.16.2" % get.CFLAGS()) #shelltools.export("CFLAGS", "%s -I/usr/lib/sqlite3.16.2" % get.CFLAGS())
#shelltools.system("qmake WEBENGINE_CONFIG+=use_proprietary_codecs WEBENGINE_CONFIG+=use_system_icu WEBENGINE_CONFIG+=use_system_protobuf WEBENGINE_CONFIG+=use_system_ffmpeg qtwebengine.pro") #shelltools.system("qmake WEBENGINE_CONFIG+=use_proprietary_codecs WEBENGINE_CONFIG+=use_system_icu WEBENGINE_CONFIG+=use_system_protobuf WEBENGINE_CONFIG+=use_system_ffmpeg qtwebengine.pro")
#pisitools.ldflags.add("-Wl,--no-keep-memory ") #pisitools.ldflags.add("-Wl,--no-keep-memory ")
shelltools.export("NINJAJOBS", "-j 4")
shelltools.system("qmake .. -- -proprietary-codecs \ shelltools.system("qmake .. -- -proprietary-codecs \
-system-ffmpeg \ -system-ffmpeg \
-system-opus \ -system-opus \
desktop/toolkit/qt5/qt5-webengine/pspec.xml
+25 -18
View File
@@ -11,15 +11,15 @@
<Summary>Provides support for web applications using the Chromium browser project</Summary> <Summary>Provides support for web applications using the Chromium browser project</Summary>
<Description>Provides support for web applications using the Chromium browser project</Description> <Description>Provides support for web applications using the Chromium browser project</Description>
<License>LGPLv2.1-linking-exception</License> <License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="6eda80094f6724490b399228ce635d4d66432a0d" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebengine-everywhere-src-5.15.1.tar.xz</Archive> <Archive sha1sum="fc633cf15998a89229446b778085f59191e27b0f" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-xmlpatterns-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-location-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-sensors-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-webchannel-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-designer-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-designer-devel</Dependency>
<Dependency>bison</Dependency> <Dependency>bison</Dependency>
<Dependency>re2-devel</Dependency> <Dependency>re2-devel</Dependency>
<Dependency>re2c</Dependency> <Dependency>re2c</Dependency>
@@ -77,7 +77,7 @@
<Dependency>libxkbcommon-devel</Dependency> <Dependency>libxkbcommon-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<Patch level="1">qtbug-86752.patch</Patch> <!-- <Patch level="1">qtbug-86752.patch</Patch> -->
<!-- <Patch level="1">qtbug-69605.patch</Patch> --> <!-- <Patch level="1">qtbug-69605.patch</Patch> -->
</Patches> </Patches>
</Source> </Source>
@@ -118,7 +118,7 @@
<Dependency>libopus</Dependency> <Dependency>libopus</Dependency>
<Dependency>libxml2</Dependency> <Dependency>libxml2</Dependency>
<Dependency>libvpx</Dependency> <Dependency>libvpx</Dependency>
<Dependency versionFrom="5.15.1">qt5-base</Dependency> <Dependency versionFrom="5.15.2">qt5-base</Dependency>
<Dependency>alsa-lib</Dependency> <Dependency>alsa-lib</Dependency>
<Dependency>harfbuzz</Dependency> <Dependency>harfbuzz</Dependency>
<Dependency>libevent</Dependency> <Dependency>libevent</Dependency>
@@ -128,11 +128,11 @@
<Dependency>libXScrnSaver</Dependency> <Dependency>libXScrnSaver</Dependency>
<Dependency>libXdamage</Dependency> <Dependency>libXdamage</Dependency>
<Dependency>libXrender</Dependency> <Dependency>libXrender</Dependency>
<Dependency versionFrom="5.15.1">qt5-location</Dependency> <Dependency versionFrom="5.15.2">qt5-location</Dependency>
<Dependency>libXcomposite</Dependency> <Dependency>libXcomposite</Dependency>
<Dependency>libjpeg-turbo</Dependency> <Dependency>libjpeg-turbo</Dependency>
<Dependency versionFrom="5.15.1">qt5-webchannel</Dependency> <Dependency versionFrom="5.15.2">qt5-webchannel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative</Dependency> <Dependency versionFrom="5.15.2">qt5-declarative</Dependency>
<Dependency>zlib</Dependency> <Dependency>zlib</Dependency>
<Dependency>minizip</Dependency> <Dependency>minizip</Dependency>
<Dependency>protobuf</Dependency> <Dependency>protobuf</Dependency>
@@ -150,17 +150,17 @@
</Files> </Files>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">qt5-webengine</Dependency> <Dependency release="current">qt5-webengine</Dependency>
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-location-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-webchannel-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-webchannel-devel</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
</Package> </Package>
<Package> <Package>
<Name>qt5-webengine-docs</Name> <Name>qt5-webengine-docs</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency versionFrom="5.15.1">qt5-base</Dependency> <Dependency versionFrom="5.15.2">qt5-base</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="doc">/usr/share/doc</Path> <Path fileType="doc">/usr/share/doc</Path>
@@ -168,6 +168,13 @@
</Package> </Package>
<History> <History>
<Update release="22">
<Date>2020-12-14</Date>
<Version>5.15.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="21"> <Update release="21">
<Date>2020-10-01</Date> <Date>2020-10-01</Date>
<Version>5.15.1</Version> <Version>5.15.1</Version>
desktop/toolkit/qt5/qt5-webkit/files/d92b11fe.patch
+46
View File
@@ -0,0 +1,46 @@
From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@gmail.com>
Date: Tue, 4 Aug 2020 21:04:06 +0300
Subject: [PATCH] Let Bison generate the header directly, to fix build with
Bison 3.7
Starting with Bison 3.7, the generated C++ file #include's the header
by default, instead of duplicating it. So we should not delete it.
Remove the code to add #ifdef guards to the header, since Bison adds
them itself since version 2.6.3.
---
Source/WebCore/css/makegrammar.pl | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl
index 5d63b08102eb..9435701c7061 100644
--- a/Source/WebCore/css/makegrammar.pl
+++ b/Source/WebCore/css/makegrammar.pl
@@ -73,25 +73,6 @@
}
my $fileBase = File::Spec->join($outputDir, $filename);
-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
+my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives.
system(@bisonCommand) == 0 or die;
-
-open HEADER, ">$fileBase.h" or die;
-print HEADER << "EOF";
-#ifndef CSSGRAMMAR_H
-#define CSSGRAMMAR_H
-EOF
-
-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die;
-while (<HPP>) {
- print HEADER;
-}
-close HPP;
-
-print HEADER "#endif\n";
-close HEADER;
-
-unlink("$fileBase.cpp.h");
-unlink("$fileBase.hpp");
-
desktop/toolkit/qt5/qt5-webkit/pspec.xml
+27 -20
View File
@@ -45,21 +45,21 @@
<Dependency versionFrom="2.50.2">glib2-devel</Dependency> <Dependency versionFrom="2.50.2">glib2-devel</Dependency>
<Dependency versionFrom="3.16.2">sqlite-devel</Dependency> <Dependency versionFrom="3.16.2">sqlite-devel</Dependency>
<Dependency versionFrom="2.7.13">python-devel</Dependency> <Dependency versionFrom="2.7.13">python-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-linguist</Dependency> <Dependency versionFrom="5.15.2">qt5-linguist</Dependency>
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-sql-sqlite</Dependency> <Dependency versionFrom="5.15.2">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.15.1">qt5-qdbusviewer</Dependency> <Dependency versionFrom="5.15.2">qt5-qdbusviewer</Dependency>
<Dependency versionFrom="5.15.1">qt5-sensors-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-designer-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-location-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-assistant-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-multimedia-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-webchannel-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="1.10.3">gst-plugins-base-devel</Dependency> <Dependency versionFrom="1.10.3">gst-plugins-base-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!-- <Patch level="1">icu65.patch</Patch> --> <Patch level="1">d92b11fe.patch</Patch>
<!-- <Patch level="1">qt5-webkit-cmake3.10.patch</Patch> --> <!-- <Patch level="1">qt5-webkit-cmake3.10.patch</Patch> -->
<!-- <Patch level="1">qt5-webkit-gcc7.patch</Patch> --> <!-- <Patch level="1">qt5-webkit-gcc7.patch</Patch> -->
<!-- <Patch level="1">qt5-webkit-null-pointer-dereference.patch</Patch> --> --> <!-- <Patch level="1">qt5-webkit-null-pointer-dereference.patch</Patch> --> -->
@@ -97,11 +97,11 @@
<Dependency>gstreamer</Dependency> <Dependency>gstreamer</Dependency>
<Dependency>gst-plugins-base</Dependency> <Dependency>gst-plugins-base</Dependency>
<Dependency>gst-plugins-base</Dependency> <Dependency>gst-plugins-base</Dependency>
<Dependency versionFrom="5.15.1">qt5-base</Dependency> <Dependency versionFrom="5.15.2">qt5-base</Dependency>
<Dependency versionFrom="5.15.1">qt5-location</Dependency> <Dependency versionFrom="5.15.2">qt5-location</Dependency>
<Dependency versionFrom="5.15.1">qt5-sensors</Dependency> <Dependency versionFrom="5.15.2">qt5-sensors</Dependency>
<Dependency versionFrom="5.15.1">qt5-webchannel</Dependency> <Dependency versionFrom="5.15.2">qt5-webchannel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative</Dependency> <Dependency versionFrom="5.15.2">qt5-declarative</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
</Package> </Package>
@@ -128,13 +128,20 @@
<Dependency>gstreamer-devel</Dependency> <Dependency>gstreamer-devel</Dependency>
<Dependency>gst-plugins-base-devel</Dependency> <Dependency>gst-plugins-base-devel</Dependency>
<Dependency release="current">qt5-webkit</Dependency> <Dependency release="current">qt5-webkit</Dependency>
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-sensors-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
</Package> </Package>
<History> <History>
<Update release="24">
<Date>2020-12-14</Date>
<Version>5.212.0</Version>
<Comment>Rebuild qt5-5.15.2</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="23"> <Update release="23">
<Date>2020-09-09</Date> <Date>2020-09-09</Date>
<Version>5.212.0</Version> <Version>5.212.0</Version>