Re: [PR PATCH] [Updated] id3lib: patch for c99 bool

[sgn <sgn@users.noreply.github.com>]

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/mtboehlke/void-packages id3lib
https://github.com/void-linux/void-packages/pull/39275

id3lib: patch for c99 bool
id3/globals.h has a typedef for bool which is incompatible with c99 stdbool.
This is a known issue, but upstream is effectively unmaintained.
See [this thread](https://sourceforege.net/p/id3lib/mailman/message/30500558/) from upstream.

This only seems to be an issue for castget while building, and they have already switched to using taglib for the next release.
Castget [issue](https://github.com/mlj/castget/issues/47).

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/39275.patch is attached

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

From 05560cb8acb003cb3db11a4ca37781087d95285e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 15 Sep 2022 09:11:49 +0700
Subject: [PATCH] id3lib: patch for c99 bool

id3/globals.h has a typedef for bool which is incompatible with c99 stdbool.
This is a known issue, but upstream is effectively unmaintained.
See https://sourceforege.net/p/id3lib/mailman/message/30500558/

Close: #39275
---
 srcpkgs/id3lib/patches/c99-bool.patch | 36 +++++++++++++++++++++++++++
 srcpkgs/id3lib/patches/test-io.patch  | 22 ++++++++++++++++
 srcpkgs/id3lib/template               |  2 +-
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/id3lib/patches/c99-bool.patch
 create mode 100644 srcpkgs/id3lib/patches/test-io.patch

diff --git a/srcpkgs/id3lib/patches/c99-bool.patch b/srcpkgs/id3lib/patches/c99-bool.patch
new file mode 100644
index 000000000000..59b68c7381c9
--- /dev/null
+++ b/srcpkgs/id3lib/patches/c99-bool.patch
@@ -0,0 +1,36 @@
+First hunk fix build for C99 since C99 typedef bool for _Bool
+
+Second hunk re-correct ABI for C99, since sizeof(_Bool) is 1,
+So privatebit, copyrighted, and original will be squeezed into single word
+
+Second hunk also fix ABI for C++ since in C++, sizeof(bool) also 1
+--- a/include/id3/globals.h
++++ b/include/id3/globals.h
+@@ -82,13 +82,7 @@
+ 
+ #define ID3_C_VAR extern
+ 
+-#ifndef __cplusplus
+-
+-typedef int bool;
+-#  define false (0)
+-#  define true (!false)
+-
+-#endif /* __cplusplus */
++#include <stdbool.h>
+ 
+ ID3_C_VAR const char * const ID3LIB_NAME;
+ ID3_C_VAR const char * const ID3LIB_RELEASE;
+@@ -532,9 +526,9 @@ ID3_STRUCT(Mp3_Headerinfo)
+   uint32 framesize;
+   uint32 frames;                // nr of frames
+   uint32 time;                  // nr of seconds in song
+-  bool privatebit;
+-  bool copyrighted;
+-  bool original;
++  int privatebit;               // bool upstream, change to int for stable ABI
++  int copyrighted;              // bool upstream, change to int for stable ABI
++  int original;                 // bool upstream, change to int for stable ABI
+ };
+ 
+ #define ID3_NR_OF_V1_GENRES 148
diff --git a/srcpkgs/id3lib/patches/test-io.patch b/srcpkgs/id3lib/patches/test-io.patch
new file mode 100644
index 000000000000..7b18b4a9e0fa
--- /dev/null
+++ b/srcpkgs/id3lib/patches/test-io.patch
@@ -0,0 +1,22 @@
+diff --git a/examples/test_io.cpp b/examples/test_io.cpp
+index bee1a27..80020eb 100644
+--- a/examples/test_io.cpp
++++ b/examples/test_io.cpp
+@@ -24,7 +24,7 @@ main(size_t argc, const char** argv)
+   ID3D_INIT_WARNING();
+   ID3D_INIT_NOTICE();
+ 
+-  ID3_IStreamReader isr(cin);
++  ID3_IStreamReader isr(std::cin);
+   BString orig = io::readAllBinary(isr);
+     
+   cout << "input size:    " << orig.size() << endl;
+@@ -116,7 +116,7 @@ main(size_t argc, const char** argv)
+   cout << "binary number:";
+   for (size_t i = 0; i < number.size(); ++i)
+   {
+-    cout << " 0x" << hex << (size_t) (0xFF & number[i]) << dec;
++    cout << " 0x" << std::hex << (size_t) (0xFF & number[i]) << std::dec;
+   }
+   cout << endl;
+ 
diff --git a/srcpkgs/id3lib/template b/srcpkgs/id3lib/template
index 44cb7f55f1dd..ad9a60665e7e 100644
--- a/srcpkgs/id3lib/template
+++ b/srcpkgs/id3lib/template
@@ -1,7 +1,7 @@
 # Template file for 'id3lib'
 pkgname=id3lib
 version=3.8.3
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="libtool automake"
 makedepends="zlib-devel"