glib2-2.68 patches for cinepaint

["John D. Baker" <jdbaker%consolidated.net@localhost>]

Below are patches for "graphics/cinepaint" to build with v2.68 of
"devel/glib2".

For some reason, building for netbsd-9/amd64 didn't need them, but
netbsd-9/i386 does.

+--- plug-ins/bracketing_to_hdr/br_core/i18n.hpp.orig	2021-04-05 01:58:43.520432466 -0500
++++ plug-ins/bracketing_to_hdr/br_core/i18n.hpp	2021-04-05 01:58:23.736293370 -0500
+@@ -49,9 +49,7 @@
+ #else
+ 
+ //  I am not shure whether the `extern "C"' is needed here for C++ progs
+-extern "C" {
+ #  include "../../../libgimp/stdplugins-intl.h"
+-}
+ 
+ #endif  // NO_CINEPAINT
+ 

+--- plug-ins/bracketing_to_hdr/br_core/path_utils.cpp.orig	2021-04-05 01:40:16.533798896 -0500
++++ plug-ins/bracketing_to_hdr/br_core/path_utils.cpp	2021-04-05 01:43:30.377897698 -0500
+@@ -30,10 +30,8 @@
+ #include "br_macros.hpp"        // BR_WARNING()
+ 
+ #ifndef NO_CINEPAINT
+-extern "C" {
+ #  include "lib/plugin_main.h"  // plugin's argv
+ #  include <glib.h>             // G_DIR_SEPARATOR
+-}
+ #else
+    char*  argv[] = {""};        // Notbehelf
+ #  define G_DIR_SEPARATOR   '/'


+--- plug-ins/collect/collect.cpp.orig	2011-11-28 00:58:21.000000000 -0600
++++ plug-ins/collect/collect.cpp	2021-04-05 02:52:08.929194264 -0500
+@@ -41,12 +41,10 @@
+ #define PLUG_IN_AUTHOR        "Kai-Uwe Behrmann <ku.b%gmx.de@localhost>"
+ #define PLUG_IN_COPYRIGHT     "Copyright 2004-2006 Kai-Uwe Behrmann"
+ 
+-extern "C" {
+ #include "lib/plugin_main.h"
+ #include "lib/wire/libtile.h"
+ #include "plugin_pdb.h"
+ #include "libgimp/stdplugins-intl.h"
+-}
+ 
+ // Declare some local functions:
+ 

-- 
|/"\ John D. Baker, KN5UKS               NetBSD     Darwin/MacOS X
|\ / jdbaker[snail]consolidated[flyspeck]net  OpenBSD            FreeBSD
| X  No HTML/proprietary data in email.   BSD just sits there and works!
|/ \ GPGkeyID:  D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645