From 93d1c56c10e4d0840ef1aecd9481956a58dbcce2 Mon Sep 17 00:00:00 2001 From: Kirill 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?= +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 + #include + #include ++#include + + #ifdef HAVE_GLIB + #include +@@ -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"