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

qt5-5.15.1

Browse Source
This commit is contained in:
Rmys
2020-09-09 22:35:58 +03:00
parent 40fb35e3c0
commit 4b700e6773
8 changed files with 368 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-phonon/actions.py
+22
View File
@@ -0,0 +1,22 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import kde5
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def setup():
kde5.configure("-DPHONON_BUILD_PHONON4QT5=ON \
-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON")
def build():
kde5.make()
def install():
kde5.install()
#pisitools.domove("/usr/share/qt5/mkspecs/modules/qt_phonon4qt5.pri", "/usr/lib/qt5/mkspecs/modules/")
#pisitools.removeDir("/usr/share/qt5")
desktop/toolkit/qt5/qt5-phonon/files/phonon-qt5.12.patch
+14
View File
@@ -0,0 +1,14 @@
diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp
index b7009b11..d3240840 100644
--- a/phonon/pulsesupport.cpp
+++ b/phonon/pulsesupport.cpp
@@ -840,7 +840,8 @@ PulseSupport::PulseSupport()
}
// We require a glib event loop
- if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib")) {
+ if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib") &&
+ !QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("GlibEventDispatcher")) {
qWarning("WARNING: Disabling PulseAudio integration for lack of GLib event loop.");
return;
}
desktop/toolkit/qt5/qt5-phonon/files/qt-5.4.2.patch
+23
View File
@@ -0,0 +1,23 @@
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Thu, 28 May 2015 15:56:47 +0000
Subject: Yet another _include_dirs fix
X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=635b65fa417f49ac4ae189e926bf138efc6544d6
---
Yet another _include_dirs fix
The variable is set as a definition, so mark it as such
---
--- a/cmake/FindPhononInternal.cmake
+++ b/cmake/FindPhononInternal.cmake
@@ -409,7 +409,7 @@
file(WRITE "${_source_file}" "${_source}")
set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}")
- try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
+ try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" COMPILE_DEFINITIONS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
if(NOT _compile_result)
message("${_compile_output_var}")
desktop/toolkit/qt5/qt5-phonon/pspec.xml
+217
View File
@@ -0,0 +1,217 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>qt5-phonon</Name>
<Homepage>http://phonon.kde.org</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>LGPLv2.1</License>
<IsA>library</IsA>
<Summary>Cross platform multimedia API for KDE4 using QT5</Summary>
<Description>Phonon was created as a solution to several problems with multimedia commonly faced by Unix desktops, especially KDE 3's outdated multimedia framework aRts. Phonon itself is not a multimedia framework, but interfaces with existing frameworks such as GStreamer or Xine via backends.</Description>
<Archive sha1sum="a6ce97a1a228140a596c4dc1b7d430199fa69388" type="tarxz">https://download.kde.org/stable/phonon/4.11.1/phonon-4.11.1.tar.xz</Archive>
<BuildDependencies>
<Dependency>extra-cmake-modules</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-linguist</Dependency>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>gst-plugins-base-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
<Dependency>gstreamer-devel</Dependency>
<Dependency versionFrom="18.2.5">mesa-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch>phonon-qt5.12.patch</Patch> -->
</Patches>
</Source>
<Package>
<Name>qt5-phonon</Name>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency versionFrom="5.15.1">qt5-base</Dependency>
<Dependency versionFrom="5.15.1">qt5-designer</Dependency>
<!-- <Dependency>qt5-quick1</Dependency> -->
<Dependency>pulseaudio-libs</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/libphonon*</Path>
<Path fileType="library">/usr/lib/qt5</Path>
<Path fileType="data">/usr/share/dbus-1</Path>
<Path fileType="data">/usr/share/phonon4qt5</Path>
<Path fileType="localedata">/usr/share/locale</Path>
</Files>
</Package>
<Package>
<Name>qt5-phonon-devel</Name>
<Summary>Development files for phonon-qt5</Summary>
<RuntimeDependencies>
<Dependency release="current">qt5-phonon</Dependency>
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-designer-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="data">/usr/lib/cmake</Path>
</Files>
</Package>
<History>
<Update release="21">
<Date>2020-09-09</Date>
<Version>4.11.1</Version>
<Comment>Rebuild qt5.15.1</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="20">
<Date>2020-04-04</Date>
<Version>4.11.1</Version>
<Comment>Rebuild qt5.14.2</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="19">
<Date>2020-02-28</Date>
<Version>4.11.1</Version>
<Comment>Rebuild qt5.14.1</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="18">
<Date>2019-12-22</Date>
<Version>4.11.1</Version>
<Comment>Rebuild qt5.13.2</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="17">
<Date>2019-10-02</Date>
<Version>4.11.1</Version>
<Comment>Rebuild qt5.13.2</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="16">
<Date>2019-09-26</Date>
<Version>4.11.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="15">
<Date>2019-09-15</Date>
<Version>4.11.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="14">
<Date>2019-09-04</Date>
<Version>4.11.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="13">
<Date>2019-06-24</Date>
<Version>4.10.2</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="12">
<Date>2019-04-14</Date>
<Version>4.10.2</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="11">
<Date>2019-01-08</Date>
<Version>4.10.2</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="10">
<Date>2018-12-12</Date>
<Version>4.10.1</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="9">
<Date>2018-10-18</Date>
<Version>4.10.1</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="8">
<Date>2018-08-11</Date>
<Version>4.10.1</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="7">
<Date>2018-05-01</Date>
<Version>4.10.1</Version>
<Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Date>2018-02-27</Date>
<Version>4.10.0</Version>
<Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="5">
<Date>2017-02-28</Date>
<Version>5.29.0</Version>
<Comment>Rebuild for new Toolchain.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2017-02-27</Date>
<Version>4.9.1</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-05-16</Date>
<Version>4.9.0</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-05-03</Date>
<Version>4.9.0</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2015-08-13</Date>
<Version>4.8.3</Version>
<Comment>First release</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
</History>
</PISI>
desktop/toolkit/qt5/qt5-phonon/translations.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>phonon</Name>
<Summary xml:lang="tr">KDE4 için platform bağımsız çokluortam kitaplığı</Summary>
<Description xml:lang="tr">Phonon, Unix masaüstlerinde özellikle de KDE3'ün eski çokluortam çatısı aRts'tan kaynaklanan bir çok problemi çözmek için üretilmiştir. Phonon kendi başına bir çokluortam çatısı değildir, Xine veya GStreamer gibi varolan çatıları arka uç olarak kullanırak bir arayüz görevi görür.</Description>
</Source>
<Package>
<Name>phonon-devel</Name>
<Summary xml:lang="tr">phonon için geliştirme dosyaları</Summary>
</Package>
</PISI>
desktop/toolkit/qt5/qt5-webengine/actions.py
+1
View File
@@ -22,6 +22,7 @@ def setup():
-system-ffmpeg \
-system-opus \
-system-webp \
-spellchecker \
-webengine-icu \
-webengine-kerberos")
desktop/toolkit/qt5/qt5-webengine/files/dark-mode-crash.patch
+51
View File
@@ -0,0 +1,51 @@
From 4e8ca195e4a58a35b015ec55f32fb35403acb5ad Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Fri, 12 Jun 2020 16:30:23 +0200
Subject: Fix crash on run with blink setting DarkModeImagePolicy=kFilterSmart
Activating Dark Mode with with smart image filter policy
'--blink-settings=darkModeEnabled=true,darkModeImagePolicy=2'
lead to crash due stack-use-after-scope. Don't use use local references.
Issue was fixed after refatoring here:
https://chromium-review.googlesource.com/c/chromium/src/+/2169489
Won't be needed after chromium 85.0.4166.0
Change-Id: I6a36a394be41602c10b4c4bca3aa197c99d3be0c
Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
.../blink/renderer/platform/graphics/dark_mode_filter.cc | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc
index 0c2a478ca67..6f76ef45588 100644
--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc
+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc
@@ -49,21 +49,17 @@ bool ShouldApplyToImage(const DarkModeSettings& settings,
Image* image) {
switch (settings.image_policy) {
case DarkModeImagePolicy::kFilterSmart: {
- DarkModeImageClassifier* classifier;
+ DarkModeClassification result = DarkModeClassification::kNotClassified;
switch (settings.classifier_type) {
case DarkModeClassifierType::kIcon: {
- DarkModeIconClassifier icon_classifier;
- classifier = &icon_classifier;
+ result = DarkModeIconClassifier().Classify(image, src_rect, dest_rect);
break;
}
case DarkModeClassifierType::kGeneric: {
- DarkModeGenericClassifier generic_classifier;
- classifier = &generic_classifier;
+ result = DarkModeGenericClassifier().Classify(image, src_rect, dest_rect);
break;
}
}
- DarkModeClassification result =
- classifier->Classify(image, src_rect, dest_rect);
return result == DarkModeClassification::kApplyFilter;
}
case DarkModeImagePolicy::kFilterNone:
--
cgit v1.2.1
desktop/toolkit/qt5/qt5-webengine/pspec.xml
+27 -19
View File
@@ -11,15 +11,15 @@
<Summary>Provides support for web applications using the Chromium browser project</Summary>
<Description>Provides support for web applications using the Chromium browser project</Description>
<License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="4de6c0d03c0482e37e69dafe3589c1bafdb79dfa" type="tarxz">http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz</Archive>
<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>
<BuildDependencies>
<Dependency versionFrom="5.14.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-designer-devel</Dependency>
<Dependency>bison</Dependency>
<Dependency>re2-devel</Dependency>
<Dependency>re2c</Dependency>
@@ -76,7 +76,7 @@
<Dependency>python-Jinja2</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">CVE-2019-13720.patch</Patch> -->
<!-- <Patch level="1">dark-mode-crash.patch</Patch> -->
<!-- <Patch level="1">qtbug-69605.patch</Patch> -->
</Patches>
</Source>
@@ -85,7 +85,8 @@
<Name>qt5-webengine</Name>
<Files>
<Path fileType="executable">/usr/lib/qt5/bin/</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/libQt5Pdf*</Path>
<Path fileType="library">/usr/lib/libQt5WebEngine*</Path>
<Path fileType="library">/usr/lib/libQt5WebEngineWidgets*</Path>
<Path fileType="library">/usr/lib/qt5</Path>
@@ -116,7 +117,7 @@
<Dependency>libopus</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>libvpx</Dependency>
<Dependency versionFrom="5.14.2">qt5-base</Dependency>
<Dependency versionFrom="5.15.1">qt5-base</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>harfbuzz</Dependency>
<Dependency>libevent</Dependency>
@@ -126,11 +127,11 @@
<Dependency>libXScrnSaver</Dependency>
<Dependency>libXdamage</Dependency>
<Dependency>libXrender</Dependency>
<Dependency versionFrom="5.14.2">qt5-location</Dependency>
<Dependency versionFrom="5.15.1">qt5-location</Dependency>
<Dependency>libXcomposite</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency versionFrom="5.14.2">qt5-webchannel</Dependency>
<Dependency versionFrom="5.14.2">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.1">qt5-webchannel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative</Dependency>
<Dependency>zlib</Dependency>
<Dependency>minizip</Dependency>
<Dependency>protobuf</Dependency>
@@ -147,17 +148,17 @@
</Files>
<RuntimeDependencies>
<Dependency release="current">qt5-webengine</Dependency>
<Dependency versionFrom="5.14.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.1">qt5-webchannel-devel</Dependency>
</RuntimeDependencies>
</Package>
<Package>
<Name>qt5-webengine-docs</Name>
<RuntimeDependencies>
<Dependency versionFrom="5.14.2">qt5-base</Dependency>
<Dependency versionFrom="5.15.1">qt5-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc</Path>
@@ -165,6 +166,13 @@
</Package>
<History>
<Update release="20">
<Date>2020-09-09</Date>
<Version>5.15.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="19">
<Date>2020-05-30</Date>
<Version>5.14.2</Version>