* [gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez-tools/, net-wireless/bluez-tools/files/
@ 2020-04-10 15:40 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2020-04-10 15:40 UTC (permalink / raw
To: gentoo-commits
commit: 2cd5da72e8078d231fe6c70b8c500ae1d24019c1
Author: Olivier Laurantin <olivier.laurantin <AT> laposte <DOT> net>
AuthorDate: Fri Jan 31 07:01:05 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 15:40:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cd5da72
net-wireless/bluez-tools: Fix compilation with gcc-10
Closes: https://bugs.gentoo.org/707230
Signed-off-by: Olivier Laurantin <olivier.laurantin <AT> laposte.net>
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Closes: https://github.com/gentoo/gentoo/pull/14510
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../bluez-tools/bluez-tools-0_p20161212.ebuild | 8 +++---
.../files/bluez-tools-0_p20161212-gcc-10.patch | 29 ++++++++++++++++++++++
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild b/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
index 4e777054b46..87c36ffc498 100644
--- a/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
+++ b/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit autotools eutils
+inherit autotools
DESCRIPTION="A set of tools to manage bluetooth devices for linux"
HOMEPAGE="https://github.com/khvzak/bluez-tools"
@@ -23,9 +23,11 @@ DEPEND="${RDEPEND}"
DOCS=( AUTHORS README )
+PATCHES=( "${FILESDIR}/${P}-gcc-10.patch" )
+
S="${WORKDIR}/${PN}-${COMMIT}"
src_prepare() {
+ default
eautoreconf
- default_src_prepare
}
diff --git a/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch b/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch
new file mode 100644
index 00000000000..6bfaa57fa19
--- /dev/null
+++ b/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch
@@ -0,0 +1,29 @@
+--- a/src/lib/agent-helper.c 2016-12-12 09:18:08.000000000 +0100
++++ b/src/lib/agent-helper.c 2020-01-30 22:23:27.555951515 +0100
+@@ -33,6 +33,8 @@
+
+ #include "agent-helper.h"
+
++gboolean agent_need_unregister;
++
+ static const gchar *_bt_agent_introspect_xml = "<node name=\"/org/blueztools\">\n\t<interface name=\"org.bluez.Agent1\">\n\t\t<method name=\"Release\">\n\t\t</method>\n\t\t<method name=\"RequestPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"out\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"RequestPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"out\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t\t<arg name=\"entered\" direction=\"in\" type=\"q\"/>\n\t\t</method>\n\t\t<method name=\"RequestConfirmation\">\n\t\t\t<arg name=\"device\" direction=\"in\"
type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"RequestAuthorization\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t</method>\n\t\t<method name=\"AuthorizeService\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"uuid\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"Cancel\">\n\t\t</method>\n\t</interface>\n</node>\n";
+ static guint _bt_agent_registration_id = 0;
+ static GHashTable *_pin_hash_table = NULL;
+--- a/src/lib/agent-helper.h 2016-12-12 09:18:08.000000000 +0100
++++ b/src/lib/agent-helper.h 2020-01-30 22:22:15.463751152 +0100
+@@ -35,7 +35,7 @@
+ #define AGENT_DBUS_INTERFACE "org.bluez.Agent1"
+ #define AGENT_PATH "/org/blueztools"
+
+-gboolean agent_need_unregister;
++extern gboolean agent_need_unregister;
+
+ void register_agent_callbacks(gboolean interactive_console, GHashTable *pin_dictonary, gpointer main_loop_object, GError **error);
+ void unregister_agent_callbacks(GError **error);
+@@ -44,4 +44,4 @@
+ }
+ #endif
+
+-#endif /* __AGENT_HELPER_H */
+\ Pas de fin de ligne à la fin du fichier
++#endif /* __AGENT_HELPER_H */
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez-tools/, net-wireless/bluez-tools/files/
@ 2022-01-03 18:43 Florian Schmaus
0 siblings, 0 replies; 2+ messages in thread
From: Florian Schmaus @ 2022-01-03 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 1c4175c85c46a54a73f38343512ceffad5d500ce
Author: Olivier Laurantin <olivier.laurantin <AT> laposte <DOT> net>
AuthorDate: Sat Jan 1 10:41:02 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jan 3 18:41:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c4175c8
net-wireless/bluez-tools: remove old version
Remove old version and gcc 10 patch
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Olivier Laurantin <olivier.laurantin <AT> laposte.net>
Closes: https://github.com/gentoo/gentoo/pull/23612
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-wireless/bluez-tools/Manifest | 1 -
.../bluez-tools/bluez-tools-0_p20161212.ebuild | 33 ----------------------
.../files/bluez-tools-0_p20161212-gcc-10.patch | 29 -------------------
3 files changed, 63 deletions(-)
diff --git a/net-wireless/bluez-tools/Manifest b/net-wireless/bluez-tools/Manifest
index 3d34b1d3f9ec..e73715c1b798 100644
--- a/net-wireless/bluez-tools/Manifest
+++ b/net-wireless/bluez-tools/Manifest
@@ -1,2 +1 @@
-DIST bluez-tools-0_p20161212.tar.gz 126613 BLAKE2B 474393862049a893280eeb0b7f466a1b1165a14d0ab33cbd9d3ca805a15eef237761aa3038423de85280bcaaf1385c3c7ab313d4cc3199f284aba86d8e5ed16e SHA512 ab5dd4a223348aab29fae22f552afae989b74d56c3fa46fd5587c100d63309649a10a87591bc040082545f45b7bb95360fcf6a48812012edbdb93570b0e166f7
DIST bluez-tools-0_p20201025.tar.gz 126646 BLAKE2B 6deea6a12ee1050cbe12592fe202be60f032a7ee9a8f790537ef24c3a2562d90abf88f69690e6dd53f16841a256fc82dcfb078b2d708531ca6c50f63b6e84274 SHA512 631dfa7ee7e1bfe487db90f9df692c4136d6258ddd34cda269e3a9538a3c8fe8bad3bac595e57d74789df2da4e15fa0ca7b83374e7f6457695701852b3744b12
diff --git a/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild b/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
deleted file mode 100644
index 6585af370e24..000000000000
--- a/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A set of tools to manage bluetooth devices for linux"
-HOMEPAGE="https://github.com/khvzak/bluez-tools"
-COMMIT="97efd293491ad7ec96a655665339908f2478b3d1"
-SRC_URI="https://github.com/khvzak/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/dbus-glib
- dev-libs/glib:2
- net-wireless/bluez[obex]
- sys-libs/readline:0"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README )
-
-PATCHES=( "${FILESDIR}/${P}-gcc-10.patch" )
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
- default
- eautoreconf
-}
diff --git a/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch b/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch
deleted file mode 100644
index 6bfaa57fa19a..000000000000
--- a/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/lib/agent-helper.c 2016-12-12 09:18:08.000000000 +0100
-+++ b/src/lib/agent-helper.c 2020-01-30 22:23:27.555951515 +0100
-@@ -33,6 +33,8 @@
-
- #include "agent-helper.h"
-
-+gboolean agent_need_unregister;
-+
- static const gchar *_bt_agent_introspect_xml = "<node name=\"/org/blueztools\">\n\t<interface name=\"org.bluez.Agent1\">\n\t\t<method name=\"Release\">\n\t\t</method>\n\t\t<method name=\"RequestPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"out\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"RequestPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"out\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t\t<arg name=\"entered\" direction=\"in\" type=\"q\"/>\n\t\t</method>\n\t\t<method name=\"RequestConfirmation\">\n\t\t\t<arg name=\"device\" direction=\"in\"
type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"RequestAuthorization\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t</method>\n\t\t<method name=\"AuthorizeService\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"uuid\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"Cancel\">\n\t\t</method>\n\t</interface>\n</node>\n";
- static guint _bt_agent_registration_id = 0;
- static GHashTable *_pin_hash_table = NULL;
---- a/src/lib/agent-helper.h 2016-12-12 09:18:08.000000000 +0100
-+++ b/src/lib/agent-helper.h 2020-01-30 22:22:15.463751152 +0100
-@@ -35,7 +35,7 @@
- #define AGENT_DBUS_INTERFACE "org.bluez.Agent1"
- #define AGENT_PATH "/org/blueztools"
-
--gboolean agent_need_unregister;
-+extern gboolean agent_need_unregister;
-
- void register_agent_callbacks(gboolean interactive_console, GHashTable *pin_dictonary, gpointer main_loop_object, GError **error);
- void unregister_agent_callbacks(GError **error);
-@@ -44,4 +44,4 @@
- }
- #endif
-
--#endif /* __AGENT_HELPER_H */
-\ Pas de fin de ligne à la fin du fichier
-+#endif /* __AGENT_HELPER_H */
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-03 18:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-03 18:43 [gentoo-commits] repo/gentoo:master commit in: net-wireless/bluez-tools/, net-wireless/bluez-tools/files/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2020-04-10 15:40 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox