From c2788bada46a0e6d807f91196ec1e273ec461b21 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:43:16 +0000 Subject: import qt5-qtconnectivity-5.9.2-1.el7 --- diff --git a/.gitignore b/.gitignore index ee0f8f5..855691c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtconnectivity-opensource-src-5.6.2.tar.xz +SOURCES/qtconnectivity-opensource-src-5.9.2.tar.xz diff --git a/.qt5-qtconnectivity.metadata b/.qt5-qtconnectivity.metadata index 50ae659..da926f3 100644 --- a/.qt5-qtconnectivity.metadata +++ b/.qt5-qtconnectivity.metadata @@ -1 +1 @@ -899e3c14ac203ff01f0f05cae7834957d70d338b SOURCES/qtconnectivity-opensource-src-5.6.2.tar.xz +40787a8d41640f662e6f970158d037c4aefea376 SOURCES/qtconnectivity-opensource-src-5.9.2.tar.xz diff --git a/SOURCES/qtconnectivity-opensource-src-5.4.0-bswap_16.patch b/SOURCES/qtconnectivity-opensource-src-5.4.0-bswap_16.patch deleted file mode 100644 index 740f64d..0000000 --- a/SOURCES/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/SOURCES/qtconnectivity-opensource-src-5.6.1-bluez_el6.patch b/SOURCES/qtconnectivity-opensource-src-5.6.1-bluez_el6.patch deleted file mode 100644 index ffd70a9..0000000 --- a/SOURCES/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/SPECS/qt5-qtconnectivity.spec b/SPECS/qt5-qtconnectivity.spec index 76e217a..33b17a5 100644 --- a/SPECS/qt5-qtconnectivity.spec +++ b/SPECS/qt5-qtconnectivity.spec @@ -5,19 +5,16 @@ Summary: Qt5 - Connectivity components Name: qt5-%{qt_module} -Version: 5.6.2 +Version: 5.9.2 Release: 1%{?dist} # See LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io -Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +Source0: http://download.qt.io/official_releases/qt/5.9/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz ## 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 + # htonl undefined, include arpa/inet.h Patch52: qtconnectivity-opensource-src-5.6.2-arpa_inet.patch @@ -26,7 +23,8 @@ BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel BuildRequires: pkgconfig(bluez) -%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}} +# filter qml provides +%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$ %description %{summary}. @@ -58,30 +56,23 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -n %{qt_module}-opensource-src-%{version} -%patch50 -p1 -b .bswap_16 -%if 0%{?rhel} == 6 -%patch51 -p1 -b .bluez_el6 -%endif %patch52 -p1 -b .arpa_inet %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{qmake_qt5} .. +%{qmake_qt5} make %{?_smp_mflags} %if 0%{?docs} make %{?_smp_mflags} docs %endif -popd %install -make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} +make install INSTALL_ROOT=%{buildroot} %if 0%{?docs} -make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} +make install_docs INSTALL_ROOT=%{buildroot} %endif # hardlink files to %{_bindir}, add -qt5 postfix to not conflict @@ -153,6 +144,14 @@ popd %changelog +* Fri Oct 06 2017 Jan Grulich - 5.9.2-1 +- Update to 5.9.2 + Resolves: bz#1482777 + +* Mon Aug 28 2017 Jan Grulich - 5.9.1-1 +- Update to 5.9.1 + Resolves: bz#1482777 + * Wed Jan 11 2017 Jan Grulich - 5.6.2-1 - Update to 5.6.2 Resolves: bz#1384816