From 58680424b63e2ec5631eb653375bee642f3c5092 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 10 Aug 2017 11:02:57 -0600 Subject: [PATCH] qt5-qtbase is in RHEL 7 --- .gitignore | 6 - ...erpret-data.l-0-field-of-XdndStatus-.patch | 37 - ...Auto-detect-xcb-glx-also-with-xcb-qt.patch | 31 - ...-drop-of-text-uri-list-and-text-html.patch | 78 - ...b-Fix-dropping-URL-on-Firefox-window.patch | 58 - ...le-GLX-pbuffers-with-Chromium-in-VMs.patch | 37 - ...-transient-parent-and-Qt-Window-flag.patch | 64 - 10-qt5-check-opengl2.sh | 14 - dead.package | 1 + macros.qt5 | 35 - ...tem-defines-from-the-compiler-itself.patch | 368 ---- qconfig-multilib.h | 23 - qt5-qtbase-cxxflag.patch | 12 - qt5-qtbase.spec | 1678 ----------------- qtbase-multilib_optflags.patch | 33 - ...source-src-5.2.0-enable_ft_lcdfilter.patch | 12 - qtbase-opensource-src-5.3.2-QTBUG-35459.patch | 13 - qtbase-opensource-src-5.6.0-arm.patch | 13 - ...se-opensource-src-5.6.0-moc_WORDSIZE.patch | 14 - qtlogging.ini | 2 - sources | 1 - 21 files changed, 1 insertion(+), 2529 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-xcb-Properly-interpret-data.l-0-field-of-XdndStatus-.patch delete mode 100644 0011-XCB-Auto-detect-xcb-glx-also-with-xcb-qt.patch delete mode 100644 0032-xcb-Fix-drop-of-text-uri-list-and-text-html.patch delete mode 100644 0033-xcb-Fix-dropping-URL-on-Firefox-window.patch delete mode 100644 0148-xcb-Disable-GLX-pbuffers-with-Chromium-in-VMs.patch delete mode 100644 0155-xcb-Fix-transient-parent-and-Qt-Window-flag.patch delete mode 100755 10-qt5-check-opengl2.sh create mode 100644 dead.package delete mode 100644 macros.qt5 delete mode 100644 moc-get-the-system-defines-from-the-compiler-itself.patch delete mode 100644 qconfig-multilib.h delete mode 100644 qt5-qtbase-cxxflag.patch delete mode 100644 qt5-qtbase.spec delete mode 100644 qtbase-multilib_optflags.patch delete mode 100644 qtbase-opensource-src-5.2.0-enable_ft_lcdfilter.patch delete mode 100644 qtbase-opensource-src-5.3.2-QTBUG-35459.patch delete mode 100644 qtbase-opensource-src-5.6.0-arm.patch delete mode 100644 qtbase-opensource-src-5.6.0-moc_WORDSIZE.patch delete mode 100644 qtlogging.ini delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 4fbb1c0..0000000 --- a/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -/qtbase-opensource-src-5.5.1.tar.xz -/qtbase-opensource-src-5.6.0-beta.tar.gz -/qtbase-opensource-src-5.6.0-rc.tar.xz -/sources -/qtbase-opensource-src-5.6.0.tar.xz -/qtbase-opensource-src-5.6.1.tar.xz diff --git a/0001-xcb-Properly-interpret-data.l-0-field-of-XdndStatus-.patch b/0001-xcb-Properly-interpret-data.l-0-field-of-XdndStatus-.patch deleted file mode 100644 index c0c3bc1..0000000 --- a/0001-xcb-Properly-interpret-data.l-0-field-of-XdndStatus-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 46f1c4c86bbfe7b6917907700bec998626ad4a8b Mon Sep 17 00:00:00 2001 -From: Alexander Volkov -Date: Wed, 11 May 2016 18:42:24 +0300 -Subject: [PATCH 001/178] xcb: Properly interpret data.l[0] field of XdndStatus - message - -The standard https://freedesktop.org/wiki/Specifications/XDND/ -states: "In order for the proxy window to behave correctly, the -appropriate field of the client messages, window or data.l[0], -must contain the ID of the window in which the mouse is located, -not the proxy window that is receiving the messages." - -So compare it with the current target window instead of the -current proxy window. - -Change-Id: Ie31fd3aeadebcf5a9be7b9a9194f35a4ec7bdebb -Reviewed-by: Lars Knoll ---- - src/plugins/platforms/xcb/qxcbdrag.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp -index 6fa5dfa..f93e420 100644 ---- a/src/plugins/platforms/xcb/qxcbdrag.cpp -+++ b/src/plugins/platforms/xcb/qxcbdrag.cpp -@@ -829,7 +829,7 @@ void QXcbDrag::handle_xdnd_status(const xcb_client_message_event_t *event) - DEBUG("xdndHandleStatus"); - waiting_for_status = false; - // ignore late status messages -- if (event->data.data32[0] && event->data.data32[0] != current_proxy_target) -+ if (event->data.data32[0] && event->data.data32[0] != current_target) - return; - - const bool dropPossible = event->data.data32[1]; --- -2.7.4 - diff --git a/0011-XCB-Auto-detect-xcb-glx-also-with-xcb-qt.patch b/0011-XCB-Auto-detect-xcb-glx-also-with-xcb-qt.patch deleted file mode 100644 index edaccef..0000000 --- a/0011-XCB-Auto-detect-xcb-glx-also-with-xcb-qt.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2852a8b87e3a8ed95b72d26b0e180b7fd4491cf3 Mon Sep 17 00:00:00 2001 -From: Gabriel de Dietrich -Date: Fri, 26 Feb 2016 11:53:01 -0800 -Subject: [PATCH 011/178] XCB: Auto-detect xcb-glx also with xcb-qt - -Task-number: QTBUG-43784 -Change-Id: Iaa0388e34900f6241db8cd864caed4fb6fc32819 -Reviewed-by: Laszlo Agocs ---- - configure | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/configure b/configure -index ce5b9c2..a481981 100755 ---- a/configure -+++ b/configure -@@ -5555,6 +5555,11 @@ if [ "$CFG_XCB" != "no" ]; then - - if [ "$CFG_XCB" = "qt" ]; then - QT_CONFIG="$QT_CONFIG xcb-qt" -+ -+ if compileTest qpa/xcb-glx "xcb-glx" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then -+ CFG_XCB_GLX=yes -+ QT_CONFIG="$QT_CONFIG xcb-glx" -+ fi - else - CFG_XCB="system" - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then --- -2.7.4 - diff --git a/0032-xcb-Fix-drop-of-text-uri-list-and-text-html.patch b/0032-xcb-Fix-drop-of-text-uri-list-and-text-html.patch deleted file mode 100644 index db96ec5..0000000 --- a/0032-xcb-Fix-drop-of-text-uri-list-and-text-html.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1108291e1a2e7de23440c2b36b2fd31010ae3f51 Mon Sep 17 00:00:00 2001 -From: Urs Fleisch -Date: Tue, 3 May 2016 20:01:01 +0200 -Subject: [PATCH 032/178] xcb: Fix drop of text/uri-list and text/html. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When dropping URLs from Firefox or Chrome, the contents are encoded as -UTF16, but not correctly decoded. Moreover, the special handling of -"text/x-moz-url" drops does not work because this format is converted to -"text/uri-list" before. This fixes the handling for URL list and also -for UTF16 "text/html". - -Task-number: QTBUG-47981 -Change-Id: I1153f21ede07b2bfe4d104e0fe8bc8487ec5c165 -Reviewed-by: Błażej Szczygieł -Reviewed-by: Shawn Rutledge ---- - src/plugins/platforms/xcb/qxcbmime.cpp | 42 +++++++++++++++++++++++++--------- - 1 file changed, 31 insertions(+), 11 deletions(-) - -diff --git a/src/plugins/platforms/xcb/qxcbmime.cpp b/src/plugins/platforms/xcb/qxcbmime.cpp -index eeac561..cef2210 100644 ---- a/src/plugins/platforms/xcb/qxcbmime.cpp -+++ b/src/plugins/platforms/xcb/qxcbmime.cpp -@@ -182,17 +182,37 @@ QVariant QXcbMime::mimeConvertToFormat(QXcbConnection *connection, xcb_atom_t a, - a == connection->atom(QXcbAtom::TEXT)) - return QString::fromLatin1(data); - } -- -- // special case for uri types -- if (format == QLatin1String("text/uri-list")) { -- if (atomName == QLatin1String("text/x-moz-url")) { -- // we expect this as utf16 -- // the first part is a url that should only contain ascci char -- // so it should be safe to check that the second char is 0 -- // to verify that it is utf16 -- if (data.size() > 1 && data.at(1) == 0) -- return QString::fromRawData((const QChar *)data.constData(), -- data.size() / 2).split(QLatin1Char('\n')).first().toLatin1(); -+ // If data contains UTF16 text, convert it to a string. -+ // Firefox uses UTF16 without BOM for text/x-moz-url, "text/html", -+ // Google Chrome uses UTF16 without BOM for "text/x-moz-url", -+ // UTF16 with BOM for "text/html". -+ if ((format == QLatin1String("text/html") || format == QLatin1String("text/uri-list")) -+ && data.size() > 1) { -+ const quint8 byte0 = data.at(0); -+ const quint8 byte1 = data.at(1); -+ if ((byte0 == 0xff && byte1 == 0xfe) || (byte0 == 0xfe && byte1 == 0xff) -+ || (byte0 != 0 && byte1 == 0) || (byte0 == 0 && byte1 != 0)) { -+ const QString str = QString::fromUtf16( -+ reinterpret_cast<const ushort *>(data.constData()), data.size() / 2); -+ if (!str.isNull()) { -+ if (format == QLatin1String("text/uri-list")) { -+ const QStringList urls = str.split(QLatin1Char('\n')); -+ QList<QVariant> list; -+ foreach (const QString &s, urls) { -+ const QUrl url(s.trimmed()); -+ if (url.isValid()) -+ list.append(url); -+ } -+ // We expect "text/x-moz-url" as <url><space><title>. -+ // The atomName variable is not used because mimeAtomToString() -+ // converts "text/x-moz-url" to "text/uri-list". -+ if (!list.isEmpty() && connection->atomName(a) == "text/x-moz-url") -+ return list.first(); -+ return list; -+ } else { -+ return str; -+ } -+ } - } - } - --- -2.7.4 - diff --git a/0033-xcb-Fix-dropping-URL-on-Firefox-window.patch b/0033-xcb-Fix-dropping-URL-on-Firefox-window.patch deleted file mode 100644 index c48076a..0000000 --- a/0033-xcb-Fix-dropping-URL-on-Firefox-window.patch +++ /dev/null @@ -1,58 +0,0 @@ -From f162e29acca99aaab173fb323d112aad9ec6c2b5 Mon Sep 17 00:00:00 2001 -From: Urs Fleisch <ufleisch@users.sourceforge.net> -Date: Wed, 4 May 2016 19:47:16 +0200 -Subject: [PATCH 033/178] xcb: Fix dropping URL on Firefox window. - -When a URL is dropped on a Firefox window, the "text/x-moz-url" data -takes precedence over the "text/uri-list". The "text/x-moz-url" is -interpreted as UTF16, however, the data from Qt 5 applications is not -in the correct format. The code to create correct UTF16 data exists, -but it is not called for two reasons: The atomName will never be -"text/x-moz-url" because it is changed to "text/uri-list" by -mimeAtomToString() and the InternalMimeData::hasFormatHelper() case is -already handled above and the else part will never be considered. -This patch fixes the check and brings it into the right order. - -Task-number: QTBUG-49947 -Change-Id: I5ebd31914cc6c1417c513c1ff09e0e858a16915d -Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> -Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> ---- - src/plugins/platforms/xcb/qxcbmime.cpp | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -diff --git a/src/plugins/platforms/xcb/qxcbmime.cpp b/src/plugins/platforms/xcb/qxcbmime.cpp -index cef2210..7fea068 100644 ---- a/src/plugins/platforms/xcb/qxcbmime.cpp -+++ b/src/plugins/platforms/xcb/qxcbmime.cpp -@@ -111,17 +111,18 @@ bool QXcbMime::mimeDataForAtom(QXcbConnection *connection, xcb_atom_t a, QMimeDa - QString atomName = mimeAtomToString(connection, a); - if (QInternalMimeData::hasFormatHelper(atomName, mimeData)) { - *data = QInternalMimeData::renderDataHelper(atomName, mimeData); -- if (atomName == QLatin1String("application/x-color")) -+ // mimeAtomToString() converts "text/x-moz-url" to "text/uri-list", -+ // so QXcbConnection::atomName() has to be used. -+ if (atomName == QLatin1String("text/uri-list") -+ && connection->atomName(a) == "text/x-moz-url") { -+ const QByteArray uri = data->split('\n').first(); -+ QString mozUri = QString::fromLatin1(uri, uri.size()); -+ mozUri += QLatin1Char('\n'); -+ *data = QByteArray(reinterpret_cast<const char *>(mozUri.utf16()), -+ mozUri.length() * 2); -+ } else if (atomName == QLatin1String("application/x-color")) - *dataFormat = 16; - ret = true; -- } else if (atomName == QLatin1String("text/x-moz-url") && -- QInternalMimeData::hasFormatHelper(QLatin1String("text/uri-list"), mimeData)) { -- QByteArray uri = QInternalMimeData::renderDataHelper( -- QLatin1String("text/uri-list"), mimeData).split('\n').first(); -- QString mozUri = QString::fromLatin1(uri, uri.size()); -- mozUri += QLatin1Char('\n'); -- *data = QByteArray(reinterpret_cast<const char *>(mozUri.utf16()), mozUri.length() * 2); -- ret = true; - } else if ((a == XCB_ATOM_PIXMAP || a == XCB_ATOM_BITMAP) && mimeData->hasImage()) { - ret = true; - } --- -2.7.4 - diff --git a/0148-xcb-Disable-GLX-pbuffers-with-Chromium-in-VMs.patch b/0148-xcb-Disable-GLX-pbuffers-with-Chromium-in-VMs.patch deleted file mode 100644 index 3df92a5..0000000 --- a/0148-xcb-Disable-GLX-pbuffers-with-Chromium-in-VMs.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 76810e1495b65a09e9abd6164639e0caf34d61b8 Mon Sep 17 00:00:00 2001 -From: Laszlo Agocs <laszlo.agocs@theqtcompany.com> -Date: Fri, 20 May 2016 14:52:18 +0200 -Subject: [PATCH 148/178] xcb: Disable GLX pbuffers with Chromium in VMs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: I474e4a4ce424a92b46381eb26aeda811ed059819 -Task-number: QTCREATORBUG-16252 -Task-number: QTCREATORBUG-14937 -Reviewed-by: Błażej Szczygieł <spaz16@wp.pl> -Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io> ---- - .../platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp -index a3a8aa2..55d0ff3 100644 ---- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp -+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp -@@ -201,8 +201,10 @@ QPlatformOffscreenSurface *QXcbGlxIntegration::createPlatformOffscreenSurface(QO - display = static_cast<Display *>(m_connection->xlib_display()); - #endif - const char *glxvendor = glXGetClientString(display, GLX_VENDOR); -- if (glxvendor && !strcmp(glxvendor, "ATI")) -- glxPbufferUsable = false; -+ if (glxvendor) { -+ if (!strcmp(glxvendor, "ATI") || !strcmp(glxvendor, "Chromium")) -+ glxPbufferUsable = false; -+ } - } - if (glxPbufferUsable) - return new QGLXPbuffer(surface); --- -2.7.4 - diff --git a/0155-xcb-Fix-transient-parent-and-Qt-Window-flag.patch b/0155-xcb-Fix-transient-parent-and-Qt-Window-flag.patch deleted file mode 100644 index 3157aac..0000000 --- a/0155-xcb-Fix-transient-parent-and-Qt-Window-flag.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 4762fabce16c611f12542a48b0dd31b3cec8e530 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl> -Date: Thu, 14 Apr 2016 13:20:23 +0200 -Subject: [PATCH 155/178] xcb: Fix transient parent and "Qt::Window" flag - -Don't set transient parent property when Qt::Window flag is set. -Delete transient parent property if a window doesn't have a transient parent. -Force setting standard window flags for Qt::Window only if there are no other -flags. - -Amends 98c10a02c5b77e023471ad6993dc66b013889cfb - -Task-number: QTBUG-52550 -Change-Id: I68ee715b632487e9dd0e7ffbbfc0c2cdd0f0e151 -Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> -Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> ---- - src/plugins/platforms/xcb/qxcbwindow.cpp | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 429ba8d..0c2f0d7 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -821,9 +821,9 @@ void QXcbWindow::show() - propagateSizeHints(); - - // update WM_TRANSIENT_FOR -- const QWindow *tp = window()->transientParent(); -- if (isTransient(window()) || tp != 0) { -- xcb_window_t transientXcbParent = 0; -+ xcb_window_t transientXcbParent = 0; -+ if (isTransient(window())) { -+ const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) - transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can -@@ -836,6 +836,8 @@ void QXcbWindow::show() - 1, &transientXcbParent)); - } - } -+ if (!transientXcbParent) -+ Q_XCB_CALL(xcb_delete_property(xcb_connection(), m_window, XCB_ATOM_WM_TRANSIENT_FOR)); - - // update _MOTIF_WM_HINTS - updateMotifWmHintsBeforeMap(); -@@ -1195,9 +1197,11 @@ void QXcbWindow::setMotifWindowFlags(Qt::WindowFlags flags) - mwmhints.flags |= MWM_HINTS_DECORATIONS; - - bool customize = flags & Qt::CustomizeWindowHint; -- if (type == Qt::Window && !customize) -- flags |= Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint; -- -+ if (type == Qt::Window && !customize) { -+ const Qt::WindowFlags defaultFlags = Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint; -+ if (!(flags & defaultFlags)) -+ flags |= defaultFlags; -+ } - if (!(flags & Qt::FramelessWindowHint) && !(customize && !(flags & Qt::WindowTitleHint))) { - mwmhints.decorations |= MWM_DECOR_BORDER; - mwmhints.decorations |= MWM_DECOR_RESIZEH; --- -2.7.4 - diff --git a/10-qt5-check-opengl2.sh b/10-qt5-check-opengl2.sh deleted file mode 100755 index 57071d4..0000000 --- a/10-qt5-check-opengl2.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -if [ -z "$QT_XCB_FORCE_SOFTWARE_OPENGL" ]; then - -QT5_CHECK_OPENGL_VERSION=`LANG=C glxinfo 2> /dev/null | grep '^OpenGL version string: ' | head -n 1 | sed -e 's/^OpenGL version string: \([0-9]\).*$/\1/g'` ||: - -if [ "$QT5_CHECK_OPENGL_VERSION" == "1" ]; then - QT_XCB_FORCE_SOFTWARE_OPENGL=1 - export QT_XCB_FORCE_SOFTWARE_OPENGL -fi - -unset QT5_CHECK_OPENGL_VERSION - -fi diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..daa7115 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +qt5-qtbase is in RHEL 7 diff --git a/macros.qt5 b/macros.qt5 deleted file mode 100644 index 9fb7807..0000000 --- a/macros.qt5 +++ /dev/null @@ -1,35 +0,0 @@ -%_qt5 @@NAME@@ -%_qt5_epoch @@EPOCH@@ -%_qt5_version @@VERSION@@ -%_qt5_evr @@EVR@@ -%_qt5_prefix %{_libdir}/qt5 -%_qt5_archdatadir %{_qt5_prefix} -%_qt5_bindir %{_qt5_prefix}/bin -%_qt5_datadir %{_datadir}/qt5 -%_qt5_docdir %{_docdir}/qt5 -%_qt5_examplesdir %{_qt5_prefix}/examples -%_qt5_headerdir %{_includedir}/qt5 -%_qt5_importdir %{_qt5_archdatadir}/imports -%_qt5_libdir %{_libdir} -%_qt5_libexecdir %{_qt5_archdatadir}/libexec -%_qt5_plugindir %{_qt5_archdatadir}/plugins -%_qt5_qmake %{_qt5_bindir}/qmake -%_qt5_settingsdir %{_sysconfdir}/xdg -%_qt5_sysconfdir %{_qt5_settingsdir} -%_qt5_translationdir %{_datadir}/qt5/translations - -%_qt5_cflags %{nil}@@QT5_CFLAGS@@ -%_qt5_cxxflags %{nil}@@QT5_CXXFLAGS@@ -%_qt5_ldflags %{nil}%{?__global_ldflags} @@QT5_RPM_LD_FLAGS@@ -%_qt5_optflags %{optflags} @@QT5_RPM_OPT_FLAGS@@ - -%_qt5_qmake_flags \\\ - QMAKE_CFLAGS_DEBUG="${CFLAGS:-%{_qt5_optflags} %{?_qt5_cflags}}" \\\ - QMAKE_CFLAGS_RELEASE="${CFLAGS:-%{_qt5_optflags} %{?_qt5_cflags}}" \\\ - QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%{_qt5_optflags} %{?_qt5_cxxflags}}" \\\ - QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%{_qt5_optflags} %{?_qt5_cxxflags}}" \\\ - QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%{_qt5_ldflags}}" \\\ - QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%{_qt5_ldflags}}" \\\ - QMAKE_STRIP= - -%qmake_qt5 %{_qt5_qmake} %{?_qt5_qmake_flags} diff --git a/moc-get-the-system-defines-from-the-compiler-itself.patch b/moc-get-the-system-defines-from-the-compiler-itself.patch deleted file mode 100644 index 3912cc7..0000000 --- a/moc-get-the-system-defines-from-the-compiler-itself.patch +++ /dev/null @@ -1,368 +0,0 @@ -From fa0d02eedcacc22db1026b902801b29176755362 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Fri, 21 Aug 2015 17:08:19 -0700 -Subject: [PATCH] moc: get the system #defines from the compiler itself - -In order for moc to properly parse #ifdefs and family, we've had -QMAKE_COMPILER_DEFINES as a list of pre-defined macros from the -compiler. That list is woefully incomplete. - -Instead, let's simply ask the compiler for the list. With GCC and -family, we use the -dM flag while preprocessing. With ICC on Windows, -the flag gains an extra "Q" but is otherwise the same. For MSVC, it -requires using some undocumented switches and parsing environment -variables (I've tested MSVC 2012, 2013 and 2015). - -The new moc option is called --include to be similar to GCC's -include -option. It does more than just parse a list of pre-defined macros and -can be used to insert any sort of code that moc needs to parse prior to -the main file. - -Change-Id: I7de033f80b0e4431b7f1ffff13fca02dbb60a0a6 ---- - mkspecs/features/moc.prf | 31 +++++++++++++-- - qmake/main.cpp | 38 +++++++++++++++++++ - src/tools/moc/main.cpp | 16 +++++++- - src/tools/moc/preprocessor.cpp | 60 +++++++++++++++++------------- - src/tools/moc/preprocessor.h | 1 + - tests/auto/tools/moc/subdir/extradefines.h | 1 + - tests/auto/tools/moc/tst_moc.cpp | 42 +++++++++++++++++++++ - 7 files changed, 158 insertions(+), 31 deletions(-) - create mode 100644 tests/auto/tools/moc/subdir/extradefines.h - -diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf -index c0b5682..af885c3 100644 ---- a/mkspecs/features/moc.prf -+++ b/mkspecs/features/moc.prf -@@ -24,8 +24,25 @@ win32:count(MOC_INCLUDEPATH, 40, >) { - write_file($$absolute_path($$WIN_INCLUDETEMP, $$OUT_PWD), WIN_INCLUDETEMP_CONT)|error("Aborting.") - } - -+# QNX's compiler sets "gcc" config, but does not support the -dM option; -+# iOS builds are multi-arch, so this feature cannot possibly work. -+if(gcc|intel_icl|msvc):!rim_qcc:!ios { -+ moc_predefs.CONFIG = no_link -+ gcc: moc_predefs.commands = $$QMAKE_CXX $$QMAKE_CXXFLAGS -dM -E -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} -+ else:intel_icl: moc_predefs.commands = $$QMAKE_CXX $$QMAKE_CXXFLAGS -QdM -P -Fi${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} -+ else:msvc { -+ # make sure that our bin dir is first in path, so qmake is found -+ moc_predefs.commands = PATH $$shell_path($$[QT_INSTALL_BINS/src]);%PATH%& -+ moc_predefs.commands += $$QMAKE_CXX -Bxqmake $$QMAKE_CXXFLAGS -E ${QMAKE_FILE_IN} 2>NUL >${QMAKE_FILE_OUT} -+ } else: error("Oops, I messed up") -+ moc_predefs.output = $$MOC_DIR/moc_predefs.h -+ moc_predefs.input = MOC_PREDEF_FILE -+ silent: moc_predefs.commands = @echo generating $$moc_predefs.output$$escape_expand(\n\t)@$$moc_predefs.commands -+ QMAKE_EXTRA_COMPILERS += moc_predefs -+ MOC_PREDEF_FILE = $$[QT_HOST_DATA/src]/mkspecs/features/data/dummy.cpp -+} -+ - defineReplace(mocCmdBase) { -- RET = - !isEmpty(WIN_INCLUDETEMP) { - incvar = @$$WIN_INCLUDETEMP - } else { -@@ -34,7 +51,13 @@ defineReplace(mocCmdBase) { - incvar += -I$$shell_quote($$inc) - incvar += $$QMAKE_FRAMEWORKPATH_FLAGS - } -- RET += $$QMAKE_MOC $(DEFINES) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$incvar $$QMAKE_MOC_OPTIONS -+ -+ RET = $$QMAKE_MOC $(DEFINES) -+ -+ isEmpty(MOC_PREDEF_FILE): RET += $$join(QMAKE_COMPILER_DEFINES, " -D", -D) -+ else: RET += --include $$moc_predefs.output -+ -+ RET += $$incvar $$QMAKE_MOC_OPTIONS - return($$RET) - } - -@@ -46,7 +69,7 @@ moc_header.output = $$MOC_DIR/$${QMAKE_H_MOD_MOC}${QMAKE_FILE_BASE}$${first(QMAK - moc_header.input = HEADERS - moc_header.variable_out = SOURCES - moc_header.name = MOC ${QMAKE_FILE_IN} --moc_header.depends += $$WIN_INCLUDETEMP -+moc_header.depends += $$WIN_INCLUDETEMP $$moc_predefs.output - silent:moc_header.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_header.commands - QMAKE_EXTRA_COMPILERS += moc_header - INCREDIBUILD_XGE += moc_header -@@ -58,7 +81,7 @@ moc_source.commands = ${QMAKE_FUNC_mocCmdBase} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_ - moc_source.output = $$MOC_DIR/$${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_EXT_CPP_MOC} - moc_source.input = SOURCES OBJECTIVE_SOURCES - moc_source.name = MOC ${QMAKE_FILE_IN} --moc_source.depends += $$WIN_INCLUDETEMP -+moc_source.depends += $$WIN_INCLUDETEMP $$moc_predefs.output - silent:moc_source.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_source.commands - QMAKE_EXTRA_COMPILERS += moc_source - INCREDIBUILD_XGE += moc_source -diff --git a/qmake/main.cpp b/qmake/main.cpp -index bde537d..e9b8bde 100644 ---- a/qmake/main.cpp -+++ b/qmake/main.cpp -@@ -1,6 +1,7 @@ - /**************************************************************************** - ** - ** Copyright (C) 2015 The Qt Company Ltd. -+** Copyright (C) 2015 Intel Corporation. - ** Contact: http://www.qt.io/licensing/ - ** - ** This file is part of the qmake application of the Qt Toolkit. -@@ -47,6 +48,10 @@ - #include <sys/types.h> - #include <sys/stat.h> - -+#ifdef Q_OS_WIN -+# include <qt_windows.h> -+#endif -+ - QT_BEGIN_NAMESPACE - - #ifdef Q_OS_WIN -@@ -246,6 +251,30 @@ static int doInstall(int argc, char **argv) - return 3; - } - -+static int dumpMacros(const wchar_t *cmdline) -+{ -+ // from http://stackoverflow.com/questions/3665537/how-to-find-out-cl-exes-built-in-macros -+ int argc; -+ wchar_t **argv = CommandLineToArgvW(cmdline, &argc); -+ if (!argv) -+ return 2; -+ for (int i = 0; i < argc; ++i) { -+ if (argv[i][0] != L'-' || argv[i][1] != 'D') -+ continue; -+ -+ wchar_t *value = wcschr(argv[i], L'='); -+ if (value) { -+ *value = 0; -+ ++value; -+ } else { -+ // point to the NUL at the end, so we don't print anything -+ value = argv[i] + wcslen(argv[i]); -+ } -+ wprintf(L"#define %Ls %Ls\n", argv[i] + 2, value); -+ } -+ return 0; -+} -+ - #endif // Q_OS_WIN - - /* This is to work around lame implementation on Darwin. It has been noted that the getpwd(3) function -@@ -280,6 +309,15 @@ int runQMake(int argc, char **argv) - // Workaround for inferior/missing command line tools on Windows: make our own! - if (argc >= 2 && !strcmp(argv[1], "-install")) - return doInstall(argc - 2, argv + 2); -+ -+ { -+ // Support running as Visual C++'s compiler -+ const wchar_t *cmdline = _wgetenv(L"MSC_CMD_FLAGS"); -+ if (!cmdline || !*cmdline) -+ cmdline = _wgetenv(L"MSC_IDE_FLAGS"); -+ if (cmdline && *cmdline) -+ return dumpMacros(cmdline); -+ } - #endif - - QMakeVfs vfs; -diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp -index a5cbad7..d06335d 100644 ---- a/src/tools/moc/main.cpp -+++ b/src/tools/moc/main.cpp -@@ -259,6 +259,11 @@ int runMoc(int argc, char **argv) - prependIncludeOption.setValueName(QStringLiteral("file")); - parser.addOption(prependIncludeOption); - -+ QCommandLineOption includeOption(QStringLiteral("include")); -+ includeOption.setDescription(QStringLiteral("Parse <file> as an #include before the main source(s).")); -+ includeOption.setValueName(QStringLiteral("file")); -+ parser.addOption(includeOption); -+ - QCommandLineOption noNotesWarningsCompatOption(QStringLiteral("n")); - noNotesWarningsCompatOption.setDescription(QStringLiteral("Do not display notes (-nn) or warnings (-nw). Compatibility option.")); - noNotesWarningsCompatOption.setValueName(QStringLiteral("which")); -@@ -406,7 +411,16 @@ int runMoc(int argc, char **argv) - moc.includes = pp.includes; - - // 1. preprocess -- moc.symbols = pp.preprocessed(moc.filename, &in); -+ foreach (const QString &includeName, parser.values(includeOption)) { -+ QByteArray rawName = pp.resolveInclude(QFile::encodeName(includeName), moc.filename); -+ QFile f(QFile::decodeName(rawName)); -+ if (f.open(QIODevice::ReadOnly)) { -+ moc.symbols += Symbol(0, MOC_INCLUDE_BEGIN, rawName); -+ moc.symbols += pp.preprocessed(rawName, &f); -+ moc.symbols += Symbol(0, MOC_INCLUDE_END, rawName); -+ } -+ } -+ moc.symbols += pp.preprocessed(moc.filename, &in); - - if (!pp.preprocessOnly) { - // 2. parse -diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp -index d036c40..70cf14a 100644 ---- a/src/tools/moc/preprocessor.cpp -+++ b/src/tools/moc/preprocessor.cpp -@@ -1001,6 +1001,37 @@ static void mergeStringLiterals(Symbols *_symbols) - } - } - -+QByteArray Preprocessor::resolveInclude(const QByteArray &include, const QByteArray &relativeTo) -+{ -+ // #### stringery -+ QFileInfo fi; -+ if (!relativeTo.isEmpty()) -+ fi.setFile(QFileInfo(QString::fromLocal8Bit(relativeTo.constData())).dir(), QString::fromLocal8Bit(include.constData())); -+ for (int j = 0; j < Preprocessor::includes.size() && !fi.exists(); ++j) { -+ const IncludePath &p = Preprocessor::includes.at(j); -+ if (p.isFrameworkPath) { -+ const int slashPos = include.indexOf('/'); -+ if (slashPos == -1) -+ continue; -+ QByteArray frameworkCandidate = include.left(slashPos); -+ frameworkCandidate.append(".framework/Headers/"); -+ fi.setFile(QString::fromLocal8Bit(QByteArray(p.path + '/' + frameworkCandidate).constData()), QString::fromLocal8Bit(include.mid(slashPos + 1).constData())); -+ } else { -+ fi.setFile(QString::fromLocal8Bit(p.path.constData()), QString::fromLocal8Bit(include.constData())); -+ } -+ // try again, maybe there's a file later in the include paths with the same name -+ // (186067) -+ if (fi.isDir()) { -+ fi = QFileInfo(); -+ continue; -+ } -+ } -+ -+ if (!fi.exists() || fi.isDir()) -+ return QByteArray(); -+ return fi.canonicalFilePath().toLocal8Bit(); -+} -+ - void Preprocessor::preprocess(const QByteArray &filename, Symbols &preprocessed) - { - currentFilenames.push(filename); -@@ -1021,33 +1052,9 @@ void Preprocessor::preprocess(const QByteArray &filename, Symbols &preprocessed) - continue; - until(PP_NEWLINE); - -- // #### stringery -- QFileInfo fi; -- if (local) -- fi.setFile(QFileInfo(QString::fromLocal8Bit(filename.constData())).dir(), QString::fromLocal8Bit(include.constData())); -- for (int j = 0; j < Preprocessor::includes.size() && !fi.exists(); ++j) { -- const IncludePath &p = Preprocessor::includes.at(j); -- if (p.isFrameworkPath) { -- const int slashPos = include.indexOf('/'); -- if (slashPos == -1) -- continue; -- QByteArray frameworkCandidate = include.left(slashPos); -- frameworkCandidate.append(".framework/Headers/"); -- fi.setFile(QString::fromLocal8Bit(QByteArray(p.path + '/' + frameworkCandidate).constData()), QString::fromLocal8Bit(include.mid(slashPos + 1).constData())); -- } else { -- fi.setFile(QString::fromLocal8Bit(p.path.constData()), QString::fromLocal8Bit(include.constData())); -- } -- // try again, maybe there's a file later in the include paths with the same name -- // (186067) -- if (fi.isDir()) { -- fi = QFileInfo(); -- continue; -- } -- } -- -- if (!fi.exists() || fi.isDir()) -+ include = resolveInclude(include, local ? filename : QByteArray()); -+ if (include.isNull()) - continue; -- include = fi.canonicalFilePath().toLocal8Bit(); - - if (Preprocessor::preprocessedIncludes.contains(include)) - continue; -@@ -1202,6 +1209,7 @@ Symbols Preprocessor::preprocessed(const QByteArray &filename, QFile *file) - input = cleaned(input); - - // phase 2: tokenize for the preprocessor -+ index = 0; - symbols = tokenize(input); - - #if 0 -diff --git a/src/tools/moc/preprocessor.h b/src/tools/moc/preprocessor.h -index 9c81f86..d876caf 100644 ---- a/src/tools/moc/preprocessor.h -+++ b/src/tools/moc/preprocessor.h -@@ -67,6 +67,7 @@ public: - QList<QByteArray> frameworks; - QSet<QByteArray> preprocessedIncludes; - Macros macros; -+ QByteArray resolveInclude(const QByteArray &filename, const QByteArray &relativeTo); - Symbols preprocessed(const QByteArray &filename, QFile *device); - - void parseDefineArguments(Macro *m); -diff --git a/tests/auto/tools/moc/subdir/extradefines.h b/tests/auto/tools/moc/subdir/extradefines.h -new file mode 100644 -index 0000000..e7888ce ---- /dev/null -+++ b/tests/auto/tools/moc/subdir/extradefines.h -@@ -0,0 +1 @@ -+#define FOO 1 -diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp -index fa1b68b..1d6a911 100644 ---- a/tests/auto/tools/moc/tst_moc.cpp -+++ b/tests/auto/tools/moc/tst_moc.cpp -@@ -552,6 +552,8 @@ private slots: - void frameworkSearchPath(); - void cstyleEnums(); - void defineMacroViaCmdline(); -+ void defineMacroViaForcedInclude(); -+ void defineMacroViaForcedIncludeRelative(); - void specifyMetaTagsFromCmdline(); - void invokable(); - void singleFunctionKeywordSignalAndSlot(); -@@ -1219,6 +1221,46 @@ void tst_Moc::defineMacroViaCmdline() - #endif - } - -+void tst_Moc::defineMacroViaForcedInclude() -+{ -+#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) -+ QProcess proc; -+ -+ QStringList args; -+ args << "--include" << m_sourceDirectory + QLatin1String("/subdir/extradefines.h"); -+ args << m_sourceDirectory + QStringLiteral("/macro-on-cmdline.h"); -+ -+ proc.start(m_moc, args); -+ QVERIFY(proc.waitForFinished()); -+ QCOMPARE(proc.exitCode(), 0); -+ QCOMPARE(proc.readAllStandardError(), QByteArray()); -+ QByteArray mocOut = proc.readAllStandardOutput(); -+ QVERIFY(!mocOut.isEmpty()); -+#else -+ QSKIP("Only tested on linux/gcc"); -+#endif -+} -+ -+void tst_Moc::defineMacroViaForcedIncludeRelative() -+{ -+#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) -+ QProcess proc; -+ -+ QStringList args; -+ args << "--include" << QStringLiteral("extradefines.h") << "-I" + m_sourceDirectory + "/subdir"; -+ args << m_sourceDirectory + QStringLiteral("/macro-on-cmdline.h"); -+ -+ proc.start(m_moc, args); -+ QVERIFY(proc.waitForFinished()); -+ QCOMPARE(proc.exitCode(), 0); -+ QCOMPARE(proc.readAllStandardError(), QByteArray()); -+ QByteArray mocOut = proc.readAllStandardOutput(); -+ QVERIFY(!mocOut.isEmpty()); -+#else -+ QSKIP("Only tested on linux/gcc"); -+#endif -+} -+ - // tst_Moc::specifyMetaTagsFromCmdline() - // plugin_metadata.h contains a plugin which we register here. Since we're not building this - // application as a plugin, we need top copy some of the initializer code found in qplugin.h: --- -1.9.3 - diff --git a/qconfig-multilib.h b/qconfig-multilib.h deleted file mode 100644 index a104c37..0000000 --- a/qconfig-multilib.h +++ /dev/null @@ -1,23 +0,0 @@ -/* qconfig.h */ -/* This file is here to prevent a file conflict on multiarch systems. A - * conflict will occur because qconfig.h has arch-specific definitions. - * - * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */ - -#ifndef QCONFIG_MULTILIB_H -#define QCONFIG_MULTILIB_H - -#ifndef __WORDSIZE -#include <bits/wordsize.h> -#endif - -#if __WORDSIZE == 32 -#include "QtCore/qconfig-32.h" -#elif __WORDSIZE == 64 -#include "QtCore/qconfig-64.h" -#else -#error "unexpected value for __WORDSIZE macro" -#endif - -#endif - diff --git a/qt5-qtbase-cxxflag.patch b/qt5-qtbase-cxxflag.patch deleted file mode 100644 index d428c6f..0000000 --- a/qt5-qtbase-cxxflag.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qtbase-opensource-src-5.6.0/mkspecs/common/gcc-base.conf.than qtbase-opensource-src-5.6.0/mkspecs/common/gcc-base.conf ---- qtbase-opensource-src-5.6.0/mkspecs/common/gcc-base.conf.than 2016-06-02 17:30:07.249027901 +0200 -+++ qtbase-opensource-src-5.6.0/mkspecs/common/gcc-base.conf 2016-06-02 17:30:14.681748012 +0200 -@@ -32,7 +32,7 @@ - # - - QMAKE_CFLAGS_OPTIMIZE = -O2 --QMAKE_CFLAGS_OPTIMIZE_FULL = -O3 -+QMAKE_CFLAGS_OPTIMIZE_FULL = -O2 - - QMAKE_CFLAGS += -pipe - QMAKE_CFLAGS_DEPS += -M diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec deleted file mode 100644 index 08ebad0..0000000 --- a/qt5-qtbase.spec +++ /dev/null @@ -1,1678 +0,0 @@ -# See http://bugzilla.redhat.com/223663 -%define multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9 -%define multilib_basearchs x86_64 %{?mips64} ppc64 s390x sparc64 - -# support qtchooser (adds qtchooser .conf file) -%define qtchooser 1 -%if 0%{?qtchooser} -%define priority 10 -%ifarch %{multilib_basearchs} -%define priority 15 -%endif -%endif - -%global qt_module qtbase - -%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) - -## set to 1 to enable bootstrap -%global bootstrap 0 - -%if 0%{?fedora} > 21 -# use external qt_settings pkg -%global qt_settings 1 -%endif - -# See http://bugzilla.redhat.com/1279265 -%if 0%{?fedora} < 24 -%global inject_optflags 1 -%endif - -%if 0%{?fedora} > 23 || 0%{?rhel} > 6 -%global journald -journald -BuildRequires: perl-generators -BuildRequires: pkgconfig(libsystemd) -%endif - -%if 0%{?fedora} > 23 -# gcc6: FTBFS -%global qt5_deprecated_flag -Wno-deprecated-declarations -# gcc6: Qt assumes this in places -%global qt5_null_flag -fno-delete-null-pointer-checks -%endif - -# define to build docs, need to undef this for bootstrapping -# where qt5-qttools builds are not yet available -# only primary archs (for now), allow secondary to bootstrap -%if ! 0%{?bootstrap} -%ifarch %{arm} %{ix86} x86_64 %{power64} s390 s390x aarch64 -%global docs 1 -%endif -%global examples 1 -%global tests 1 -%endif - -#define prerelease rc - -Summary: Qt5 - QtBase components -Name: qt5-qtbase -Version: 5.6.1 -Release: 4%{?prerelease:.%{prerelease}}%{?dist} - -# See LGPL_EXCEPTIONS.txt, for exception details -License: LGPLv2 with exceptions or GPLv3 with exceptions -Url: http://qt-project.org/ -Source0: http://download.qt.io/official_releases/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz - -# https://bugzilla.redhat.com/show_bug.cgi?id=1227295 -Source1: qtlogging.ini - -# header file to workaround multilib issue -# https://bugzilla.redhat.com/show_bug.cgi?id=1036956 -Source5: qconfig-multilib.h - -# xinitrc script to check for OpenGL 1 only drivers and automatically set -# QT_XCB_FORCE_SOFTWARE_OPENGL for them -Source6: 10-qt5-check-opengl2.sh - -# support multilib optflags -Patch2: qtbase-multilib_optflags.patch - -# fix QTBUG-35459 (too low entityCharacterLimit=1024 for CVE-2013-4549) -Patch4: qtbase-opensource-src-5.3.2-QTBUG-35459.patch - -# unconditionally enable freetype lcdfilter support -Patch12: qtbase-opensource-src-5.2.0-enable_ft_lcdfilter.patch - -# upstreamable patches - -# Workaround moc/multilib issues -# https://bugzilla.redhat.com/show_bug.cgi?id=1290020 -# https://bugreports.qt.io/browse/QTBUG-49972 -Patch52: qtbase-opensource-src-5.6.0-moc_WORDSIZE.patch - -# arm patch -Patch54: qtbase-opensource-src-5.6.0-arm.patch - -# recently passed code review, not integrated yet -# https://codereview.qt-project.org/126102/ -Patch60: moc-get-the-system-defines-from-the-compiler-itself.patch - -# drop -O3 and make -O2 by default -Patch61: qt5-qtbase-cxxflag.patch - -## upstream patches -Patch101: 0001-xcb-Properly-interpret-data.l-0-field-of-XdndStatus-.patch -Patch111: 0011-XCB-Auto-detect-xcb-glx-also-with-xcb-qt.patch -Patch132: 0032-xcb-Fix-drop-of-text-uri-list-and-text-html.patch -Patch133: 0033-xcb-Fix-dropping-URL-on-Firefox-window.patch -Patch148: 0148-xcb-Disable-GLX-pbuffers-with-Chromium-in-VMs.patch -Patch155: 0155-xcb-Fix-transient-parent-and-Qt-Window-flag.patch - -# macros, be mindful to keep sync'd with macros.qt5 -Source10: macros.qt5 -%define _qt5 %{name} -%define _qt5_prefix %{_libdir}/qt5 -%define _qt5_archdatadir %{_libdir}/qt5 -# -devel bindir items (still) conflict with qt4 -# at least until this is all implemented, -# http://lists.qt-project.org/pipermail/development/2012-November/007990.html -%define _qt5_bindir %{_qt5_prefix}/bin -%define _qt5_datadir %{_datadir}/qt5 -%define _qt5_docdir %{_docdir}/qt5 -%define _qt5_examplesdir %{_qt5_prefix}/examples -%define _qt5_headerdir %{_includedir}/qt5 -%define _qt5_importdir %{_qt5_archdatadir}/imports -%define _qt5_libdir %{_libdir} -%define _qt5_libexecdir %{_qt5_archdatadir}/libexec -%define _qt5_plugindir %{_qt5_archdatadir}/plugins -%define _qt5_settingsdir %{_sysconfdir}/xdg -%define _qt5_sysconfdir %{_qt5_settingsdir} -%define _qt5_translationdir %{_datadir}/qt5/translations - -# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. -# Those themes are there for platform integration. If the required libraries are -# not there, the platform to integrate with isn't either. Then Qt will just -# silently ignore the plugin that fails to load. Thus, there is no need to let -# RPM drag in gtk2 as a dependency for the GTK+ 2 dialog support. -%global __requires_exclude_from ^%{_qt5_plugindir}/platformthemes/.*$ - -# for %%check, rpm auto-provides -%if 0%{?fedora} -BuildRequires: cmake >= 3 -%endif -%if 0%{?rhel} -BuildRequires: cmake3 -%endif -BuildRequires: cups-devel -BuildRequires: desktop-file-utils -BuildRequires: findutils -BuildRequires: libjpeg-devel -BuildRequires: libmng-devel -BuildRequires: libtiff-devel -BuildRequires: pkgconfig(alsa) -# http://bugzilla.redhat.com/1196359 -%if 0%{?fedora} || 0%{?rhel} > 6 -%global dbus -dbus-linked -BuildRequires: pkgconfig(dbus-1) -%endif -BuildRequires: pkgconfig(libdrm) -BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(libproxy-1.0) -# xcb-sm -BuildRequires: pkgconfig(ice) pkgconfig(sm) -BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libudev) -%global openssl -openssl-linked -BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) -%if 0%{?fedora} -%global xkbcommon -system-xkbcommon -BuildRequires: pkgconfig(libinput) -BuildRequires: pkgconfig(xcb-xkb) >= 1.10 -BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 -BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1 -%else -# not Fedora -%if 0%{?rhel} == 6 -%global xcb -qt-xcb -%endif -%global xkbcommon -qt-xkbcommon -Provides: bundled(libxkbcommon) = 0.4.1 -%endif -BuildRequires: pkgconfig(xkeyboard-config) -%if 0%{?fedora} || 0%{?rhel} > 6 -%define egl 1 -BuildRequires: pkgconfig(egl) -BuildRequires: pkgconfig(gbm) -BuildRequires: pkgconfig(glesv2) -%global sqlite -system-sqlite -BuildRequires: pkgconfig(sqlite3) >= 3.7 -%if 0%{?fedora} > 22 -%global harfbuzz -system-harfbuzz -BuildRequires: pkgconfig(harfbuzz) >= 0.9.42 -%endif -BuildRequires: pkgconfig(icu-i18n) -BuildRequires: pkgconfig(libpcre) >= 8.30 -%define pcre -system-pcre -BuildRequires: pkgconfig(xcb-xkb) -%else -BuildRequires: libicu-devel -%define pcre -qt-pcre -%endif -BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil) -BuildRequires: pkgconfig(zlib) - -%if 0%{?tests} -BuildRequires: dbus-x11 -BuildRequires: mesa-dri-drivers -BuildRequires: time -BuildRequires: xorg-x11-server-Xvfb -%endif - -%if 0%{?qtchooser} -%if 0%{?fedora} -Conflicts: qt < 1:4.8.6-10 -%endif -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives -%endif -%if 0%{?qt_settings} -Requires: qt-settings -%endif -Requires: %{name}-common = %{version}-%{release} - -## Sql drivers -%if 0%{?rhel} -%define ibase -no-sql-ibase -%define tds -no-sql-tds -%endif - -%description -Qt is a software toolkit for developing applications. - -This package contains base tools, like string, xml, and network -handling. - -%package common -Summary: Common files for Qt5 -Requires: %{name} = %{version}-%{release} -BuildArch: noarch -%description common -%{summary}. - -%package devel -Summary: Development files for %{name} -Provides: %{name}-private-devel = %{version}-%{release} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-gui%{?_isa} -%if 0%{?egl} -Requires: pkgconfig(egl) -%endif -Requires: pkgconfig(gl) -Requires: qt5-rpm-macros -%description devel -%{summary}. - -%if 0%{?docs} -%package doc -Summary: API documentation for %{name} -License: GFDL -Requires: %{name} = %{version}-%{release} -BuildRequires: qt5-qhelpgenerator -BuildRequires: qt5-qdoc -BuildArch: noarch -%description doc -%{summary}. -%endif - -%package examples -Summary: Programming examples for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -%description examples -%{summary}. - -%package static -Summary: Static library files for %{name} -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Requires: pkgconfig(fontconfig) -Requires: pkgconfig(glib-2.0) -%if 0%{?fedora} -Requires: pkgconfig(libinput) -Requires: pkgconfig(xkbcommon) -%endif -Requires: pkgconfig(zlib) -%description static -%{summary}. - -%if "%{?ibase}" != "-no-sql-ibase" -%package ibase -Summary: IBase driver for Qt5's SQL classes -BuildRequires: firebird-devel -Requires: %{name}%{?_isa} = %{version}-%{release} -%description ibase -%{summary}. -%endif - -%package mysql -Summary: MySQL driver for Qt5's SQL classes -BuildRequires: mysql-devel -Requires: %{name}%{?_isa} = %{version}-%{release} -%description mysql -%{summary}. - -%package odbc -Summary: ODBC driver for Qt5's SQL classes -BuildRequires: unixODBC-devel -Requires: %{name}%{?_isa} = %{version}-%{release} -%description odbc -%{summary}. - -%package postgresql -Summary: PostgreSQL driver for Qt5's SQL classes -BuildRequires: postgresql-devel -Requires: %{name}%{?_isa} = %{version}-%{release} -%description postgresql -%{summary}. - -%if "%{?tds}" != "-no-sql-tds" -%package tds -Summary: TDS driver for Qt5's SQL classes -BuildRequires: freetds-devel -Requires: %{name}%{?_isa} = %{version}-%{release} -%description tds -%{summary}. -%endif - -# debating whether to do 1 subpkg per library or not -- rex -%package gui -Summary: Qt5 GUI-related libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -%if 0%{?fedora} > 20 -Recommends: mesa-dri-drivers -%endif -Obsoletes: qt5-qtbase-x11 < 5.2.0 -Provides: qt5-qtbase-x11 = %{version}-%{release} -# for Source6: 10-qt5-check-opengl2.sh: -# glxinfo -Requires: glx-utils -%description gui -Qt5 libraries used for drawing widgets and OpenGL items. - -%package -n qt5-rpm-macros -Summary: RPM macros for Qt5 -%if 0%{?fedora} > 22 && 0%{?inject_optflags} -# https://bugzilla.redhat.com/show_bug.cgi?id=1248174 -Requires: redhat-rpm-config -%endif -%if 0%{?fedora} -Requires: cmake >= 3 -%endif -%if 0%{?rhel} -Requires: cmake3 -%endif -# when qt5-rpm-macros was split out -Conflicts: qt5-qtbase-devel < 5.6.0-0.23 -BuildArch: noarch -%description -n qt5-rpm-macros -RPM macros for building Qt5 packages. - - -%prep -%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} - -%patch4 -p1 -b .QTBUG-35459 -%patch12 -p1 -b .enable_ft_lcdfilter - -%patch52 -p1 -b .moc_WORDSIZE -%patch54 -p1 -b .arm -%patch60 -p1 -b .moc_system_defines -%patch61 -p1 -b .qt5-qtbase-cxxflag - -%patch101 -p1 -b .0001-xcb -%patch111 -p1 -b .0011 -%patch132 -p1 -b .0032 -%patch133 -p1 -b .0033 -%patch148 -p1 -b .0148 -%patch155 -p1 -b .0155 - -%define platform linux-g++ - -%if 0%{?inject_optflags} -## adjust $RPM_OPT_FLAGS -# remove -fexceptions -RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` -# these flags are for qtbase build only, no need to propogate elsewhere -#RPM_OPT_FLAGS="$RPM_OPT_FLAGS %{?qt5_deprecated_flag} %{?qt5_arm_flag}" - -%patch2 -p1 -b .multilib_optflags -# drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463 -rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags - -sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" \ - mkspecs/%{platform}/qmake.conf - -sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 $RPM_LD_FLAGS|" \ - mkspecs/common/g++-unix.conf - -# undefine QMAKE_STRIP (and friends), so we get useful -debuginfo pkgs (#1065636) -sed -i -e 's|^\(QMAKE_STRIP.*=\).*$|\1|g' mkspecs/common/linux.conf -%endif - -%if 0%{?prerelease} -bin/syncqt.pl -version %{version} -%endif - -# move some bundled libs to ensure they're not accidentally used -pushd src/3rdparty -mkdir UNUSED -mv freetype libjpeg libpng zlib UNUSED/ -%if "%{?sqlite}" == "-system-sqlite" -mv sqlite UNUSED/ -%endif -%if "%{?xcb}" != "-qt-xcb" -mv xcb UNUSED/ -%endif -popd - -# builds failing mysteriously on f20 -# ./configure: Permission denied -# check to ensure that can't happen -- rex -test -x configure || chmod +x configure - - -%build -## FIXME/TODO: -# * for %%ix86, add sse2 enabled builds for Qt5Gui, Qt5Core, QtNetwork, see also: -# http://anonscm.debian.org/cgit/pkg-kde/qt/qtbase.git/tree/debian/rules (234-249) - -## adjust $RPM_OPT_FLAGS -# remove -fexceptions -RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` -RPM_OPT_FLAGS="$RPM_OPT_FLAGS %{?qt5_arm_flag} %{?qt5_deprecated_flag} %{?qt5_null_flag}" - -export CFLAGS="$CFLAGS $RPM_OPT_FLAGS" -export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS" -export LDFLAGS="$LDFLAGS $RPM_LD_FLAGS" -export MAKEFLAGS="%{?_smp_mflags}" - -./configure -v \ - -confirm-license \ - -opensource \ - -prefix %{_qt5_prefix} \ - -archdatadir %{_qt5_archdatadir} \ - -bindir %{_qt5_bindir} \ - -datadir %{_qt5_datadir} \ - -docdir %{_qt5_docdir} \ - -examplesdir %{_qt5_examplesdir} \ - -headerdir %{_qt5_headerdir} \ - -importdir %{_qt5_importdir} \ - -libdir %{_qt5_libdir} \ - -libexecdir %{_qt5_libexecdir} \ - -plugindir %{_qt5_plugindir} \ - -sysconfdir %{_qt5_sysconfdir} \ - -translationdir %{_qt5_translationdir} \ - -platform %{platform} \ - -release \ - -shared \ - -accessibility \ - %{?dbus}%{!?dbus:-dbus-runtime} \ - -fontconfig \ - -glib \ - -gtkstyle \ - %{?ibase} \ - -iconv \ - -icu \ - %{?journald} \ - %{?openssl} \ - -optimized-qmake \ - %{!?examples:-nomake examples} \ - %{!?tests:-nomake tests} \ - -no-pch \ - -no-rpath \ - -no-separate-debug-info \ -%ifarch %{ix86} - -no-sse2 \ -%endif - -no-strip \ - -system-libjpeg \ - -system-libpng \ - %{?harfbuzz} \ - %{?pcre} \ - %{?sqlite} \ - %{?tds} \ - %{?xcb} \ - %{?xkbcommon} \ - -system-zlib \ - -no-directfb - -%if ! 0%{?inject_optflags} -# ensure qmake build using optflags (which can happen if not munging qmake.conf defaults) -make clean -C qmake -make %{?_smp_mflags} -C qmake \ - QMAKE_CFLAGS_RELEASE="${CFLAGS:-$RPM_OPT_FLAGS}" \ - QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-$RPM_OPT_FLAGS}" \ - QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}" \ - QMAKE_STRIP= -%endif - -make %{?_smp_mflags} - -%if 0%{?docs} -# HACK to avoid multilib conflicts in noarch content -# see also https://bugreports.qt-project.org/browse/QTBUG-42071 -QT_HASH_SEED=0; export QT_HASH_SEED - -make html_docs -make qch_docs -%endif - - -%install -make install INSTALL_ROOT=%{buildroot} - -%if 0%{?docs} -make install_docs INSTALL_ROOT=%{buildroot} -%endif - -install -m644 -p -D %{SOURCE1} %{buildroot}%{_qt5_datadir}/qtlogging.ini - -# Qt5.pc -cat >%{buildroot}%{_libdir}/pkgconfig/Qt5.pc<<EOF -prefix=%{_qt5_prefix} -archdatadir=%{_qt5_archdatadir} -bindir=%{_qt5_bindir} -datadir=%{_qt5_datadir} - -docdir=%{_qt5_docdir} -examplesdir=%{_qt5_examplesdir} -headerdir=%{_qt5_headerdir} -importdir=%{_qt5_importdir} -libdir=%{_qt5_libdir} -libexecdir=%{_qt5_libexecdir} -moc=%{_qt5_bindir}/moc -plugindir=%{_qt5_plugindir} -qmake=%{_qt5_bindir}/qmake -settingsdir=%{_qt5_settingsdir} -sysconfdir=%{_qt5_sysconfdir} -translationdir=%{_qt5_translationdir} - -Name: Qt5 -Description: Qt5 Configuration -Version: %{version} -EOF - -# rpm macros -install -p -m644 -D %{SOURCE10} \ - %{buildroot}%{rpm_macros_dir}/macros.qt5 -sed -i \ - -e "s|@@NAME@@|%{name}|g" \ - -e "s|@@EPOCH@@|%{?epoch}%{!?epoch:0}|g" \ - -e "s|@@VERSION@@|%{version}|g" \ - -e "s|@@EVR@@|%{?epoch:%{epoch:}}%{version}-%{release}|g" \ - -e "s|@@QT5_CFLAGS@@|%{?qt5_cflags}|g" \ - -e "s|@@QT5_CXXFLAGS@@|%{?qt5_cxxflags}|g" \ - -e "s|@@QT5_RPM_LD_FLAGS@@|%{?qt5_rpm_ld_flags}|g" \ - -e "s|@@QT5_RPM_OPT_FLAGS@@|%{?qt5_rpm_opt_flags} %{?qt5_null_flag}|g" \ - %{buildroot}%{rpm_macros_dir}/macros.qt5 - -# create/own dirs -mkdir -p %{buildroot}{%{_qt5_archdatadir}/mkspecs/modules,%{_qt5_importdir},%{_qt5_libexecdir},%{_qt5_plugindir}/{designer,iconengines,script,styles},%{_qt5_translationdir}} -mkdir -p %{buildroot}%{_sysconfdir}/xdg/QtProject - -# hardlink files to %{_bindir}, add -qt5 postfix to not conflict -mkdir %{buildroot}%{_bindir} -pushd %{buildroot}%{_qt5_bindir} -for i in * ; do - case "${i}" in - moc|qdbuscpp2xml|qdbusxml2cpp|qmake|rcc|syncqt|uic) - ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5 - ln -sv ${i} ${i}-qt5 - ;; - *) - ln -v ${i} %{buildroot}%{_bindir}/${i} - ;; - esac -done -popd - -%ifarch %{multilib_archs} -# multilib: qconfig.h - mv %{buildroot}%{_qt5_headerdir}/QtCore/qconfig.h %{buildroot}%{_qt5_headerdir}/QtCore/qconfig-%{__isa_bits}.h - install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt5_headerdir}/QtCore/qconfig.h -%endif - -# qtchooser conf -%if 0%{?qtchooser} - mkdir -p %{buildroot}%{_sysconfdir}/xdg/qtchooser - pushd %{buildroot}%{_sysconfdir}/xdg/qtchooser - echo "%{_qt5_bindir}" > 5-%{__isa_bits}.conf - echo "%{_qt5_prefix}" >> 5-%{__isa_bits}.conf - # alternatives targets - touch default.conf 5.conf - popd -%endif - -## .prl/.la file love -# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs -pushd %{buildroot}%{_qt5_libdir} -for prl_file in libQt5*.prl ; do - sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} - if [ -f "$(basename ${prl_file} .prl).so" ]; then - rm -fv "$(basename ${prl_file} .prl).la" - sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} - fi -done -popd - -install -p -m755 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/10-qt5-check-opengl2.sh - - -%check -%if 0%{?tests} -## see tests/README for expected environment (running a plasma session essentially) -## we are not quite there yet -export CTEST_OUTPUT_ON_FAILURE=1 -export PATH=%{buildroot}%{_qt5_bindir}:$PATH -export LD_LIBRARY_PATH=%{buildroot}%{_qt5_libdir} -# dbus tests error out when building if session bus is not available -dbus-launch --exit-with-session \ -make sub-tests %{?_smp_mflags} -k ||: -xvfb-run -a --server-args="-screen 0 1280x1024x32" \ -dbus-launch --exit-with-session \ -time \ -make check -k ||: -%endif - - -%if 0%{?qtchooser} -%pre -if [ $1 -gt 1 ] ; then -# remove short-lived qt5.conf alternatives -%{_sbindir}/update-alternatives \ - --remove qtchooser-qt5 \ - %{_sysconfdir}/xdg/qtchooser/qt5-%{__isa_bits}.conf >& /dev/null ||: - -%{_sbindir}/update-alternatives \ - --remove qtchooser-default \ - %{_sysconfdir}/xdg/qtchooser/qt5.conf >& /dev/null ||: -fi -%endif - -%post -/sbin/ldconfig -%if 0%{?qtchooser} -%{_sbindir}/update-alternatives \ - --install %{_sysconfdir}/xdg/qtchooser/5.conf \ - qtchooser-5 \ - %{_sysconfdir}/xdg/qtchooser/5-%{__isa_bits}.conf \ - %{priority} - -%{_sbindir}/update-alternatives \ - --install %{_sysconfdir}/xdg/qtchooser/default.conf \ - qtchooser-default \ - %{_sysconfdir}/xdg/qtchooser/5.conf \ - %{priority} -%endif - -%postun -/sbin/ldconfig -%if 0%{?qtchooser} -if [ $1 -eq 0 ]; then -%{_sbindir}/update-alternatives \ - --remove qtchooser-5 \ - %{_sysconfdir}/xdg/qtchooser/5-%{__isa_bits}.conf - -%{_sbindir}/update-alternatives \ - --remove qtchooser-default \ - %{_sysconfdir}/xdg/qtchooser/5.conf -fi -%endif - -%files -%{!?_licensedir:%global license %%doc} -%license LICENSE.LGPL* LGPL_EXCEPTION.txt LICENSE.FDL -%if 0%{?qtchooser} -%dir %{_sysconfdir}/xdg/qtchooser -# not editable config files, so not using %%config here -%ghost %{_sysconfdir}/xdg/qtchooser/default.conf -%ghost %{_sysconfdir}/xdg/qtchooser/5.conf -%{_sysconfdir}/xdg/qtchooser/5-%{__isa_bits}.conf -%endif -%dir %{_sysconfdir}/xdg/QtProject/ -%{_qt5_libdir}/libQt5Concurrent.so.5* -%{_qt5_libdir}/libQt5Core.so.5* -%{_qt5_libdir}/libQt5DBus.so.5* -%{_qt5_libdir}/libQt5Network.so.5* -%{_qt5_libdir}/libQt5Sql.so.5* -%{_qt5_libdir}/libQt5Test.so.5* -%{_qt5_libdir}/libQt5Xml.so.5* -%dir %{_qt5_libdir}/cmake/ -%dir %{_qt5_libdir}/cmake/Qt5/ -%dir %{_qt5_libdir}/cmake/Qt5Concurrent/ -%dir %{_qt5_libdir}/cmake/Qt5Core/ -%dir %{_qt5_libdir}/cmake/Qt5DBus/ -%dir %{_qt5_libdir}/cmake/Qt5Gui/ -%dir %{_qt5_libdir}/cmake/Qt5Network/ -%dir %{_qt5_libdir}/cmake/Qt5OpenGL/ -%dir %{_qt5_libdir}/cmake/Qt5PrintSupport/ -%dir %{_qt5_libdir}/cmake/Qt5Sql/ -%dir %{_qt5_libdir}/cmake/Qt5Test/ -%dir %{_qt5_libdir}/cmake/Qt5Widgets/ -%dir %{_qt5_libdir}/cmake/Qt5Xml/ -%dir %{_qt5_docdir}/ -%{_qt5_docdir}/global/ -%{_qt5_importdir}/ -%{_qt5_translationdir}/ -%dir %{_qt5_prefix}/ -%dir %{_qt5_datadir}/ -%{_qt5_datadir}/qtlogging.ini -%dir %{_qt5_libexecdir}/ -%dir %{_qt5_plugindir}/ -%dir %{_qt5_plugindir}/bearer/ -%{_qt5_plugindir}/bearer/libqconnmanbearer.so -%{_qt5_plugindir}/bearer/libqgenericbearer.so -%{_qt5_plugindir}/bearer/libqnmbearer.so -%{_qt5_libdir}/cmake/Qt5Network/Qt5Network_QConnmanEnginePlugin.cmake -%{_qt5_libdir}/cmake/Qt5Network/Qt5Network_QGenericEnginePlugin.cmake -%{_qt5_libdir}/cmake/Qt5Network/Qt5Network_QNetworkManagerEnginePlugin.cmake -%dir %{_qt5_plugindir}/designer/ -%dir %{_qt5_plugindir}/generic/ -%dir %{_qt5_plugindir}/iconengines/ -%dir %{_qt5_plugindir}/imageformats/ -%dir %{_qt5_plugindir}/platforminputcontexts/ -%dir %{_qt5_plugindir}/platforms/ -%dir %{_qt5_plugindir}/platformthemes/ -%dir %{_qt5_plugindir}/printsupport/ -%dir %{_qt5_plugindir}/script/ -%dir %{_qt5_plugindir}/sqldrivers/ -%dir %{_qt5_plugindir}/styles/ -%{_qt5_plugindir}/sqldrivers/libqsqlite.so -%{_qt5_libdir}/cmake/Qt5Sql/Qt5Sql_QSQLiteDriverPlugin.cmake - -%files common -# empty for now, consider: filesystem/dir ownership, licenses - -%if 0%{?docs} -%files doc -%license LICENSE.FDL -%doc dist/README dist/changes-5.* -%{_qt5_docdir}/*.qch -%if 0%{?examples} -%if 0%{!?bootstrap} -# included in -examples instead, see bug #1212750 -%exclude %{_qt5_docdir}/*/examples-manifest.xml -%endif -%endif -%{_qt5_docdir}/qmake/ -%{_qt5_docdir}/qtconcurrent/ -%{_qt5_docdir}/qtcore/ -%{_qt5_docdir}/qtdbus/ -%{_qt5_docdir}/qtgui/ -%{_qt5_docdir}/qtnetwork/ -%{_qt5_docdir}/qtopengl/ -%{_qt5_docdir}/qtplatformheaders/ -%{_qt5_docdir}/qtprintsupport/ -%{_qt5_docdir}/qtsql/ -%{_qt5_docdir}/qttestlib/ -%{_qt5_docdir}/qtwidgets/ -%{_qt5_docdir}/qtxml/ -%endif - -%files devel -%if "%{_qt5_bindir}" != "%{_bindir}" -%dir %{_qt5_bindir} -%endif -%{_bindir}/moc* -%{_bindir}/qdbuscpp2xml* -%{_bindir}/qdbusxml2cpp* -%{_bindir}/qmake* -%{_bindir}/rcc* -%{_bindir}/syncqt* -%{_bindir}/uic* -%{_bindir}/qlalr -%{_bindir}/fixqt4headers.pl -%{_qt5_bindir}/moc* -%{_qt5_bindir}/qdbuscpp2xml* -%{_qt5_bindir}/qdbusxml2cpp* -%{_qt5_bindir}/qmake* -%{_qt5_bindir}/rcc* -%{_qt5_bindir}/syncqt* -%{_qt5_bindir}/uic* -%{_qt5_bindir}/qlalr -%{_qt5_bindir}/fixqt4headers.pl -%if "%{_qt5_headerdir}" != "%{_includedir}" -%dir %{_qt5_headerdir} -%endif -%{_qt5_headerdir}/QtConcurrent/ -%{_qt5_headerdir}/QtCore/ -%{_qt5_headerdir}/QtDBus/ -%{_qt5_headerdir}/QtGui/ -%{_qt5_headerdir}/QtNetwork/ -%{_qt5_headerdir}/QtOpenGL/ -%{_qt5_headerdir}/QtPlatformHeaders/ -%{_qt5_headerdir}/QtPrintSupport/ -%{_qt5_headerdir}/QtSql/ -%{_qt5_headerdir}/QtTest/ -%{_qt5_headerdir}/QtWidgets/ -%{_qt5_headerdir}/QtXml/ -%{_qt5_archdatadir}/mkspecs/ -%{_qt5_libdir}/libQt5Concurrent.prl -%{_qt5_libdir}/libQt5Concurrent.so -%{_qt5_libdir}/libQt5Core.prl -%{_qt5_libdir}/libQt5Core.so -%{_qt5_libdir}/libQt5DBus.prl -%{_qt5_libdir}/libQt5DBus.so -%{_qt5_libdir}/libQt5Gui.prl -%{_qt5_libdir}/libQt5Gui.so -%{_qt5_libdir}/libQt5Network.prl -%{_qt5_libdir}/libQt5Network.so -%{_qt5_libdir}/libQt5OpenGL.prl -%{_qt5_libdir}/libQt5OpenGL.so -%{_qt5_libdir}/libQt5PrintSupport.prl -%{_qt5_libdir}/libQt5PrintSupport.so -%{_qt5_libdir}/libQt5Sql.prl -%{_qt5_libdir}/libQt5Sql.so -%{_qt5_libdir}/libQt5Test.prl -%{_qt5_libdir}/libQt5Test.so -%{_qt5_libdir}/libQt5Widgets.prl -%{_qt5_libdir}/libQt5Widgets.so -%{_qt5_libdir}/libQt5XcbQpa.prl -%{_qt5_libdir}/libQt5XcbQpa.so -%{_qt5_libdir}/libQt5Xml.prl -%{_qt5_libdir}/libQt5Xml.so -%{_qt5_libdir}/cmake/Qt5/Qt5Config*.cmake -%{_qt5_libdir}/cmake/Qt5Concurrent/Qt5ConcurrentConfig*.cmake -%{_qt5_libdir}/cmake/Qt5Core/Qt5CoreConfig*.cmake -%{_qt5_libdir}/cmake/Qt5Core/Qt5CoreMacros.cmake -%{_qt5_libdir}/cmake/Qt5Core/Qt5CTestMacros.cmake -%{_qt5_libdir}/cmake/Qt5DBus/Qt5DBusConfig*.cmake -%{_qt5_libdir}/cmake/Qt5DBus/Qt5DBusMacros.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5GuiConfig*.cmake -%{_qt5_libdir}/cmake/Qt5Network/Qt5NetworkConfig*.cmake -%{_qt5_libdir}/cmake/Qt5OpenGL/Qt5OpenGLConfig*.cmake -%{_qt5_libdir}/cmake/Qt5PrintSupport/Qt5PrintSupportConfig*.cmake -%{_qt5_libdir}/cmake/Qt5Sql/Qt5SqlConfig*.cmake -%{_qt5_libdir}/cmake/Qt5Test/Qt5TestConfig*.cmake -%{_qt5_libdir}/cmake/Qt5Widgets/Qt5WidgetsConfig*.cmake -%{_qt5_libdir}/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake -%{_qt5_libdir}/cmake/Qt5Xml/Qt5XmlConfig*.cmake -%{_qt5_libdir}/pkgconfig/Qt5.pc -%{_qt5_libdir}/pkgconfig/Qt5Concurrent.pc -%{_qt5_libdir}/pkgconfig/Qt5Core.pc -%{_qt5_libdir}/pkgconfig/Qt5DBus.pc -%{_qt5_libdir}/pkgconfig/Qt5Gui.pc -%{_qt5_libdir}/pkgconfig/Qt5Network.pc -%{_qt5_libdir}/pkgconfig/Qt5OpenGL.pc -%{_qt5_libdir}/pkgconfig/Qt5PrintSupport.pc -%{_qt5_libdir}/pkgconfig/Qt5Sql.pc -%{_qt5_libdir}/pkgconfig/Qt5Test.pc -%{_qt5_libdir}/pkgconfig/Qt5Widgets.pc -%{_qt5_libdir}/pkgconfig/Qt5Xml.pc -%if 0%{?egl} -%{_qt5_libdir}/libQt5EglDeviceIntegration.prl -%{_qt5_libdir}/libQt5EglDeviceIntegration.so -%endif - - -%files static -%{_qt5_libdir}/libQt5Bootstrap.*a -%{_qt5_libdir}/libQt5Bootstrap.prl -%{_qt5_headerdir}/QtOpenGLExtensions/ -%{_qt5_libdir}/libQt5OpenGLExtensions.*a -%{_qt5_libdir}/libQt5OpenGLExtensions.prl -%{_qt5_libdir}/cmake/Qt5OpenGLExtensions/ -%{_qt5_libdir}/pkgconfig/Qt5OpenGLExtensions.pc -%{_qt5_headerdir}/QtPlatformSupport/ -%{_qt5_libdir}/libQt5PlatformSupport.*a -%{_qt5_libdir}/libQt5PlatformSupport.prl - -%if 0%{?examples} -%files examples -%if 0%{!?bootstrap} -%{_qt5_docdir}/*/examples-manifest.xml -%endif -%{_qt5_examplesdir}/ -%endif - -%if "%{?ibase}" != "-no-sql-ibase" -%files ibase -%{_qt5_plugindir}/sqldrivers/libqsqlibase.so -%{_qt5_libdir}/cmake/Qt5Sql/Qt5Sql_QIBaseDriverPlugin.cmake -%endif - -%files mysql -%{_qt5_plugindir}/sqldrivers/libqsqlmysql.so -%{_qt5_libdir}/cmake/Qt5Sql/Qt5Sql_QMYSQLDriverPlugin.cmake - -%files odbc -%{_qt5_plugindir}/sqldrivers/libqsqlodbc.so -%{_qt5_libdir}/cmake/Qt5Sql/Qt5Sql_QODBCDriverPlugin.cmake - -%files postgresql -%{_qt5_plugindir}/sqldrivers/libqsqlpsql.so -%{_qt5_libdir}/cmake/Qt5Sql/Qt5Sql_QPSQLDriverPlugin.cmake - -%if "%{?tds}" != "-no-sql-tds" -%files tds -%{_qt5_plugindir}/sqldrivers/libqsqltds.so -%{_qt5_libdir}/cmake/Qt5Sql/Qt5Sql_QTDSDriverPlugin.cmake -%endif - -%post gui -p /sbin/ldconfig -%postun gui -p /sbin/ldconfig - -%files gui -%dir %{_sysconfdir}/X11/xinit -%dir %{_sysconfdir}/X11/xinit/xinitrc.d/ -%{_sysconfdir}/X11/xinit/xinitrc.d/10-qt5-check-opengl2.sh -%{_qt5_libdir}/libQt5Gui.so.5* -%{_qt5_libdir}/libQt5OpenGL.so.5* -%{_qt5_libdir}/libQt5PrintSupport.so.5* -%{_qt5_libdir}/libQt5Widgets.so.5* -%{_qt5_libdir}/libQt5XcbQpa.so.5* -%{_qt5_plugindir}/generic/libqevdevkeyboardplugin.so -%{_qt5_plugindir}/generic/libqevdevmouseplugin.so -%{_qt5_plugindir}/generic/libqevdevtabletplugin.so -%{_qt5_plugindir}/generic/libqevdevtouchplugin.so -%if 0%{?fedora} -%{_qt5_plugindir}/generic/libqlibinputplugin.so -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QLibInputPlugin.cmake -%endif -%{_qt5_plugindir}/generic/libqtuiotouchplugin.so -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEvdevKeyboardPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEvdevMousePlugin.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEvdevTabletPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEvdevTouchScreenPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QTuioTouchPlugin.cmake -%{_qt5_plugindir}/imageformats/libqgif.so -%{_qt5_plugindir}/imageformats/libqico.so -%{_qt5_plugindir}/imageformats/libqjpeg.so -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake -%{_qt5_plugindir}/platforminputcontexts/libcomposeplatforminputcontextplugin.so -%{_qt5_plugindir}/platforminputcontexts/libibusplatforminputcontextplugin.so -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake -%if 0%{?egl} -%{_qt5_libdir}/libQt5EglDeviceIntegration.so.5* -%{_qt5_plugindir}/platforms/libqeglfs.so -%{_qt5_plugindir}/platforms/libqminimalegl.so -%dir %{_qt5_plugindir}/egldeviceintegrations/ -%{_qt5_plugindir}/egldeviceintegrations/libqeglfs-kms-integration.so -%{_qt5_plugindir}/egldeviceintegrations/libqeglfs-x11-integration.so -%{_qt5_plugindir}/xcbglintegrations/libqxcb-egl-integration.so -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSKmsIntegrationPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSX11IntegrationPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake -%endif -%{_qt5_plugindir}/platforms/libqlinuxfb.so -%{_qt5_plugindir}/platforms/libqminimal.so -%{_qt5_plugindir}/platforms/libqoffscreen.so -%{_qt5_plugindir}/platforms/libqxcb.so -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QLinuxFbIntegrationPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake -%{_qt5_plugindir}/xcbglintegrations/libqxcb-glx-integration.so -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake -%{_qt5_plugindir}/platformthemes/libqgtk2.so -%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake -%{_qt5_plugindir}/printsupport/libcupsprintersupport.so -%{_qt5_libdir}/cmake/Qt5PrintSupport/Qt5PrintSupport_QCupsPrinterSupportPlugin.cmake - -%files -n qt5-rpm-macros -%{rpm_macros_dir}/macros.qt5 - - -%changelog -* Tue Aug 02 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-4 -- qt5-rpm-macros: Requires: cmake(3) - -* Tue Jun 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-3 -- backport some xcb-plugin-related fixes - -* Thu Jun 09 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-2 -- fix Qt5.pc version - -* Thu Jun 09 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-1 -- Update to 5.6.1 - -* Thu Jun 02 2016 Than Ngo <than@redhat.com> - 5.6.0-21 -- drop gcc6 workaround on arm - -* Fri May 20 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-20 -- -Wno-deprecated-declarations (typo missed trailing 's') - -* Fri May 13 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-19 -- pull in upstream drag-n-drop related fixes (QTBUG-45812, QTBUG-51215) - -* Sat May 07 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-18 -- revert out-of-tree build, breaks Qt5*Config.cmake *_PRIVATE_INCLUDE_DIRS entries (all blank) - -* Thu May 05 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-17 -- support out-of-tree build -- better %%check -- pull in final/upstream fixes for QTBUG-51648,QTBUG-51649 -- disable examples/tests in bootstrap mode - -* Sat Apr 30 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-16 -- own %%{_qt5_plugindir}/egldeviceintegrations - -* Mon Apr 18 2016 Caolán McNamara <caolanm@redhat.com> - 5.6.0-15 -- full rebuild for hunspell 1.4.0 - -* Mon Apr 18 2016 Caolán McNamara <caolanm@redhat.com> - 5.6.0-14 -- bootstrap rebuild for hunspell 1.4.0 - -* Sat Apr 16 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-13 -- -devel: Provides: qt5-qtbase-private-devel (#1233829) - -* Sat Apr 16 2016 David Tardon <dtardon@redhat.com> - 5.6.0-12 -- full build - -* Fri Apr 15 2016 David Tardon <dtardon@redhat.com> - 5.6.0-11 -- rebuild for ICU 57.1 - -* Thu Mar 31 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-10 -- Fix build on MIPS (#1322537) -- drop BR: valgrind (not used, for awhile) - -* Fri Mar 25 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-9 -- pull upstream patches (upstreamed versions, gcc6-related bits mostly) - -* Thu Mar 24 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-8 -- make 10-qt5-check-opengl2.sh xinit script more robust -- enable journald support for el7+ (#1315239) - -* Sat Mar 19 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-7 -- macros.qt5: null-pointer-checks flag isn't c++-specific - -* Sat Mar 19 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-6 -- macros.qt5: we really only want the null-pointer-checks flag here - and definitely no arch-specific ones - -* Fri Mar 18 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-5 -- macros.qt5: cleanup, %%_qt5_cflags, %%_qt5_cxxflags (for f24+) - -* Fri Mar 18 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-3 -- rebuild - -* Tue Mar 15 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-2 -- respin QTBUG-51767 patch - -* Mon Mar 14 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-1 -- 5.6.0 release - -* Sat Mar 12 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.41.rc -- %%build: restore -dbus-linked - -* Fri Mar 11 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.40.rc -- respin QTBUG-51649 patch -- %%build: use -dbus-runtime unconditionally -- drop (unused) build deps: atspi, dbus, networkmanager - -* Thu Mar 10 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.39.rc -- candidate fixes for various QtDBus deadlocks (QTBUG-51648,QTBUG-51676) - -* Mon Mar 07 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.38.rc -- backport "crash on start if system bus is not available" (QTBUG-51299) - -* Sat Mar 05 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.37.rc -- %build: ./configure -journal (f24+) - -* Wed Mar 02 2016 Daniel Vrátil <dvratil@fedoraproject.org> 5.6.0-0.36.rc -- Non-bootstrapped build - -* Tue Mar 01 2016 Daniel Vrátil <dvratil@fedoraproject.org> 5.6.0-0.35.rc -- Rebuild against new openssl - -* Fri Feb 26 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.34.rc -- qtlogging.ini: remove comments - -* Thu Feb 25 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.33.rc -- ship $$[QT_INSTALL_DATA]/qtlogging.ini for packaged logging defaults (#1227295) - -* Thu Feb 25 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.32.rc -- qt5-qtbase-static missing dependencies (#1311311) - -* Wed Feb 24 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.31.rc -- Item views don't handle insert/remove of rows robustly (QTBUG-48870) - -* Tue Feb 23 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.30.rc -- Update to final RC - -* Mon Feb 22 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.29.rc -- Update tarball with https://bugreports.qt.io/browse/QTBUG-50703 fix - -* Wed Feb 17 2016 Than Ngo <than@redhat.com> - 5.6.0-0.28.rc -- fix build issue with gcc6 - -* Mon Feb 15 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.27.rc -- Update proper tarball. Need avoid the fix branch - -* Mon Feb 15 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.26.rc -- Integrate rc releases now. - -* Sat Feb 13 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.25.beta -- macros.qt5: fix %%qt5_ldflags macro - -* Thu Feb 11 2016 Than Ngo <than@redhat.com> - 5.6.0-0.24.beta -- fix build issue with gcc6 -- fix check for alsa 1.1.x - -* Wed Feb 03 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.23.beta -- qt5-rpm-macros pkg - -* Tue Feb 02 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.22.beta -- don't inject $RPM_OPT_FLAGS/$RPM_LD_FLAGS into qmake defaults f24+ (#1279265) - -* Tue Feb 02 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.21.beta -- build with and add to macros.qt5 flags: -fno-delete-null-pointer-checks - -* Fri Jan 15 2016 Than Ngo <than@redhat.com> - 5.6.0-0.20.beta -- enable -qt-xcb to fix non-US keys under VNC (#1295713) - -* Mon Jan 04 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.19.beta -- 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 -- fix/update Release: tag - -* Fri Dec 18 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.16 -- 5.6.0-beta (final) - -* Wed Dec 16 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-0.15 -- pull in another upstream moc fix/improvement (#1290020,QTBUG-49972) -- fix bootstrap/docs - -* Wed Dec 16 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.13 -- workaround moc/qconfig-multilib issues (#1290020,QTBUG-49972) - -* Wed Dec 16 2015 Peter Robinson <pbrobinson@fedoraproject.org> 5.6.0-0.12 -- aarch64 is secondary arch too -- ppc64le is NOT multilib -- Fix Power 64 macro use - -* Mon Dec 14 2015 Than Ngo <than@redhat.com> - 5.6.0-0.11 -- fix build failure on secondary arch - -* Sun Dec 13 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.10 -- We're back to gold linker -- Remove reduce relocations - -* Sat Dec 12 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.9 -- drop disconnect_displays.patch so we can better test latest xcb/display work - -* Fri Dec 11 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.8 -- sync latest xcb/screen/display related upstream commits - -* Thu Dec 10 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.7 -- Official beta release - -* Thu Dec 10 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.6 -- Official beta release - -* Wed Dec 09 2015 Daniel Vratil <dvratil@fedoraproject.org> - 5.6.0-0.5 -- try reverting from -optimized-tools to -optimized-qmake - -* Sun Dec 06 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-0.4 -- re-introduce bootstrap/examples macros -- put examples-manifest.xml in -examples -- restore -doc multilib hack (to be on the safe side, can't hurt) -- %%build: s/-optimized-qmake/-optimized-tools/ - -* Sat Dec 05 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.3 -- Beta 3 -- Reintroduce xcb patch from https://codereview.qt-project.org/#/c/138201/ - -* Fri Nov 27 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.2 -- Valgrind still needed as buildreq due recent split qdoc package, but we can get rid of - specific arch set. -- Added missing libproxy buildreq -- Epel and RHEL doesn't have libinput, so a plugin need to be excluded for this distros - -* Wed Nov 25 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.1-10 -- -devel: Requires: redhat-rpm-config (#1248174) - -* Wed Nov 18 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-9 -- Get rid of valgrind hack. It sort out that we don't need it anymore (#1211203) - -* Mon Nov 09 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-8 -- qt5-qdoc need requires >= current version, otherwise will prevent the usage further when moved to qttools - -* Mon Nov 09 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.1-7 -- qt5-qdoc subpkg - -* Tue Nov 03 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.1 -- Start to implement 5.6.0 beta - -* Tue Nov 03 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.1 -- Start to implement 5.6.0 beta - -* Wed Oct 28 2015 David Tardon <dtardon@redhat.com> - 5.5.1-6 -- full build - -* Wed Oct 28 2015 David Tardon <dtardon@redhat.com> - 5.5.1-5 -- rebuild for ICU 56.1 - -* Thu Oct 15 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-2 -- Update to final release 5.5.1 - -* Mon Oct 05 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-1 -- Update to Qt 5.5.1 RC1 -- Patchs 13, 52, 53, 101, 155, 223, 297 removed due to inclusion upstream - -* Mon Oct 05 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-18 -- When a screen comes back online, the windows need to be told about it (QTBUG-47041) -- xcb: Ignore disabling of outputs in the middle of the mode switch - -* Wed Aug 19 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-17 -- unconditionally undo valgrind hack when done (#1255054) - -* Sat Aug 15 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-16 -- backport 0055-Respect-manual-set-icon-themes.patch (kde#344469) -- conditionally use valgrind only if needed - -* Fri Aug 07 2015 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.5.0-15 -- use valgrind to debug qdoc HTML generation - -* Fri Aug 07 2015 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.5.0-14 -- remove GDB hackery again, -12 built fine on i686, hack breaks ARM build -- fix 10-qt5-check-opengl2.sh for multiple screens (#1245755) - -* Thu Aug 06 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-13 -- use upstream commit/fix for QTBUG-46310 -- restore qdoc/gdb hackery, i686 still needs it :( - -* Wed Aug 05 2015 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.5.0-12 -- remove GDB hackery, it is not producing useful backtraces for the ARM crash - -* Mon Aug 03 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.0-11 -- Add mesa-dri-drivers as recommends on gui package as reported by Kevin Kofler -- Reference https://bugzilla.redhat.com/1249280 - -* Wed Jul 29 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-10 -- -docs: BuildRequires: qt5-qhelpgenerator - -* Fri Jul 17 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-9 -- use qdoc.gdb wrapper - -* Wed Jul 15 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-8 -- %%build: hack around 'make docs' failures (on f22+) - -* Wed Jul 15 2015 Jan Grulich <jgrulich@redhat.com> 5.5.0-7 -- restore previously dropped patches - -* Tue Jul 14 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-6 -- disable bootstrap again - -* Tue Jul 14 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-5 -- enable bootstrap (and disable failing docs) - -* Mon Jul 13 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-4 -- Qt5 application crashes when connecting/disconnecting displays (#1083664) - -* Fri Jul 10 2015 Than Ngo <than@redhat.com> - 5.5.0-3 -- add better fix for compile error on big endian - -* Thu Jul 09 2015 Than Ngo <than@redhat.com> - 5.5.0-2 -- fix build failure on big endian platform (ppc64,s390x) - -* Mon Jun 29 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.0-0.5.rc -- Second round of builds now with bootstrap enabled due new qttools - -* Mon Jun 29 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.0-0.4.rc -- Enable bootstrap to first import on rawhide - -* Thu Jun 25 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.0-0.3.rc -- Disable bootstrap - -* Wed Jun 24 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.0-0.2.rc -- Update for official RC1 released packages - -* Mon Jun 15 2015 Daniel Vratil <dvratil@redhat.com> 5.5.0-0.1.rc -- Qt 5.5 RC 1 - -* Mon Jun 08 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.2-2 -- rebase to latest SM patches (QTBUG-45484, QTBUG-46310) - -* Tue Jun 02 2015 Jan Grulich <jgrulich@redhat.com> 5.4.2-1 -- Update to 5.4.2 - -* Tue May 26 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-20 -- SM_CLIENT_ID property is not set (QTBUG-46310) - -* Mon May 25 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-19 -- QWidget::setWindowRole does nothing (QTBUG-45484) - -* Wed May 20 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-18 -- own /etc/xdg/QtProject -- Requires: qt-settings (f22+) - -* Sat May 16 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-17 -- Try to ensure that -fPIC is used in CMake builds (QTBUG-45755) - -* Thu May 14 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-16 -- Some Qt apps crash if they are compiled with gcc5 (QTBUG-45755) - -* Thu May 07 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-15 -- try harder to avoid doc/multilib conflicts (#1212750) - -* Wed May 06 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-14 -- Shortcuts with KeypadModifier not working (QTBUG-33093,#1219173) - -* Tue May 05 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-13 -- backport: data corruption in QNetworkAccessManager - -* Fri May 01 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.4.1-12 -- backport a couple more upstream fixes -- introduce -common noarch subpkg, should help multilib issues - -* Sat Apr 25 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-11 -- port qtdbusconnection_no_debug.patch from qt(4) - -* Fri Apr 17 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-10 -- -examples: include %%{_qt5_docdir}/qdoc/examples-manifest.xml (#1212750) - -* Mon Apr 13 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-9 -- Multiple Vulnerabilities in Qt Image Format Handling (CVE-2015-1860 CVE-2015-1859 CVE-2015-1858) - -* Fri Apr 10 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.4.1-8 -- -dbus=runtime on el6 (#1196359) -- %%build: -no-directfb - -* Wed Apr 01 2015 Daniel Vrátil <dvratil@redhat.com> - 5.4.1-7 -- drop 5.5 XCB patches, the rebase is incomplete and does not work properly with Qt 5.4 - -* Mon Mar 30 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-6 -- Crash due to unsafe access to QTextLayout::lineCount (#1207279,QTBUG-43562) - -* Mon Mar 30 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-5 -- unable to use input methods in ibus-1.5.10 (#1203575) - -* Wed Mar 25 2015 Daniel Vrátil <dvratil@redhat.com> - 5.4.1-4 -- pull in set of upstream Qt 5.5 fixes and improvements for XCB screen handling rebased to 5.4 - -* Fri Feb 27 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.4.1-3 -- pull in handful of upstream fixes, particularly... -- Fix a division by zero when processing malformed BMP files (QTBUG-44547, CVE-2015-0295) - -* Wed Feb 25 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-2 -- try bootstrap=1 (f23) - -* Tue Feb 24 2015 Jan Grulich <jgrulich@redhat.com> 5.4.1-1 -- update to 5.4.1 - -* Mon Feb 16 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-13 -- -no-use-gold-linker (f22+, #1193044) - -* Thu Feb 12 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-12 -- own %%{_qt5_plugindir}/{designer,iconengines,script,styles} - -* Thu Feb 05 2015 David Tardon <dtardon@redhat.com> - 5.4.0-11 -- full build after ICU soname bump - -* Wed Feb 04 2015 Petr Machata <pmachata@redhat.com> - 5.4.0-10 -- Bump for rebuild. - -* Sat Jan 31 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-9 -- crashes when connecting/disconnecting displays (#1083664,QTBUG-42985) - -* Tue Jan 27 2015 David Tardon <dtardon@redhat.com> - 5.4.0-8 -- full build - -* Mon Jan 26 2015 David Tardon <dtardon@redhat.com> - 5.4.0-7 -- rebuild for ICU 54.1 - -* Sun Jan 18 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-6 -- fix %%pre scriptlet - -* Sat Jan 17 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-5 -- ship /etc/xdg/qtchooser/5.conf alternative instead (of qt5.conf) - -* Wed Dec 17 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-4 -- workaround 'make docs' crasher on el6 (QTBUG-43057) - -* Thu Dec 11 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-3 -- don't omit examples for bootstrap (needs work) - -* Wed Dec 10 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-2 -- fix bootstrapping logic - -* Wed Dec 10 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-1 -- 5.4.0 (final) - -* Fri Nov 28 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.8.rc -- restore font rendering patch (#1052389,QTBUG-41590) - -* Thu Nov 27 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.7.rc -- 5.4.0-rc - -* Wed Nov 12 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.6.beta -- add versioned Requires: libxkbcommon dep - -* Tue Nov 11 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.5.beta -- pull in slightly different upstreamed font rendering fix (#1052389,QTBUG-41590) - -* Mon Nov 10 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.4.beta -- Bad font rendering (#1052389,QTBUG-41590) - -* Mon Nov 03 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.3.beta -- macros.qt5: +%%qmake_qt5 , to help set standard build flags (CFLAGS, etc...) - -* Wed Oct 22 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.4.0-0.2.beta -- -gui: don't require gtk2 (__requires_exclude_from platformthemes) (#1154884) - -* Sat Oct 18 2014 Rex Dieter <rdieter@fedoraproject.org> - 5.4.0-0.1.beta -- 5.4.0-beta -- avoid extra -devel deps by moving *Plugin.cmake files to base pkgs -- support bootstrap macro, to disable -doc,-examples - -* Mon Oct 13 2014 Jan Grulich <jgrulich@redhat.com> 5.3.2-3 -- QFileDialog: implement getOpenFileUrl and friends for real - -* Thu Oct 09 2014 Rex Dieter <rdieter@fedoraproject.org> 5.3.2-2 -- use linux-g++ platform unconditionally - -* Thu Oct 09 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 5.3.2-1.1 -- F20: require libxkbcommon >= 0.4.1, only patch for the old libxcb - -* Tue Sep 16 2014 Rex Dieter <rdieter@fedoraproject.org> 5.3.2-1 -- 5.3.2 - -* Wed Aug 27 2014 David Tardon <dtardon@redhat.com> - 5.3.1-8 -- do a normal build with docs - -* Tue Aug 26 2014 David Tardon <dtardon@redhat.com> - 5.3.1-7 -- rebuild for ICU 53.1 - -* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Jul 24 2014 Rex Dieter <rdieter@fedoraproject.org> - 5.3.1-5 -- drop dep on xorg-x11-xinit (own shared dirs instead) -- fix/improve qtchooser support using alternatives (#1122316) - -* Mon Jun 30 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 5.3.1-4 -- support the old versions of libxcb and libxkbcommon in F19 and F20 -- don't use the bundled libxkbcommon - -* Mon Jun 30 2014 Rex Dieter <rdieter@fedoraproject.org> 5.3.1-3 -- -devel: Requires: pkgconfig(egl) - -* Fri Jun 27 2014 Jan Grulich <jgrulich@redhat.com> - 5.3.1-2 -- Prefer QPA implementation in qsystemtrayicon_x11 if available - -* Tue Jun 17 2014 Jan Grulich <jgrulich@redhat.com> - 5.3.1-1 -- 5.3.1 - -* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 30 2014 Rex Dieter <rdieter@fedoraproject.org> 5.3.0-6 -- %%ix86: build -no-sse2 (#1103185) - -* Tue May 27 2014 Rex Dieter <rdieter@fedoraproject.org> 5.3.0-5 -- BR: pkgconfig(xcb-xkb) > 1.10 (f21+) -- allow possibility for libxkbcommon-0.4.x only - -* Fri May 23 2014 Rex Dieter <rdieter@fedoraproject.org> 5.3.0-4 -- -system-libxkbcommon (f21+) - -* Thu May 22 2014 Rex Dieter <rdieter@fedoraproject.org> 5.3.0-3 -- qt5-qtbase-5.3.0-2.fc21 breaks keyboard input (#1100213) - -* Wed May 21 2014 Rex Dieter <rdieter@fedoraproject.org> 5.3.0-2 -- limit -reduce-relocations to %%ix86 x86_64 archs (QTBUG-36129) - -* Wed May 21 2014 Jan Grulich <jgrulich@redhat.com> 5.3.0-1 -- 5.3.0 - -* Thu Apr 24 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.1-8 -- DoS vulnerability in the GIF image handler (QTBUG-38367) - -* Wed Mar 26 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.1-7 -- support ppc64le multilib (#1080629) - -* Wed Mar 12 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 5.2.1-6 -- reenable documentation - -* Sat Mar 08 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 5.2.1-5 -- make the QMAKE_STRIP sed not sensitive to whitespace (see #1074041 in Qt 4) - -* Tue Feb 18 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.1-4 -- undefine QMAKE_STRIP (and friends), so we get useful -debuginfo pkgs (#1065636) - -* Wed Feb 12 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.1-3 -- bootstrap for libicu bump - -* Wed Feb 05 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.1-2 -- qconfig.pri: +alsa +kms +pulseaudio +xcb-sm - -* Wed Feb 05 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.1-1 -- 5.2.1 - -* Sat Feb 01 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-11 -- better %%rpm_macros_dir handling - -* Wed Jan 29 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.2.0-10 -- fix the allow-forcing-llvmpipe patch to patch actual caller of __glXInitialize - -* Wed Jan 29 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.2.0-9 -- use software OpenGL (llvmpipe) if the hardware driver doesn't support OpenGL 2 - -* Tue Jan 28 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-8 -- (re)enable -docs - -* Mon Jan 27 2014 Rex Dieter <rdieter@fedoraproject.org> - 5.2.0-7 -- unconditionally enable freetype lcd_filter -- (temp) disable docs (libxcb bootstrap) - -* Sun Jan 26 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-6 -- fix %%_qt5_examplesdir macro - -* Sat Jan 25 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-5 -- -examples subpkg - -* Mon Jan 13 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.2.0-4 -- fix QTBUG-35459 (too low entityCharacterLimit=1024 for CVE-2013-4549) -- fix QTBUG-35460 (error message for CVE-2013-4549 is misspelled) -- reenable docs on Fedora (accidentally disabled) - -* Mon Jan 13 2014 Rex Dieter <rdieter@fedoraproject.org> - 5.2.0-3 -- move sql build deps into subpkg sections -- macro'ize ibase,tds support (disabled on rhel) - -* Thu Jan 02 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-2 -- -devel: qtsql apparently wants all drivers available at buildtime - -* Thu Dec 12 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-1 -- 5.2.0 - -* Fri Dec 06 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.12.rc1 -- qt5-base-devel.x86_64 qt5-base-devel.i686 file conflict qconfig.h (#1036956) - -* Thu Dec 05 2013 Rex Dieter <rdieter@fedoraproject.org> - 5.2.0-0.11.rc1 -- needs a minimum version on sqlite build dependency (#1038617) -- fix build when doc macro not defined - -* Mon Dec 02 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.10.rc1 -- 5.2.0-rc1 -- revert/omit recent egl packaging changes -- -doc install changes-5.* files here (#989149) - -* Tue Nov 26 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.8.beta1.20131108_141 -- Install changes-5.x.y file (#989149) - -* Mon Nov 25 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.7.beta1.20131108_141 -- enable -doc only on primary archs (allow secondary bootstrap) - -* Fri Nov 22 2013 Lubomir Rintel <lkundrak@v3.sk> 5.2.0-0.6.beta1.20131108_141 -- Enable EGL support - -* Sat Nov 09 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.5.beta1.20131108_141 -- 2013-11-08_141 snapshot, arm switch qreal double - -* Thu Oct 24 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.4.beta1 -- 5.2.0-beta1 - -* Wed Oct 16 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.3.alpha -- disable -docs (for ppc bootstrap mostly) - -* Wed Oct 16 2013 Lukáš Tinkl <ltinkl@redhat.com> - 5.2.0-0.2.alpha -- Fixes #1005482 - qtbase FTBFS on ppc/ppc64 - -* Tue Oct 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 5.2.0-0.1.alpha -- 5.2.0-alpha -- -system-harfbuzz -- rename subpkg -x11 => -gui -- move some gui-related plugins base => -gui -- don't use symlinks in %%_qt5_bindir (more qtchooser-friendly) - -* Fri Sep 27 2013 Rex Dieter <rdieter@fedoraproject.org> - 5.1.1-6 -- -doc subpkg (not enabled) -- enable %%check - -* Mon Sep 23 2013 Dan Horák <dan[at]danny.cz> - 5.1.1-5 -- fix big endian builds - -* Wed Sep 11 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-4 -- macros.qt5: use newer location, use unexpanded macros - -* Sat Sep 07 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-3 -- ExcludeArch: ppc64 ppc (#1005482) - -* Fri Sep 06 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-2 -- BR: pkgconfig(libudev) pkgconfig(xkbcommon) pkgconfig(xcb-xkb) - -* Tue Aug 27 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-1 -- 5.1.1 - -* Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 5.0.2-8 -- Perl 5.18 rebuild - -* Tue Jul 30 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-7 -- enable qtchooser support - -* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 5.0.2-6 -- Perl 5.18 rebuild - -* Wed May 08 2013 Than Ngo <than@redhat.com> - 5.0.2-5 -- add poll support, thanks to fweimer@redhat.com (QTBUG-27195) - -* Thu Apr 18 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-4 -- respin lowmem patch to apply (unconditionally) to gcc-4.7.2 too - -* Fri Apr 12 2013 Dan Horák <dan[at]danny.cz> - 5.0.2-3 -- rebase the lowmem patch - -* Wed Apr 10 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-2 -- more cmake_path love (#929227) - -* Wed Apr 10 2013 Rex Dieter <rdieter@fedoraproject.org> - 5.0.2-1 -- 5.0.2 -- fix cmake config (#929227) - -* Tue Apr 02 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-0.1.rc1 -- 5.0.2-rc1 - -* Sat Mar 16 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.1-6 -- pull in upstream gcc-4.8.0 buildfix - -* Tue Feb 26 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.1-5 -- -static subpkg, Requires: fontconfig-devel,glib2-devel,zlib-devel -- -devel: Requires: pkgconfig(gl) - -* Mon Feb 25 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.1-4 -- create/own %%{_qt5_plugindir}/iconengines -- -devel: create/own %%{_qt5_archdatadir}/mkspecs/modules -- cleanup .prl - -* Sat Feb 23 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.1-3 -- +%%_qt5_libexecdir - -* Sat Feb 23 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.1-2 -- macros.qt5: fix %%_qt5_headerdir, %%_qt5_datadir, %%_qt5_plugindir - -* Thu Jan 31 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.1-1 -- 5.0.1 -- lowmem patch for %%arm, s390 - -* Wed Jan 30 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.0-4 -- %%build: -system-pcre, BR: pkgconfig(libpcre) -- use -O1 optimization on lowmem (s390) arch - -* Thu Jan 24 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.0-3 -- enable (non-conflicting) qtchooser support - -* Wed Jan 09 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.0-2 -- add qtchooser support (disabled by default) - -* Wed Dec 19 2012 Rex Dieter <rdieter@fedoraproject.org> 5.0.0-1 -- 5.0 (final) - -* Thu Dec 13 2012 Rex Dieter <rdieter@fedoraproject.org> 5.0.0-0.4.rc2 -- 5.0-rc2 -- initial try at putting non-conflicting binaries in %%_bindir - -* Thu Dec 06 2012 Rex Dieter <rdieter@fedoraproject.org> 5.0.0-0.3.rc1 -- 5.0-rc1 - -* Wed Nov 28 2012 Rex Dieter <rdieter@fedoraproject.org> 5.0.0-0.2.beta2 -- qtbase --> qt5-qtbase - -* Mon Nov 19 2012 Rex Dieter <rdieter@fedoraproject.org> 5.0.0-0.1.beta2 -- %%build: -accessibility -- macros.qt5: +%%_qt5_archdatadir +%%_qt5_settingsdir -- pull in a couple more configure-related upstream patches - -* Wed Nov 14 2012 Rex Dieter <rdieter@fedoraproject.org> 5.0.0-0.0.beta2 -- first try - diff --git a/qtbase-multilib_optflags.patch b/qtbase-multilib_optflags.patch deleted file mode 100644 index 5498e79..0000000 --- a/qtbase-multilib_optflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -r -u a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf ---- a/mkspecs/linux-g++/qmake.conf 2015-10-30 06:20:01.000000000 -0200 -+++ b/mkspecs/linux-g++/qmake.conf 2015-11-05 11:23:23.230741601 -0200 -@@ -5,6 +5,7 @@ - MAKEFILE_GENERATOR = UNIX - CONFIG += incremental - QMAKE_INCREMENTAL_STYLE = sublib -+QMAKE_CFLAGS_RELEASE += -O2 - - include(../common/linux.conf) - include(../common/gcc-base-unix.conf) -diff -r -u a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf ---- a/mkspecs/linux-g++-32/qmake.conf 2015-10-30 06:20:01.000000000 -0200 -+++ b/mkspecs/linux-g++-32/qmake.conf 2015-11-05 11:22:19.761494470 -0200 -@@ -10,6 +10,7 @@ - - QMAKE_CFLAGS = -m32 - QMAKE_LFLAGS = -m32 -+QMAKE_CFLAGS_RELEASE += -O2 - - include(../common/gcc-base-unix.conf) - include(../common/g++-unix.conf) -diff -r -u a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf ---- a/mkspecs/linux-g++-64/qmake.conf 2015-10-30 06:20:01.000000000 -0200 -+++ b/mkspecs/linux-g++-64/qmake.conf 2015-11-05 11:22:49.497610248 -0200 -@@ -13,6 +13,7 @@ - - QMAKE_CFLAGS = -m64 - QMAKE_LFLAGS = -m64 -+QMAKE_CFLAGS_RELEASE += -O2 - - include(../common/gcc-base-unix.conf) - include(../common/g++-unix.conf) diff --git a/qtbase-opensource-src-5.2.0-enable_ft_lcdfilter.patch b/qtbase-opensource-src-5.2.0-enable_ft_lcdfilter.patch deleted file mode 100644 index 1c0326e..0000000 --- a/qtbase-opensource-src-5.2.0-enable_ft_lcdfilter.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qtbase-opensource-src-5.2.0/src/gui/text/qfontengine_ft.cpp.lcdfilter qtbase-opensource-src-5.2.0/src/gui/text/qfontengine_ft.cpp ---- qtbase-opensource-src-5.2.0/src/gui/text/qfontengine_ft.cpp.lcdfilter 2013-12-08 11:09:51.000000000 -0600 -+++ qtbase-opensource-src-5.2.0/src/gui/text/qfontengine_ft.cpp 2014-01-27 13:09:28.426065603 -0600 -@@ -69,7 +69,7 @@ - #include FT_CONFIG_OPTIONS_H - #endif - --#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING) -+#if defined(FT_LCD_FILTER_H) - #define QT_USE_FREETYPE_LCDFILTER - #endif - diff --git a/qtbase-opensource-src-5.3.2-QTBUG-35459.patch b/qtbase-opensource-src-5.3.2-QTBUG-35459.patch deleted file mode 100644 index 1ef698b..0000000 --- a/qtbase-opensource-src-5.3.2-QTBUG-35459.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up qtbase-opensource-src-5.3.2/src/xml/sax/qxml.cpp.QTBUG-35459 qtbase-opensource-src-5.3.2/src/xml/sax/qxml.cpp -diff -up qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h.QTBUG-35459 qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h ---- qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h.QTBUG-35459 2014-09-11 05:48:05.000000000 -0500 -+++ qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h 2014-09-16 09:35:01.189255615 -0500 -@@ -223,7 +223,7 @@ private: - // for the DTD currently being parsed. - static const int dtdRecursionLimit = 2; - // The maximum amount of characters an entity value may contain, after expansion. -- static const int entityCharacterLimit = 1024; -+ static const int entityCharacterLimit = 65536; - - const QString &string(); - void stringClear(); diff --git a/qtbase-opensource-src-5.6.0-arm.patch b/qtbase-opensource-src-5.6.0-arm.patch deleted file mode 100644 index 63df719..0000000 --- a/qtbase-opensource-src-5.6.0-arm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up qtbase-opensource-src-5.6.0-beta/configure.than qtbase-opensource-src-5.6.0-beta/configure ---- qtbase-opensource-src-5.6.0-beta/configure.than 2016-02-12 13:56:20.057741037 +0100 -+++ qtbase-opensource-src-5.6.0-beta/configure 2016-02-12 14:10:10.267768256 +0100 -@@ -4346,6 +4346,9 @@ if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; th - else - # not cross compiling, host == target - CFG_HOST_ARCH="$CFG_ARCH" -+ if [ "$CFG_ARCH" = "arm" ] ; then -+ CFG_CPUFEATURES="neon" -+ fi - CFG_HOST_CPUFEATURES="$CFG_CPUFEATURES" - fi - unset OUTFILE diff --git a/qtbase-opensource-src-5.6.0-moc_WORDSIZE.patch b/qtbase-opensource-src-5.6.0-moc_WORDSIZE.patch deleted file mode 100644 index 62d1e9c..0000000 --- a/qtbase-opensource-src-5.6.0-moc_WORDSIZE.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up qtbase-opensource-src-5.6.0-beta/src/tools/moc/main.cpp.moc_WORDSIZE qtbase-opensource-src-5.6.0-beta/src/tools/moc/main.cpp ---- qtbase-opensource-src-5.6.0-beta/src/tools/moc/main.cpp.moc_WORDSIZE 2015-12-04 18:05:24.000000000 -0600 -+++ qtbase-opensource-src-5.6.0-beta/src/tools/moc/main.cpp 2015-12-15 20:57:55.554485416 -0600 -@@ -184,6 +184,10 @@ int runMoc(int argc, char **argv) - Moc moc; - pp.macros["Q_MOC_RUN"]; - pp.macros["__cplusplus"]; -+ Macro macro; -+ macro.symbols = Preprocessor::tokenize(QByteArray::number(Q_PROCESSOR_WORDSIZE*8), 1, Preprocessor::TokenizeDefine); -+ macro.symbols.removeLast(); // remove the EOF symbol -+ pp.macros.insert("__WORDSIZE", macro); - - // Don't stumble over GCC extensions - Macro dummyVariadicFunctionMacro; diff --git a/qtlogging.ini b/qtlogging.ini deleted file mode 100644 index be2bf22..0000000 --- a/qtlogging.ini +++ /dev/null @@ -1,2 +0,0 @@ -[Rules] -*.debug=false diff --git a/sources b/sources deleted file mode 100644 index 06cee79..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -b23232190a3df61fe1ba81636987b036 qtbase-opensource-src-5.6.1.tar.xz