[PR PATCH] bitlbee-discord: add fix for glib >= 2.69

[PR PATCH] bitlbee-discord: add fix for glib >= 2.69

[pbui]

[-- Attachment #1: Type: text/plain, Size: 1621 bytes --]

There is a new pull request by pbui against master on the void-packages repository

https://github.com/pbui/void-packages bitlbee-discord
https://github.com/void-linux/void-packages/pull/33612

bitlbee-discord: add fix for glib >= 2.69
Fixes #33412

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33612.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bitlbee-discord-33612.patch --]
[-- Type: text/x-diff, Size: 2175 bytes --]

From 00b73ea5ff156899af5245f111ebdcf3e0e6ed0c Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Sun, 17 Oct 2021 23:28:21 -0400
Subject: [PATCH] bitlbee-discord: add fix for glib >= 2.69

Fixes #33412
---
 .../bitlbee-discord/patches/glib-2.69.patch   | 28 +++++++++++++++++++
 srcpkgs/bitlbee-discord/template              |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/bitlbee-discord/patches/glib-2.69.patch

diff --git a/srcpkgs/bitlbee-discord/patches/glib-2.69.patch b/srcpkgs/bitlbee-discord/patches/glib-2.69.patch
new file mode 100644
index 000000000000..6eff3f5e106f
--- /dev/null
+++ b/srcpkgs/bitlbee-discord/patches/glib-2.69.patch
@@ -0,0 +1,28 @@
+From 607f9887ca85f246e970778e3d40aa5c346365a7 Mon Sep 17 00:00:00 2001
+From: Artem Savkov <asavkov@redhat.com>
+Date: Tue, 28 Sep 2021 18:38:48 +0200
+Subject: [PATCH] Fix empty gateway->path with glib > 2.68
+
+Starting with glib 2.69 g_match_info_fetch() returns an empty string
+instead of NULL in case when no match was found. Properly handle this
+case.
+
+Signed-off-by: Artem Savkov <asavkov@redhat.com>
+---
+ src/discord-http.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/discord-http.c b/src/discord-http.c
+index 83b92ce..80b3946 100644
+--- a/src/discord-http.c
++++ b/src/discord-http.c
+@@ -175,6 +175,9 @@ static void discord_http_gateway_cb(struct http_request *req)
+ 
+     if (dd->gateway->path == NULL) {
+       dd->gateway->path = g_strdup("/?encoding=json&v=6");
++    } else if (g_strcmp0(dd->gateway->path, "") == 0) {
++      g_free(dd->gateway->path);
++      dd->gateway->path = g_strdup("/?encoding=json&v=6");
+     }
+ 
+     g_match_info_free(match);
diff --git a/srcpkgs/bitlbee-discord/template b/srcpkgs/bitlbee-discord/template
index 4fda22d15710..daa18792b8a6 100644
--- a/srcpkgs/bitlbee-discord/template
+++ b/srcpkgs/bitlbee-discord/template
@@ -1,7 +1,7 @@
 # Template file for 'bitlbee-discord'
 pkgname=bitlbee-discord
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="libtool automake pkg-config glib-devel"
 makedepends="bitlbee-devel json-glib-devel"

Re: [PR PATCH] [Merged]: bitlbee-discord: add fix for glib >= 2.69

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1468 bytes --]

There's a merged pull request on the void-packages repository

bitlbee-discord: add fix for glib >= 2.69
https://github.com/void-linux/void-packages/pull/33612

Description:
Fixes #33412

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->