Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbluetooth/files/, dev-qt/qtbluetooth/
Date: Thu, 20 Jan 2022 13:26:47
Message-Id: 1642685061.9a8325e6855b0c387635a4dc47eb46a834913e53.asturm@gentoo
1 commit: 9a8325e6855b0c387635a4dc47eb46a834913e53
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 20 12:19:19 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 20 13:24:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a8325e6
7
8 dev-qt/qtbluetooth: Drop 5.15.2-r1
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-qt/qtbluetooth/Manifest | 1 -
14 .../files/qtbluetooth-5.15.2-gcc11.patch | 19 ------------
15 dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild | 36 ----------------------
16 3 files changed, 56 deletions(-)
17
18 diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
19 index 5ab2431ac70b..8f7a93e63bd9 100644
20 --- a/dev-qt/qtbluetooth/Manifest
21 +++ b/dev-qt/qtbluetooth/Manifest
22 @@ -1,2 +1 @@
23 DIST qtconnectivity-5.15.2-5e9ca5d3.tar.gz 3412877 BLAKE2B 07d201a934b72aab5ec90bbe667578d7150a3e93379278a44ff63ff67568bc6dfeff075d763e544e209dd0b6d9f53ca8214f483a3ff38794252b39c8ad5e80f5 SHA512 6be16baa0f63d6b36836adac50df4b9db79ca65b3bb4c92be13f748cec9384c42e57833bc1d06a8f50575f13623965cf40d1497e5fa51f44cb51b15760fb198f
24 -DIST qtconnectivity-everywhere-src-5.15.2.tar.xz 2815492 BLAKE2B 0702601266d46669e0a39740b6df539b1d3f6dcb62d06b14f5ba89782e9bd38faa391892841434feccd9599eef09c7c7238efb82e11a0633e73f58dd721d3324 SHA512 a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c
25
26 diff --git a/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch b/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch
27 deleted file mode 100644
28 index 7c27730574b6..000000000000
29 --- a/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch
30 +++ /dev/null
31 @@ -1,19 +0,0 @@
32 -From 0ae88b90f857bfcc2d0ea33d16753d8eed5db9e1 Mon Sep 17 00:00:00 2001
33 -From: Jeff Law <law@××××××.com>
34 -Date: Oct 16 2020 20:08:46 +0000
35 -Subject: Add missing #include for gcc-11
36 -
37 -
38 -diff --git a/src/bluetooth/lecmaccalculator.cpp b/src/bluetooth/lecmaccalculator.cpp
39 -index b150466..507603c 100644
40 ---- a/src/bluetooth/lecmaccalculator.cpp
41 -+++ b/src/bluetooth/lecmaccalculator.cpp
42 -@@ -38,6 +38,8 @@
43 - ****************************************************************************/
44 - #include "lecmaccalculator_p.h"
45 -
46 -+#include <limits>
47 -+
48 - #include "bluez/bluez_data_p.h"
49 -
50 - #include <QtCore/qbytearray.h>
51
52 diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild
53 deleted file mode 100644
54 index 1a88564f814e..000000000000
55 --- a/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild
56 +++ /dev/null
57 @@ -1,36 +0,0 @@
58 -# Copyright 1999-2021 Gentoo Authors
59 -# Distributed under the terms of the GNU General Public License v2
60 -
61 -EAPI=8
62 -
63 -QT5_MODULE="qtconnectivity"
64 -inherit qt5-build
65 -
66 -DESCRIPTION="Bluetooth support library for the Qt5 framework"
67 -
68 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
69 - KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
70 -fi
71 -
72 -IUSE="qml"
73 -
74 -RDEPEND="
75 - =dev-qt/qtconcurrent-${QT5_PV}*
76 - =dev-qt/qtcore-${QT5_PV}*:5=
77 - =dev-qt/qtdbus-${QT5_PV}*
78 - >=net-wireless/bluez-5:=
79 - qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
80 -"
81 -DEPEND="${RDEPEND}
82 - =dev-qt/qtnetwork-${QT5_PV}*
83 -"
84 -
85 -PATCHES=( "${FILESDIR}/${P}-gcc11.patch" ) # bug 752012
86 -
87 -src_prepare() {
88 - sed -i -e 's/nfc//' src/src.pro || die
89 -
90 - qt_use_disable_mod qml quick src/src.pro
91 -
92 - qt5-build_src_prepare
93 -}