From 1fe7aef6facf013a94eac853717f4da4d5d3c5b3 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 6 Dec 2022 09:09:23 +0000
Subject: gentoo auto-resync : 06:12:2022 - 09:09:23

---
 media-radio/grig/Manifest                        |  3 ++-
 media-radio/grig/files/grig-0.8.1-hamlib45.patch | 17 +++++++++++++++++
 media-radio/grig/grig-0.8.1-r1.ebuild            |  7 ++++---
 3 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 media-radio/grig/files/grig-0.8.1-hamlib45.patch

(limited to 'media-radio/grig')

diff --git a/media-radio/grig/Manifest b/media-radio/grig/Manifest
index 2c087a019e44..2062ddf4681c 100644
--- a/media-radio/grig/Manifest
+++ b/media-radio/grig/Manifest
@@ -1,5 +1,6 @@
 AUX grig-0.8.1-hamlib4.patch 3897 BLAKE2B f855040e1860d840cc993c46a0b17a341d3820f342dc1082e2a4a9ed5f1b598f50ba61215add86f6c1b59afef04194d82a80a2de1f033328e37e0edfe51f422f SHA512 b8573228232d24fe0fd750857a5b60a358279fd5e3a07dde9eff18ed3b38c09ff4bf693f63ad9f63f691d3b8937e0a7e7dff222f9aaa74d53bd064b3adf379cf
 AUX grig-0.8.1-hamlib42.patch 6661 BLAKE2B 2ba2f54d9f6d5571862ced26fdc300198c33b7430f8ea5787c02b640c80de769fcd3cecd7d44b1ec943e6a9d88d9fec322ef57c2c363d704ddefbc484bac2bc2 SHA512 c302618a824b2cb79403ca58a5506fdf0005f07ba0e0f6ef9569f0ee4043ead86589bffd9f990265253f620eddc204a4ecd9ebbf4e2cfa421d97ed7eac55e1c6
+AUX grig-0.8.1-hamlib45.patch 538 BLAKE2B b75374d210e633ce4dd02d2bf88946e54ebe444053ea3b2ad543f8ff74205d7466f378de5fc4f222f0ba8658feac4b502c1ee686eaca49cde16b62bab2c9784b SHA512 4ba44fb93c3c730c9903f51990696910f6b7959ec99312d424c78fe837cc81297a4e3e00c814ff3617186dc8b29c41d496b82517a4a4df72a5943e21ed5a3180
 DIST grig-0.8.1.tar.gz 621728 BLAKE2B 096ac037d3e5871e32bbb80669e2bafdf061c28c420362e26aea9f01f2e399a4cb769e65aa8261b0726444d08006495de13c62ca9d9e094c44fd8cb28b36a3f1 SHA512 84eda8db5d18324f26f0775483c8272296aad05dd75f0572c01a3c7af6dbd14bff7b98cc6a61fe3c43d25193866be4b3dafdc4e68dfc37217e88b53ca53266f9
-EBUILD grig-0.8.1-r1.ebuild 913 BLAKE2B 163eeb4716e0d5a71ee7bca0a3fbd02325226598b630b6a5a08aa707832899d8e25fa3a8141fe025e1aeff0e63d6ad5c54f5943ef954b8575ef97715e0a3f8aa SHA512 816ac3ff3765f15799eca881af3fec07a4d3f2ae6441a69d4615056e22a0ae042d50854d19b19540e540854231d656c461500a25ce3ab1ee78078e9d0b3cd4b7
+EBUILD grig-0.8.1-r1.ebuild 960 BLAKE2B dd6f87487279c4706965184675981350763058e4b0f56e9e756bbc4988283c0f1cb47c90aaa870537bce6222ae6377f7296c6f0f0a250955d6e06651c2603422 SHA512 6c7c229ace3ddab05b5972de378db09f9ada37eb49022c716c751ea51f7e7a218423554bd7b15845c5949f5e75884aa48f2a95869a5d67e483ad5fbd0c8c7a43
 MISC metadata.xml 333 BLAKE2B 2620dd12d47c52bbb817b5c59be52e6abb64cb0dcc1bfa30cef17c492d5270004fcb463e7343ddae0000e8860a65a166150dced485b8149c60a72f3e9b70458f SHA512 92080dd701954afba50bb5d90bae583cabc730d2cf57045c9326657803c90ef0a8d2c55fbee3105298633fd9535e167525444cd16738653c02a8ecca777ffd6d
diff --git a/media-radio/grig/files/grig-0.8.1-hamlib45.patch b/media-radio/grig/files/grig-0.8.1-hamlib45.patch
new file mode 100644
index 000000000000..4da0a6496978
--- /dev/null
+++ b/media-radio/grig/files/grig-0.8.1-hamlib45.patch
@@ -0,0 +1,17 @@
+Hamlib 4.5 dropped rig_get_split macro
+see Bug 883773
+
+diff --git a/src/rig-daemon.c b/src/rig-daemon.c
+index ddd922f..1a86a5e 100644
+--- a/src/rig-daemon.c
++++ b/src/rig-daemon.c
+@@ -2283,7 +2283,8 @@ rig_daemon_exec_cmd         (rig_cmd_t cmd,
+ 	case RIG_CMD_GET_SPLIT:
+ 		if (has_get->split) {
+ 
+-			retcode = rig_get_split (myrig, RIG_VFO_RX, &get->split);
++			vfo_t tx_vfo;
++			retcode = rig_get_split_vfo (myrig, RIG_VFO_RX, &get->split, &tx_vfo);
+ 
+ 			/* raise anomaly if execution did not succeed */
+ 			if (retcode != RIG_OK) {
diff --git a/media-radio/grig/grig-0.8.1-r1.ebuild b/media-radio/grig/grig-0.8.1-r1.ebuild
index 07f9ee0da9ba..f4a97bae6a70 100644
--- a/media-radio/grig/grig-0.8.1-r1.ebuild
+++ b/media-radio/grig/grig-0.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,8 @@ DEPEND="
 	>=media-libs/hamlib-4:="
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/grig-0.8.1-hamlib4.patch )
+PATCHES=( "${FILESDIR}"/grig-0.8.1-hamlib4.patch
+		  "${FILESDIR}"/grig-0.8.1-hamlib45.patch )
 
 src_configure() {
 	econf --enable-hardware
@@ -32,7 +33,7 @@ src_prepare() {
 		eapply -p1 "${FILESDIR}"/${P}-hamlib42.patch
 	fi
 
-	eapply ${PATCHES}
+	eapply ${PATCHES[@]}
 
 	eapply_user
 }
-- 
cgit v1.2.3