Hello community,
here is the log from the commit of package libqt5-qtconnectivity for
openSUSE:Factory checked in at 2015-02-18 11:39:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtconnectivity (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtconnectivity.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtconnectivity"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libqt5-qtconnectivity/libqt5-qtconnectivity.changes
2015-01-08 23:01:45.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libqt5-qtconnectivity.new/libqt5-qtconnectivity.changes
2015-02-18 12:08:56.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Feb 16 11:57:46 UTC 2015 - [email protected]
+
+- endian.patch: Use proper endian conversion functions
+ (https://codereview.qt-project.org/#/c/106263/)
+
+-------------------------------------------------------------------
New:
----
endian.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtconnectivity.spec ++++++
--- /var/tmp/diff_new_pack.hKZOhY/_old 2015-02-18 12:08:57.000000000 +0100
+++ /var/tmp/diff_new_pack.hKZOhY/_new 2015-02-18 12:08:57.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtconnectivity
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,6 +31,7 @@
Url: http://qt.digia.com
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
+Patch: endian.patch
BuildRequires: fdupes
BuildRequires: libqt5-qtbase-devel
BuildRequires: libqt5-qtbase-private-headers-devel
@@ -48,6 +49,7 @@
%prep
%setup -q -n qtconnectivity-opensource-src-%{real_version}
+%patch -p1
%package -n %{libname}
Summary: Qt 5 Bluez Addon
++++++ endian.patch ++++++
Index: qtconnectivity-opensource-src-5.4.0/src/bluetooth/bluez/bluez_data_p.h
===================================================================
--- qtconnectivity-opensource-src-5.4.0.orig/src/bluetooth/bluez/bluez_data_p.h
+++ qtconnectivity-opensource-src-5.4.0/src/bluetooth/bluez/bluez_data_p.h
@@ -46,6 +46,7 @@
//
#include <QtCore/qglobal.h>
+#include <QtCore/qendian.h>
#include <sys/socket.h>
#include <QtBluetooth/QBluetoothUuid>
@@ -96,12 +97,12 @@ struct bt_security {
#define btohl(d) (d)
#define btohll(d) (d)
#elif __BYTE_ORDER == __BIG_ENDIAN
-#define htobs(d) bswap_16(d)
-#define htobl(d) bswap_32(d)
-#define htobll(d) bswap_64(d)
-#define btohs(d) bswap_16(d)
-#define btohl(d) bswap_32(d)
-#define btohll(d) bswap_64(d)
+#define htobs(d) qbswap((quint16)(d))
+#define htobl(d) qbswap((quint32)(d))
+#define htobll(d) qbswap((quint64)(d))
+#define btohs(d) qbswap((quint16)(d))
+#define btohl(d) qbswap((quint32)(d))
+#define btohll(d) qbswap((quint64)(d))
#else
#error "Unknown byte order"
#endif
@@ -167,9 +168,9 @@ static inline uint16_t bt_get_le16(const
return bt_get_unaligned((const uint16_t *) ptr);
}
#elif __BYTE_ORDER == __BIG_ENDIAN
-static inline uint16_t bt_get_le16(const void *ptr)
+static inline quint16 bt_get_le16(const void *ptr)
{
- return bswap_16(bt_get_unaligned((const uint16_t *) ptr));
+ return qbswap(bt_get_unaligned((const quint16 *) ptr));
}
static inline void btoh128(const quint128 *src, quint128 *dst)
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
