From 9eb511e1b6c8a3df380a18e7d520af0c3f7a4ebb Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Jul 15 2016 21:21:14 +0000 Subject: - Update Qt 5.7.0 --- diff --git a/.gitignore b/.gitignore index 3c1d479..60736c8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /qtconnectivity-opensource-src-5.6.0-rc.tar.xz /qtconnectivity-opensource-src-5.6.0.tar.xz /qtconnectivity-opensource-src-5.6.1.tar.xz +/qtconnectivity-opensource-src-5.7.0.tar.xz diff --git a/qt5-qtconnectivity.spec b/qt5-qtconnectivity.spec index b620188..fc30c3f 100644 --- a/qt5-qtconnectivity.spec +++ b/qt5-qtconnectivity.spec @@ -3,30 +3,22 @@ %define docs 1 -#define prerelease +#define prerelease rc Summary: Qt5 - Connectivity components Name: qt5-%{qt_module} -Version: 5.6.1 -Release: 2%{?prerelease:.%{prerelease}}%{?dist} +Version: 5.7.0 +Release: 2%{?dist} # See LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://qt.io -Source0: http://download.qt.io/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz - -## upstream patches - -## upstreamable patches -# bswap_16 apparently missing on el6/ppc64 -Patch50: qtconnectivity-opensource-src-5.4.0-bswap_16.patch -# NEEDSWORK, fix FTBFS on rhel6 -Patch51: qtconnectivity-opensource-src-5.6.1-bluez_el6.patch +Source0: http://download.qt.io/official_releases/qt/5.7/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz BuildRequires: cmake BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: qt5-qtdeclarative-devel BuildRequires: pkgconfig(bluez) +BuildRequires: pkgconfig(Qt5Quick) %{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}} @@ -60,11 +52,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} -%patch50 -p1 -b .bswap_16 -%if 0%{?rhel} == 6 -%patch51 -p1 -b .bluez_el6 -%endif - %build mkdir %{_target_platform} @@ -155,8 +142,14 @@ popd %changelog -* Wed Jun 15 2016 Rex Dieter - 5.6.1-2 -- drop pkgconfig-style deps +* Mon Jul 04 2016 Helio Chissini de Castro - 5.7.0-2 +- Compiled with gcc + +* Tue Jun 14 2016 Helio Chissini de Castro - 5.7.0-1 +=- Qt 5.7.0 release + +* Mon Jun 13 2016 Helio Chissini de Castro - 5.7.0-0.1 +- Prepare 5.7.0 * Thu Jun 09 2016 Jan Grulich - 5.6.1-1 - Update to 5.6.1 diff --git a/qtconnectivity-opensource-src-5.4.0-bswap_16.patch b/qtconnectivity-opensource-src-5.4.0-bswap_16.patch deleted file mode 100644 index 740f64d..0000000 --- a/qtconnectivity-opensource-src-5.4.0-bswap_16.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/bluetooth/bluez/bluez_data_p.h b/src/bluetooth/bluez/bluez_data_p.h -index 9d0d9d9..92f0e63 100644 ---- a/src/bluetooth/bluez/bluez_data_p.h -+++ b/src/bluetooth/bluez/bluez_data_p.h -@@ -168,6 +168,9 @@ static inline quint16 bt_get_le16(const void *ptr) - return bt_get_unaligned((const quint16 *) ptr); - } - #elif __BYTE_ORDER == __BIG_ENDIAN -+#ifndef bswap_16 -+#define bswap_16(x) (((x) & 0x00ff) << 8 | ((x) & 0xff00) >> 8) -+#endif - static inline quint16 bt_get_le16(const void *ptr) - { - return qbswap(bt_get_unaligned((const quint16 *) ptr)); diff --git a/qtconnectivity-opensource-src-5.6.1-bluez_el6.patch b/qtconnectivity-opensource-src-5.6.1-bluez_el6.patch deleted file mode 100644 index ffd70a9..0000000 --- a/qtconnectivity-opensource-src-5.6.1-bluez_el6.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up qtconnectivity-opensource-src-5.6.1/src/bluetooth/qlowenergycontroller_p.cpp.bluez_el6 qtconnectivity-opensource-src-5.6.1/src/bluetooth/qlowenergycontroller_p.cpp ---- qtconnectivity-opensource-src-5.6.1/src/bluetooth/qlowenergycontroller_p.cpp.bluez_el6 2016-05-23 00:58:18.000000000 -0500 -+++ qtconnectivity-opensource-src-5.6.1/src/bluetooth/qlowenergycontroller_p.cpp 2016-06-15 13:38:51.302319277 -0500 -@@ -32,8 +32,8 @@ - ****************************************************************************/ - - #include "qlowenergycontroller_p.h" --#ifndef QT_IOS_BLUETOOTH --#include "dummy/dummy_helper_p.h" -+#if !defined(QT_BLUEZ_NO_BTLE) && !defined(QT_IOS_BLUETOOTH) -+//#include "dummy/dummy_helper_p.h" - #endif - - QT_BEGIN_NAMESPACE -@@ -43,8 +43,8 @@ QLowEnergyControllerPrivate::QLowEnergyC - state(QLowEnergyController::UnconnectedState), - error(QLowEnergyController::NoError) - { --#ifndef QT_IOS_BLUETOOTH -- printDummyWarning(); -+#if !defined(QT_BLUEZ_NO_BTLE) && !defined(QT_IOS_BLUETOOTH) -+// printDummyWarning(); - #endif - registerQLowEnergyControllerMetaType(); - } diff --git a/sources b/sources index f388f4c..27978a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad7b5e4e4c033c9d5adcd7a5c83b2007 qtconnectivity-opensource-src-5.6.1.tar.xz +56229b15e677ee98d56446519723fb3b qtconnectivity-opensource-src-5.7.0.tar.xz