rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f27'

Browse Source
This commit is contained in:
Jan Grulich 2017-10-10 07:44:51 +02:00
commit 6b4f3818b1
5 changed files with 2059 additions and 2194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,2 +1,6 @@
/qtbase-opensource-src-5.9.1.tar.xz /qtbase-opensource-src-5.9.1.tar.xz
/0086-Fix-detection-of-AT-SPI.patch /0086-Fix-detection-of-AT-SPI.patch
<<<<<<< HEAD
=======
/qtbase-opensource-src-5.9.2.tar.xz
>>>>>>> f27

39
qt5-qtbase-5.9.1-firebird.patch
View File

@ -1,20 +1,14 @@
diff -up qtbase-opensource-src-5.9.1/config.tests/unix/ibase/ibase.cpp.firebird qtbase-opensource-src-5.9.1/config.tests/unix/ibase/ibase.cpp diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
--- qtbase-opensource-src-5.9.1/config.tests/unix/ibase/ibase.cpp.firebird 2017-06-28 04:54:29.000000000 -0500 index 234f880..7b13671 100644
+++ qtbase-opensource-src-5.9.1/config.tests/unix/ibase/ibase.cpp 2017-07-16 08:28:47.833992502 -0500 --- a/src/plugins/sqldrivers/configure.json
@@ -37,7 +37,7 @@ +++ b/src/plugins/sqldrivers/configure.json
** @@ -50,11 +50,12 @@
****************************************************************************/ "ibase": {
"label": "InterBase",
-#include <ibase.h> "test": {
+#include <firebird/ibase.h> - "include": "ibase.h"
+ "include": "firebird/ibase.h"
int main(int, char **) },
{
diff -up qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/configure.json.firebird qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/configure.json
--- qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/configure.json.firebird 2017-06-28 04:54:29.000000000 -0500
+++ qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/configure.json 2017-07-16 12:38:43.730108724 -0500
@@ -50,7 +50,8 @@
"test": "unix/ibase",
"sources": [ "sources": [
{ "libs": "-lgds32_ms", "condition": "config.win32" }, { "libs": "-lgds32_ms", "condition": "config.win32" },
- { "libs": "-lgds", "condition": "!config.win32" } - { "libs": "-lgds", "condition": "!config.win32" }
@ -23,15 +17,16 @@ diff -up qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/configure.json.fireb
] ]
}, },
"mysql": { "mysql": {
diff -up qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h.firebird qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
--- qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h.firebird 2017-06-28 04:54:29.000000000 -0500 index c7cee41..6a9c56c 100644
+++ qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h 2017-07-16 08:28:47.833992502 -0500 --- a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
+++ b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
// //
#include <QtSql/qsqldriver.h> #include <QtSql/qsqldriver.h>
-#include <ibase.h> -#include <ibase.h>
+#include <firebird/ibase.h> +#include <firebird/ibase.h>
#ifdef QT_PLUGIN #ifdef QT_PLUGIN
#define Q_EXPORT_SQLDRIVER_IBASE #define Q_EXPORT_SQLDRIVER_IBASE

4078
qt5-qtbase-5.9.1-openssl11.patch
View File

File diff suppressed because it is too large Load Diff

129
qt5-qtbase.spec
View File

@ -3,7 +3,9 @@
%global multilib_basearchs x86_64 %{?mips64} ppc64 s390x sparc64 %global multilib_basearchs x86_64 %{?mips64} ppc64 s390x sparc64
# support openssl-1.1 # support openssl-1.1
%if 0%{?fedora} > 26
%global openssl11 1 %global openssl11 1
%endif
%global openssl -openssl-linked %global openssl -openssl-linked
# support qtchooser (adds qtchooser .conf file) # support qtchooser (adds qtchooser .conf file)
@ -52,7 +54,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase Name: qt5-qtbase
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Version: 5.9.1 Version: 5.9.2
Release: 1%{?dist} Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details # See LGPL_EXCEPTIONS.txt, for exception details
@ -108,7 +110,6 @@ Patch64: qt5-qtbase-5.9.1-firebird.patch
Patch65: qtbase-opensource-src-5.9.0-mysql.patch Patch65: qtbase-opensource-src-5.9.0-mysql.patch
## upstream patches (5.9 branch) ## upstream patches (5.9 branch)
Patch486: 0086-Fix-detection-of-AT-SPI.patch
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
# Those themes are there for platform integration. If the required libraries are # Those themes are there for platform integration. If the required libraries are
@ -284,7 +285,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%package mysql %package mysql
Summary: MySQL driver for Qt5's SQL classes Summary: MySQL driver for Qt5's SQL classes
%if 0%{?fedora} > 27
BuildRequires: mariadb-connector-c-devel
%else
BuildRequires: mysql-devel BuildRequires: mysql-devel
%endif
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description mysql %description mysql
%{summary}. %{summary}.
@ -341,9 +346,9 @@ Qt5 libraries used for drawing widgets and OpenGL items.
%patch63 -p1 -b .openssl11 %patch63 -p1 -b .openssl11
%endif %endif
%patch64 -p1 -b .firebird %patch64 -p1 -b .firebird
%if 0%{?fedora} > 27
%patch65 -p1 -b .mysql %patch65 -p1 -b .mysql
%endif
%patch486 -p1 -b .0086
%if 0%{?inject_optflags} %if 0%{?inject_optflags}
## adjust $RPM_OPT_FLAGS ## adjust $RPM_OPT_FLAGS
@ -470,12 +475,6 @@ make %{?_smp_mflags} -C qmake \
QMAKE_STRIP= QMAKE_STRIP=
%endif %endif
# Remove /usr/include from .qmake.stash to fix build with gcc 6
# (gcc can't find <stdlib.h> if -isystem /usr/include is present,
# and Qt for some reason generates it
mv .qmake.stash .qmake.stash.old
cat .qmake.stash.old | sed -e 's@\(/usr/local/include\) \\@\1@g'| sed -e '/\/usr\/include$/ { d; }' > .qmake.stash
make %{?_smp_mflags} make %{?_smp_mflags}
@ -506,7 +505,7 @@ translationdir=%{_qt5_translationdir}
Name: Qt5 Name: Qt5
Description: Qt5 Configuration Description: Qt5 Configuration
Version: 5.9.1 Version: 5.9.2
EOF EOF
# rpm macros # rpm macros
@ -964,29 +963,105 @@ fi
%changelog %changelog
* Thu Sep 07 2017 Daniel Vrátil <dvratil@fedoraproject.org> - 5.9.1-1 * Mon Oct 09 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.2-1
- Qt 5.9.1 - 5.9.2
* Wed Jul 19 2017 Than Ngo <than@redhat.com> - 5.7.1-20 * Wed Sep 27 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-9
- backported to fix bz#1120451, ZWNJ character on Persian keyboard not working - refresh mariadb patch to actually match cr#206850 logic (#1491316)
* Mon Jul 17 2017 Than Ngo <than@redhat.com> - 5.7.1-19 * Wed Sep 27 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-8
- fixed bz#1364717, Segfault in QDBusConnectionPrivate::closeConnection -> QObject::disconnect on exit - refresh mariadb patch wrt cr#206850 (#1491316)
* Fri Jul 07 2017 Than Ngo <than@redhat.com> - 5.7.1-18 * Tue Sep 26 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-7
- actually apply mariadb-related patch (#1491316)
* Mon Sep 25 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-6
- enable openssl11 support only for f27+ (for now)
- Use mariadb-connector-c-devel, f28+ (#1493909)
- Backport upstream mariadb patch (#1491316)
* Wed Aug 02 2017 Than Ngo <than@redhat.com> - 5.9.1-5
- added privat headers for Qt5 Xcb
* Sun Jul 30 2017 Florian Weimer <fweimer@redhat.com> - 5.9.1-4
- Rebuild with binutils fix for ppc64le (#1475636)
* Thu Jul 27 2017 Than Ngo <than@redhat.com> - 5.9.1-3
- fixed bz#1401459, backport openssl-1.1 support
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Wed Jul 19 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-1
- 5.9.1
* Tue Jul 18 2017 Than Ngo <than@redhat.com> - 5.9.0-6
- fixed bz#1442553, multilib issue
* Fri Jul 14 2017 Than Ngo <than@redhat.com> - 5.9.0-5
- fixed build issue with new mariadb
* Thu Jul 06 2017 Than Ngo <than@redhat.com> - 5.9.0-4
- fixed bz#1409600, stack overflow in QXmlSimpleReader, CVE-2016-10040 - fixed bz#1409600, stack overflow in QXmlSimpleReader, CVE-2016-10040
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.7.1-17 * Fri Jun 16 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.0-3
- create_cmake.prf: adjust CMAKE_NO_PRIVATE_INCLUDES (#1456211,QTBUG-37417)
* Thu Jun 01 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.0-2
- workaround gold linker issue with duplicate symbols (f27+, #1458003)
* Wed May 31 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-1
- Upstream official release
* Fri May 26 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-0.1.rc
- Upstream Release Candidate retagged
* Wed May 24 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-0.rc.1
- Upstream Release Candidate 1
* Tue May 16 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.0-0.6.beta3
- -common: Obsoletes: qt5-qtquick1(-devel)
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.9.0-0.5.beta3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
* Mon May 08 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-16 * Mon May 08 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.0-0.4.beta3
- backport recommended qtdbus patches - include recommended qtdbus patches, fix Release
* Fri Feb 17 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-15 * Fri May 05 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-0.beta.3
- gcc7 FTBFS fix (#1423090) - Beta 3 release
* Thu Feb 09 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-14 * Fri Apr 14 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-0.beta.1
- 5.8 backport: Ensure a pixel density of at least 1 for Qt::AA_EnableHighDpiScaling (QTBUG-56140) - No more docs, no more bootstrap. Docs comes now on a single package.
* Thu Mar 30 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-8
- de-bootstrap
- make -doc arch'd (workaround bug #1437522)
* Wed Mar 29 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-7
- rebuild
* Mon Mar 27 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-6
- bootstrap (rawhide)
- revert some minor changes introduced since 5.7
- move *Plugin.cmake items to runtime (not -devel)
* Sat Jan 28 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-5
- Really debootstrap :-P
* Fri Jan 27 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-4
- Debootstrap
- Use meta doctools package to build docs
* Fri Jan 27 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-3
- Unify firebird patch for both versions
- Bootstrap again for copr
* Thu Jan 26 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-2
- Debootstrap after tools built. New tool needed qtattributionsscanner
* Thu Jan 26 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-1
- Initial update for 5.8.0
* Tue Jan 24 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-13 * Tue Jan 24 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-13
- Broken window scaling (#1381828) - Broken window scaling (#1381828)
@ -1031,7 +1106,7 @@ fi
- New upstream version - New upstream version
* Thu Oct 20 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.0-10 * Thu Oct 20 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.0-10
- fix Source0 URL - fix Source0: https://download.qt.io/official_releases/qt/5.9/5.9.0/submodules/qtbase-opensource-src-5.9.0.tar.xz
* Thu Sep 29 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.0-9 * Thu Sep 29 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.0-9
- Requires: openssl-libs%%{?_isa} (#1328659) - Requires: openssl-libs%%{?_isa} (#1328659)
@ -1203,7 +1278,7 @@ fi
- Crash in QXcbWindow::setParent() due to NULL xcbScreen (QTBUG-50081, #1291003) - Crash in QXcbWindow::setParent() due to NULL xcbScreen (QTBUG-50081, #1291003)
* Mon Dec 21 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.17.beta * Mon Dec 21 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.17.beta
- fix/update Release: tag - fix/update Release: 1%{?dist}
* Fri Dec 18 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.16 * Fri Dec 18 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.16
- 5.6.0-beta (final) - 5.6.0-beta (final)

3
sources
View File

@ -1,2 +1 @@
SHA512 (qtbase-opensource-src-5.9.1.tar.xz) = b384e91b3fd88b2f32e826e3dd1c930213683a0fdbfd284a319204fa8d27c796b54324cf4a715f6bebd92fca6426e37cf0be5866fc1f6053b8758570ddb2fa45 SHA512 (qtbase-opensource-src-5.9.2.tar.xz) = a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7
SHA512 (0086-Fix-detection-of-AT-SPI.patch) = f78f481369e4b68400ae122a7cf4d20030ee8ea89ea211f98f5ffa895d449acd9a7207d3b010e927a7a33d644eab90e1d5bb951d71e1a5b1a11f4ac1a0241bce