[PR PATCH] fix: compilation fix for geany-plugins

[PR PATCH] fix: compilation fix for geany-plugins

[g4s8]

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

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

https://github.com/g4s8/void-packages i33568-geany-plugins-fix
https://github.com/void-linux/void-packages/pull/33573

fix: compilation fix for geany-plugins
Applied patch from PR https://github.com/geany/geany-plugins/pull/1053
to fix compilation issue #33568

Fixes: #33568

<!-- 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?
- [ ] 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/33573.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i33568-geany-plugins-fix-33573.patch --]
[-- Type: text/x-diff, Size: 2730 bytes --]

From 93d1c56c10e4d0840ef1aecd9481956a58dbcce2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Fri, 15 Oct 2021 19:31:05 +0300
Subject: [PATCH] fix: compilation fix for geany-plugins

Applied patch from PR https://github.com/geany/geany-plugins/pull/1053
to fix compilation issue #33568

Fixes: #33568
---
 srcpkgs/geany-plugins/patches/pr-1053.patch | 40 +++++++++++++++++++++
 srcpkgs/geany-plugins/template              |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/geany-plugins/patches/pr-1053.patch

diff --git a/srcpkgs/geany-plugins/patches/pr-1053.patch b/srcpkgs/geany-plugins/patches/pr-1053.patch
new file mode 100644
index 000000000000..7731b62abcd1
--- /dev/null
+++ b/srcpkgs/geany-plugins/patches/pr-1053.patch
@@ -0,0 +1,40 @@
+From ad50d3ed2ddfe11cd07954786b96725602fb4ddd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexander=20F=2E=20R=C3=B8dseth?= <rodseth@gmail.com>
+Date: Tue, 5 Jan 2021 12:57:27 +0100
+Subject: [PATCH] Use stdbool.h istead of redefining bool
+
+Redefining bool causes errors when used together with ie. GCC 10.2.0
+---
+ pretty-printer/src/PrettyPrinter.h | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/pretty-printer/src/PrettyPrinter.h b/pretty-printer/src/PrettyPrinter.h
+index 268986e95..4200db612 100644
+--- a/pretty-printer/src/PrettyPrinter.h
++++ b/pretty-printer/src/PrettyPrinter.h
+@@ -29,6 +29,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdarg.h>
++#include <stdbool.h>
+ 
+ #ifdef HAVE_GLIB
+ #include <glib.h>
+@@ -52,15 +53,13 @@
+ #define TRUE !(FALSE)
+ #endif
+ 
+-typedef unsigned int bool;
+-
+ /*========================================== STRUCTURES =======================================================*/
+ 
+ /**
+  * The PrettyPrintingOptions struct allows the programmer to tell the
+  * PrettyPrinter how it must format the XML output.
+  */
+-typedef struct 
++typedef struct
+ {
+       const char* newLineChars;                                                             /* char used to generate a new line (generally \r\n) */
+       char indentChar;                                                                      /* char used for indentation */
+
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index 8038f5f3704b..3cba06294b9c 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'geany-plugins'
 pkgname=geany-plugins
 version=1.37.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp
  --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"

Re: fix: compilation fix for geany-plugins

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33573#issuecomment-944472328

Comment:
Commit title should be `geany-plugins: fix compilation`. Commit body is fine.

Re: fix: compilation fix for geany-plugins

[q66]

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/33573#issuecomment-944514923

Comment:
also drop revbump

Re: [PR PATCH] [Updated] fix: compilation fix for geany-plugins

[g4s8]

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

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

https://github.com/g4s8/void-packages i33568-geany-plugins-fix
https://github.com/void-linux/void-packages/pull/33573

fix: compilation fix for geany-plugins
Applied patch from PR https://github.com/geany/geany-plugins/pull/1053
to fix compilation issue #33568

Fixes: #33568

<!-- 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?
- [ ] 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/33573.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i33568-geany-plugins-fix-33573.patch --]
[-- Type: text/x-diff, Size: 2159 bytes --]

From 90ab2877249a7eec6dcd1400dd342051184b19df Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Fri, 15 Oct 2021 19:31:05 +0300
Subject: [PATCH] geany-plugins: fix compilation

Applied patch from PR https://github.com/geany/geany-plugins/pull/1053
to fix compilation issue #33568

Fixes: #33568
---
 srcpkgs/geany-plugins/patches/pr-1053.patch | 40 +++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 srcpkgs/geany-plugins/patches/pr-1053.patch

diff --git a/srcpkgs/geany-plugins/patches/pr-1053.patch b/srcpkgs/geany-plugins/patches/pr-1053.patch
new file mode 100644
index 000000000000..7731b62abcd1
--- /dev/null
+++ b/srcpkgs/geany-plugins/patches/pr-1053.patch
@@ -0,0 +1,40 @@
+From ad50d3ed2ddfe11cd07954786b96725602fb4ddd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexander=20F=2E=20R=C3=B8dseth?= <rodseth@gmail.com>
+Date: Tue, 5 Jan 2021 12:57:27 +0100
+Subject: [PATCH] Use stdbool.h istead of redefining bool
+
+Redefining bool causes errors when used together with ie. GCC 10.2.0
+---
+ pretty-printer/src/PrettyPrinter.h | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/pretty-printer/src/PrettyPrinter.h b/pretty-printer/src/PrettyPrinter.h
+index 268986e95..4200db612 100644
+--- a/pretty-printer/src/PrettyPrinter.h
++++ b/pretty-printer/src/PrettyPrinter.h
+@@ -29,6 +29,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdarg.h>
++#include <stdbool.h>
+ 
+ #ifdef HAVE_GLIB
+ #include <glib.h>
+@@ -52,15 +53,13 @@
+ #define TRUE !(FALSE)
+ #endif
+ 
+-typedef unsigned int bool;
+-
+ /*========================================== STRUCTURES =======================================================*/
+ 
+ /**
+  * The PrettyPrintingOptions struct allows the programmer to tell the
+  * PrettyPrinter how it must format the XML output.
+  */
+-typedef struct 
++typedef struct
+ {
+       const char* newLineChars;                                                             /* char used to generate a new line (generally \r\n) */
+       char indentChar;                                                                      /* char used for indentation */
+

Re: geany-plugins: fix compilation

[g4s8]

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

New comment by g4s8 on void-packages repository

https://github.com/void-linux/void-packages/pull/33573#issuecomment-944865655

Comment:
@ericonr fixed title and @q66 reverted revbump.

Re: [PR PATCH] [Merged]: geany-plugins: fix compilation

[q66]

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

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

geany-plugins: fix compilation
https://github.com/void-linux/void-packages/pull/33573

Description:
Applied patch from PR https://github.com/geany/geany-plugins/pull/1053
to fix compilation issue #33568

Fixes: #33568

<!-- 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?
- [ ] 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