Merge pull request #8704 from Rmys/master

qt5-5.15.1
This commit is contained in:
Rmys
2020-09-09 19:42:58 +00:00
committed by GitHub
6 changed files with 15 additions and 297 deletions
+15 -8
View File
@@ -15,10 +15,10 @@
<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.14.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-linguist</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>
@@ -34,8 +34,8 @@
<Name>qt5-phonon</Name>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency versionFrom="5.14.2">qt5-base</Dependency>
<Dependency versionFrom="5.14.2">qt5-designer</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>
@@ -54,8 +54,8 @@
<Summary>Development files for phonon-qt5</Summary>
<RuntimeDependencies>
<Dependency release="current">qt5-phonon</Dependency>
<Dependency versionFrom="5.14.2">qt5-base-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-designer-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
</RuntimeDependencies>
<Files>
@@ -66,6 +66,13 @@
</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>
-22
View File
@@ -1,22 +0,0 @@
#!/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")
@@ -1,14 +0,0 @@
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;
}
@@ -1,23 +0,0 @@
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}")
-217
View File
@@ -1,217 +0,0 @@
<?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>
@@ -1,13 +0,0 @@
<?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>