From owner-dev-commits-ports-main@freebsd.org  Tue Aug  3 02:47:17 2021
Return-Path: <owner-dev-commits-ports-main@freebsd.org>
Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5CDF767E779;
 Tue,  3 Aug 2021 02:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4Gdzmj0Zjtz4X7D;
 Tue,  3 Aug 2021 02:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:5])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EE9FE2FE9;
 Tue,  3 Aug 2021 02:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
 by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1732lGcm005785;
 Tue, 3 Aug 2021 02:47:16 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1732lGgB005784;
 Tue, 3 Aug 2021 02:47:16 GMT (envelope-from git)
Date: Tue, 3 Aug 2021 02:47:16 GMT
Message-Id: <202108030247.1732lGgB005784@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
 dev-commits-ports-main@FreeBSD.org
From: Neel Chauhan <nc@FreeBSD.org>
Subject: git: a0676fc963bf - main - news/pan: Prepare for glib 2.68.3
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: nc
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: a0676fc963bff28aaf70f27f61aba44fa434d13c
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-ports-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the main branch of the FreeBSD ports repository
 <dev-commits-ports-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-ports-main>, 
 <mailto:dev-commits-ports-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-ports-main/>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Help: <mailto:dev-commits-ports-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-main>, 
 <mailto:dev-commits-ports-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Aug 2021 02:47:17 -0000

The branch main has been updated by nc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a0676fc963bff28aaf70f27f61aba44fa434d13c

commit a0676fc963bff28aaf70f27f61aba44fa434d13c
Author:     Neel Chauhan <nc@FreeBSD.org>
AuthorDate: 2021-08-03 02:30:41 +0000
Commit:     Neel Chauhan <nc@FreeBSD.org>
CommitDate: 2021-08-03 02:47:10 +0000

    news/pan: Prepare for glib 2.68.3
    
    PR:     256200
---
 news/pan/files/patch-pan_data-impl_data-impl.cc    | 15 +++++++++++
 news/pan/files/patch-pan_data_article-cache.cc     | 29 ++++++++++++++++++++++
 news/pan/files/patch-pan_general_file-util.cc      | 28 +++++++++++++++++++++
 news/pan/files/patch-pan_general_line-reader.cc    | 13 ++++++++++
 news/pan/files/patch-pan_general_text-match.cc     | 17 +++++++++++++
 news/pan/files/patch-pan_gui_actions.cc            | 15 +++++++++++
 news/pan/files/patch-pan_gui_dl-headers-ui.cc      | 17 +++++++++++++
 news/pan/files/patch-pan_gui_group-prefs-dialog.cc | 21 ++++++++++++++++
 news/pan/files/patch-pan_gui_group-prefs.cc        | 19 ++++++++++++++
 news/pan/files/patch-pan_gui_header-pane.cc        | 19 ++++++++++++++
 news/pan/files/patch-pan_gui_prefs-ui.cc           | 15 +++++++++++
 news/pan/files/patch-pan_gui_progress-view.cc      | 13 ++++++++++
 news/pan/files/patch-pan_gui_save-attach-ui.cc     | 15 +++++++++++
 news/pan/files/patch-pan_gui_save-ui.cc            | 15 +++++++++++
 news/pan/files/patch-pan_gui_score-add-ui.cc       | 13 ++++++++++
 news/pan/files/patch-pan_gui_score-view-ui.cc      | 15 +++++++++++
 news/pan/files/patch-pan_gui_server-ui.cc          | 17 +++++++++++++
 news/pan/files/patch-pan_gui_task-pane.cc          | 17 +++++++++++++
 news/pan/files/patch-pan_tasks_nntp.cc             | 15 +++++++++++
 news/pan/files/patch-pan_tasks_socket-impl-main.cc | 14 +++++++++++
 news/pan/files/patch-pan_tasks_task-groups.cc      | 15 +++++++++++
 news/pan/files/patch-pan_tasks_task-post.cc        | 13 ++++++++++
 news/pan/files/patch-pan_tasks_task-xover.cc       | 17 +++++++++++++
 news/pan/files/patch-pan_tasks_task-xoverinfo.cc   | 23 +++++++++++++++++
 .../files/patch-pan_usenet-utils_filter-info.cc    | 15 +++++++++++
 25 files changed, 425 insertions(+)

diff --git a/news/pan/files/patch-pan_data-impl_data-impl.cc b/news/pan/files/patch-pan_data-impl_data-impl.cc
new file mode 100644
index 000000000000..ad15106bb61c
--- /dev/null
+++ b/news/pan/files/patch-pan_data-impl_data-impl.cc
@@ -0,0 +1,15 @@
+--- pan/data-impl/data-impl.cc.orig	2021-08-03 02:10:47 UTC
++++ pan/data-impl/data-impl.cc
+@@ -22,10 +22,8 @@
+ **************/
+ 
+ #include <config.h>
+-extern "C" {
+-  #include <glib/gi18n.h>
+-  #include <glib.h> // for g_build_filename
+-}
++#include <glib/gi18n.h>
++#include <glib.h> // for g_build_filename
+ #include <pan/general/debug.h>
+ #include <pan/general/file-util.h>
+ #include <pan/general/log.h>
diff --git a/news/pan/files/patch-pan_data_article-cache.cc b/news/pan/files/patch-pan_data_article-cache.cc
new file mode 100644
index 000000000000..dea9b7ac7676
--- /dev/null
+++ b/news/pan/files/patch-pan_data_article-cache.cc
@@ -0,0 +1,29 @@
+--- pan/data/article-cache.cc.orig	2021-08-03 02:00:16 UTC
++++ pan/data/article-cache.cc
+@@ -19,18 +19,15 @@
+ 
+ #include <config.h>
+ 
+-extern "C"
+-{
+-  #include <errno.h>
+-  #include <sys/types.h>
+-  #include <sys/stat.h>
+-  #include <unistd.h>
+-  #include <dirent.h>
++#include <errno.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++#include <dirent.h>
+ 
+-  #include <glib.h>
+-  #include <glib/gi18n.h>
+-  #include <gmime/gmime.h>
+-}
++#include <glib.h>
++#include <glib/gi18n.h>
++#include <gmime/gmime.h>
+ 
+ #include <pan/general/debug.h>
+ #include <pan/general/file-util.h>
diff --git a/news/pan/files/patch-pan_general_file-util.cc b/news/pan/files/patch-pan_general_file-util.cc
new file mode 100644
index 000000000000..75d30c1a8c79
--- /dev/null
+++ b/news/pan/files/patch-pan_general_file-util.cc
@@ -0,0 +1,28 @@
+--- pan/general/file-util.cc.orig	2021-08-03 01:55:38 UTC
++++ pan/general/file-util.cc
+@@ -22,17 +22,14 @@
+ #include <cerrno>
+ #include <cctype>
+ 
+-extern "C"
+-{
+-  #include <unistd.h>
+-  #include <sys/stat.h>
+-  #include <sys/types.h>
+-  #include <glib.h>
+-  #include <glib/gi18n.h>
+-  #ifndef G_OS_WIN32
+-    #include <pwd.h>
+-  #endif
+-}
++#include <unistd.h>
++#include <sys/stat.h>
++#include <sys/types.h>
++#include <glib.h>
++#include <glib/gi18n.h>
++#ifndef G_OS_WIN32
++  #include <pwd.h>
++#endif
+ 
+ #include "debug.h"
+ #include "log.h"
diff --git a/news/pan/files/patch-pan_general_line-reader.cc b/news/pan/files/patch-pan_general_line-reader.cc
new file mode 100644
index 000000000000..57a550882912
--- /dev/null
+++ b/news/pan/files/patch-pan_general_line-reader.cc
@@ -0,0 +1,13 @@
+--- pan/general/line-reader.cc.orig	2021-08-03 01:56:04 UTC
++++ pan/general/line-reader.cc
+@@ -1,9 +1,7 @@
+ #include <config.h>
+ #include <cstdio>
+ #include <cstdlib>
+-extern "C"{ 
+-  #include <glib/gi18n.h>
+-}
++#include <glib/gi18n.h>
+ #include <cerrno>
+ #include "file-util.h"
+ #include "line-reader.h"
diff --git a/news/pan/files/patch-pan_general_text-match.cc b/news/pan/files/patch-pan_general_text-match.cc
new file mode 100644
index 000000000000..a533840cc1d1
--- /dev/null
+++ b/news/pan/files/patch-pan_general_text-match.cc
@@ -0,0 +1,17 @@
+--- pan/general/text-match.cc.orig	2021-08-03 01:57:31 UTC
++++ pan/general/text-match.cc
+@@ -18,11 +18,9 @@
+  */
+ 
+ #include <config.h>
+-extern "C" {
+-  #include <ctype.h>
+-  #include <glib.h>
+-  #include <glib/gi18n.h>
+-}
++#include <ctype.h>
++#include <glib.h>
++#include <glib/gi18n.h>
+ #include "debug.h"
+ #include "log.h"
+ #include "text-match.h"
diff --git a/news/pan/files/patch-pan_gui_actions.cc b/news/pan/files/patch-pan_gui_actions.cc
new file mode 100644
index 000000000000..dd1dd31f3d8c
--- /dev/null
+++ b/news/pan/files/patch-pan_gui_actions.cc
@@ -0,0 +1,15 @@
+--- pan/gui/actions.cc.orig	2021-08-03 02:20:11 UTC
++++ pan/gui/actions.cc
+@@ -18,10 +18,8 @@
+  */
+ 
+ #include <config.h>
+-extern "C" {
+-  #include <glib/gi18n.h>
+-  #include "gtk-compat.h"
+-}
++#include <glib/gi18n.h>
++#include "gtk-compat.h"
+ 
+ #include <pan/general/macros.h>
+ #include <pan/general/debug.h>
diff --git a/news/pan/files/patch-pan_gui_dl-headers-ui.cc b/news/pan/files/patch-pan_gui_dl-headers-ui.cc
new file mode 100644
index 000000000000..f085bd0ca825
--- /dev/null
+++ b/news/pan/files/patch-pan_gui_dl-headers-ui.cc
@@ -0,0 +1,17 @@
+--- pan/gui/dl-headers-ui.cc.orig	2021-08-03 02:25:00 UTC
++++ pan/gui/dl-headers-ui.cc
+@@ -18,11 +18,9 @@
+  */
+ 
+ #include <config.h>
+-extern "C" {
+-  #include <glib.h>
+-  #include <glib/gi18n.h>
+-  #include "gtk-compat.h"
+-}
++#include <glib.h>
++#include <glib/gi18n.h>
++#include "gtk-compat.h"
+ #include <pan/general/macros.h>
+ #include <pan/tasks/queue.h>
+ #include <pan/tasks/task-xover.h>
diff --git a/news/pan/files/patch-pan_gui_group-prefs-dialog.cc b/news/pan/files/patch-pan_gui_group-prefs-dialog.cc
new file mode 100644
index 000000000000..0e9ca47316b9
--- /dev/null
+++ b/news/pan/files/patch-pan_gui_group-prefs-dialog.cc
@@ -0,0 +1,21 @@
+--- pan/gui/group-prefs-dialog.cc.orig	2021-08-03 02:20:45 UTC
++++ pan/gui/group-prefs-dialog.cc
+@@ -18,14 +18,12 @@
+  */
+ 
+ #include <config.h>
+-extern "C" {
+-  #include <glib/gi18n.h>
+-  #include <glib.h>
+-  #include "gtk-compat.h"
++#include <glib/gi18n.h>
++#include <glib.h>
++#include "gtk-compat.h"
+ #ifdef HAVE_GTKSPELL
+-  #include <enchant/enchant.h>
++#include <enchant/enchant.h>
+ #endif
+-}
+ #include <pan/general/debug.h>
+ #include <pan/general/macros.h>
+ #include <pan/data/data.h>
diff --git a/news/pan/files/patch-pan_gui_group-prefs.cc b/news/pan/files/patch-pan_gui_group-prefs.cc
new file mode 100644
index 000000000000..21d27e88fe70
--- /dev/null
+++ b/news/pan/files/patch-pan_gui_group-prefs.cc
@@ -0,0 +1,19 @@
+--- pan/gui/group-prefs.cc.orig	2021-08-03 02:25:25 UTC
++++ pan/gui/group-prefs.cc
+@@ -17,12 +17,10 @@
+  *
+  */
+ 
+-extern "C" {
+-  #include <config.h>
+-  #include <sys/types.h> // chmod
+-  #include <sys/stat.h> // chmod
+-  #include <glib.h>
+-}
++#include <config.h>
++#include <sys/types.h> // chmod
++#include <sys/stat.h> // chmod
++#include <glib.h>
+ #include <iostream>
+ #include <fstream>
+ #include <pan/general/file-util.h>
diff --git a/news/pan/files/patch-pan_gui_header-pane.cc b/news/pan/files/patch-pan_gui_header-pane.cc
new file mode 100644
index 000000000000..d1beb3a3a38c
--- /dev/null
+++ b/news/pan/files/patch-pan_gui_header-pane.cc
@@ -0,0 +1,19 @@
+--- pan/gui/header-pane.cc.orig	2021-08-03 02:19:33 UTC
++++ pan/gui/header-pane.cc
+@@ -17,12 +17,10 @@
+  *
+  */
+ 
+-extern "C" {
+-  #include <config.h>
+-  #include <glib/gi18n.h>
+-  #include "gtk-compat.h"
+-  #include "gtk-compat.h"
+-}
++#include <config.h>
++#include <glib/gi18n.h>
++#include "gtk-compat.h"
++#include "gtk-compat.h"
+ #include <cctype>
+ #include <cmath>
+ #include <algorithm>
diff --git a/news/pan/files/patch-pan_gui_prefs-ui.cc b/news/pan/files/patch-pan_gui_prefs-ui.cc
new file mode 100644
index 000000000000..5cf486b6a873
--- /dev/null
+++ b/news/pan/files/patch-pan_gui_prefs-ui.cc
@@ -0,0 +1,15 @@
+--- pan/gui/prefs-ui.cc.orig	2021-08-03 02:21:18 UTC
++++ pan/gui/prefs-ui.cc
+@@ -18,10 +18,8 @@
+  */
+ 
+ #include <config.h>
+-extern "C" {
+-  #include <glib/gi18n.h>
+-  #include "gtk-compat.h"
+-}
++#include <glib/gi18n.h>
++#include "gtk-compat.h"
+ #include <pan/general/debug.h>
+ #include <pan/general/macros.h>
+ #include <pan/general/file-util.h>
diff --git a/news/pan/files/patch-pan_gui_progress-view.cc b/news/pan/files/patch-pan_gui_progress-view.cc
new file mode 100644
index 000000000000..5743559db89a
--- /dev/null
+++ b/news/pan/files/patch-pan_gui_progress-view.cc
@@ -0,0 +1,13 @@
+--- pan/gui/progress-view.cc.orig	2021-08-03 02:21:46 UTC
++++ pan/gui/progress-view.cc
+@@ -18,9 +18,7 @@
+  */
+ 
+ #include <config.h>
+-extern "C" {
+-  #include "gtk-compat.h"
+-}
++#include "gtk-compat.h"
+ #include <pan/general/string-view.h>
+ #include <pan/usenet-utils/mime-utils.h>
+ #include "progress-view.h"
diff --git a/news/pan/files/patch-pan_gui_save-attach-ui.cc b/news/pan/files/patch-pan_gui_save-attach-ui.cc
new file mode 100644
index 000000000000..e6eab18c14f5
--- /dev/null
+++ b/news/pan/files/patch-pan_gui_save-attach-ui.cc
@@ -0,0 +1,15 @@
+--- pan/gui/save-attach-ui.cc.orig	2021-08-03 02:27:47 UTC
++++ pan/gui/save-attach-ui.cc
+@@ -18,10 +18,8 @@
+  */
+ 
+ #include <config.h>
+-extern "C" {
+-  #include <glib/gi18n.h>
+-  #include "gtk-compat.h"
+-}
++#include <glib/gi18n.h>
++#include "gtk-compat.h"
+ #include <pan/general/debug.h>
+ #include <pan/general/macros.h>
+ #include <pan/icons/pan-pixbufs.h>
diff --git a/news/pan/files/patch-pan_gui_save-ui.cc b/news/pan/files/patch-pan_gui_save-ui.cc
new file mode 100644
index 000000000000..77ccb14de983
--- /dev/null
+++ b/news/pan/files/patch-pan_gui_save-ui.cc
@@ -0,0 +1,15 @@
+--- pan/gui/save-ui.cc.orig	2021-08-03 02:27:18 UTC
++++ pan/gui/save-ui.cc
+@@ -18,10 +18,8 @@
+  */
+ 
+ #include <config.h>
+-extern "C" {
+-  #include <glib/gi18n.h>
+-  #include "gtk-compat.h"
+-}
++#include <glib/gi18n.h>
++#include "gtk-compat.h"
+ #include <pan/general/debug.h>
+ #include <pan/general/macros.h>
+ #include <pan/icons/pan-pixbufs.h>
diff --git a/news/pan/files/patch-pan_gui_score-add-ui.cc b/news/pan/files/patch-pan_gui_score-add-ui.cc
new file mode 100644
index 000000000000..cd5020cd2a14
--- /dev/null
+++ b/news/pan/files/patch-pan_gui_score-add-ui.cc
@@ -0,0 +1,13 @@
+--- pan/gui/score-add-ui.cc.orig	2021-08-03 02:28:07 UTC
++++ pan/gui/score-add-ui.cc
+@@ -20,9 +20,7 @@
+ #include <config.h>
+ #include <cassert>
+ #include <climits>
+-extern "C" {
+-  #include <glib/gi18n.h>
+-}
++#include <glib/gi18n.h>
+ #include <pan/general/debug.h>
+ #include <pan/general/text-match.h>
+ #include "hig.h"
diff --git a/news/pan/files/patch-pan_gui_score-view-ui.cc b/news/pan/files/patch-pan_gui_score-view-ui.cc
new file mode 100644
index 000000000000..dde65a518ff0
--- /dev/null
+++ b/news/pan/files/patch-pan_gui_score-view-ui.cc
@@ -0,0 +1,15 @@
+--- pan/gui/score-view-ui.cc.orig	2021-08-03 02:28:32 UTC
++++ pan/gui/score-view-ui.cc
+@@ -18,10 +18,8 @@
+  */
+ 
+ #include <config.h>
+-extern "C" {
+-  #include <glib/gi18n.h>
+-  #include "gtk-compat.h"
+-}
++#include <glib/gi18n.h>
++#include "gtk-compat.h"
+ #include <pan/general/debug.h>
+ #include "pad.h"
+ #include "score-add-ui.h"
diff --git a/news/pan/files/patch-pan_gui_server-ui.cc b/news/pan/files/patch-pan_gui_server-ui.cc
new file mode 100644
index 000000000000..e8ea7d59d5ae
--- /dev/null
+++ b/news/pan/files/patch-pan_gui_server-ui.cc
@@ -0,0 +1,17 @@
+--- pan/gui/server-ui.cc.orig	2021-08-03 02:28:55 UTC
++++ pan/gui/server-ui.cc
+@@ -21,11 +21,9 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <climits>
+-extern "C" {
+-  #include <glib.h>
+-  #include <glib/gi18n.h>
+-  #include "gtk-compat.h"
+-}
++#include <glib.h>
++#include <glib/gi18n.h>
++#include "gtk-compat.h"
+ 
+ #include <pan/icons/pan-pixbufs.h>
+ #include <pan/general/file-util.h>
diff --git a/news/pan/files/patch-pan_gui_task-pane.cc b/news/pan/files/patch-pan_gui_task-pane.cc
new file mode 100644
index 000000000000..56e1021d1054
--- /dev/null
+++ b/news/pan/files/patch-pan_gui_task-pane.cc
@@ -0,0 +1,17 @@
+--- pan/gui/task-pane.cc.orig	2021-08-03 02:29:17 UTC
++++ pan/gui/task-pane.cc
+@@ -18,11 +18,9 @@
+  */
+ 
+ #include <config.h>
+-extern "C" {
+-  #include <glib.h>
+-  #include <glib/gi18n.h>
+-  #include "gtk-compat.h"
+-}
++#include <glib.h>
++#include <glib/gi18n.h>
++#include "gtk-compat.h"
+ #include <pan/general/e-util.h>
+ #include <pan/general/debug.h>
+ #include <pan/general/file-util.h>
diff --git a/news/pan/files/patch-pan_tasks_nntp.cc b/news/pan/files/patch-pan_tasks_nntp.cc
new file mode 100644
index 000000000000..e73537518139
--- /dev/null
+++ b/news/pan/files/patch-pan_tasks_nntp.cc
@@ -0,0 +1,15 @@
+--- pan/tasks/nntp.cc.orig	2021-08-03 02:06:18 UTC
++++ pan/tasks/nntp.cc
+@@ -22,10 +22,8 @@
+ #include <cstdarg>
+ #include <cstdlib> // abort, atoi, strtoul
+ #include <cstdio> // snprintf
+-extern "C" {
+-  #include <glib.h>
+-  #include <glib/gi18n.h>
+-}
++#include <glib.h>
++#include <glib/gi18n.h>
+ #include <pan/general/debug.h>
+ #include <pan/general/log.h>
+ #include <pan/general/messages.h>
diff --git a/news/pan/files/patch-pan_tasks_socket-impl-main.cc b/news/pan/files/patch-pan_tasks_socket-impl-main.cc
new file mode 100644
index 000000000000..f7c62379eb79
--- /dev/null
+++ b/news/pan/files/patch-pan_tasks_socket-impl-main.cc
@@ -0,0 +1,14 @@
+--- pan/tasks/socket-impl-main.cc.orig	2021-08-03 02:06:37 UTC
++++ pan/tasks/socket-impl-main.cc
+@@ -30,10 +30,7 @@
+ //#include <glib/giochannel.h>
+ //#include <glib/gstring.h>
+ 
+-extern "C"
+-{
+-  #include <glib.h>
+-}
++#include <glib.h>
+ 
+ #include <pan/tasks/socket.h>
+ 
diff --git a/news/pan/files/patch-pan_tasks_task-groups.cc b/news/pan/files/patch-pan_tasks_task-groups.cc
new file mode 100644
index 000000000000..773e707d5102
--- /dev/null
+++ b/news/pan/files/patch-pan_tasks_task-groups.cc
@@ -0,0 +1,15 @@
+--- pan/tasks/task-groups.cc.orig	2021-08-03 02:04:54 UTC
++++ pan/tasks/task-groups.cc
+@@ -19,10 +19,8 @@
+ 
+ #include <config.h>
+ #include <cassert>
+-extern "C" {
+-  #include <glib/gi18n.h>
+-  #include <stdlib.h>
+-}
++#include <glib/gi18n.h>
++#include <stdlib.h>
+ #include <pan/general/debug.h>
+ #include <pan/general/macros.h>
+ #include <pan/general/messages.h>
diff --git a/news/pan/files/patch-pan_tasks_task-post.cc b/news/pan/files/patch-pan_tasks_task-post.cc
new file mode 100644
index 000000000000..b8be2d176874
--- /dev/null
+++ b/news/pan/files/patch-pan_tasks_task-post.cc
@@ -0,0 +1,13 @@
+--- pan/tasks/task-post.cc.orig	2021-08-03 02:05:17 UTC
++++ pan/tasks/task-post.cc
+@@ -18,9 +18,7 @@
+  */
+ 
+ #include <config.h>
+-extern "C" {
+-  #include <glib/gi18n.h>
+-}
++#include <glib/gi18n.h>
+ #include "task-post.h"
+ #include <pan/general/debug.h>
+ #include <pan/general/log.h>
diff --git a/news/pan/files/patch-pan_tasks_task-xover.cc b/news/pan/files/patch-pan_tasks_task-xover.cc
new file mode 100644
index 000000000000..5435555b6d23
--- /dev/null
+++ b/news/pan/files/patch-pan_tasks_task-xover.cc
@@ -0,0 +1,17 @@
+--- pan/tasks/task-xover.cc.orig	2021-08-03 02:05:38 UTC
++++ pan/tasks/task-xover.cc
+@@ -21,14 +21,11 @@
+ #include <cassert>
+ #include <cerrno>
+ 
+-extern "C"
+-{
+ #define PROTOTYPES
+ #include <stdio.h>
+ #include <uulib/uudeview.h>
+ #include <glib/gi18n.h>
+ #include <gmime/gmime-utils.h>
+-}
+ 
+ #include <fstream>
+ #include <iostream>
diff --git a/news/pan/files/patch-pan_tasks_task-xoverinfo.cc b/news/pan/files/patch-pan_tasks_task-xoverinfo.cc
new file mode 100644
index 000000000000..9c16ca385d82
--- /dev/null
+++ b/news/pan/files/patch-pan_tasks_task-xoverinfo.cc
@@ -0,0 +1,23 @@
+--- pan/tasks/task-xoverinfo.cc.orig	2021-08-03 02:05:57 UTC
++++ pan/tasks/task-xoverinfo.cc
+@@ -20,14 +20,12 @@
+ #include <config.h>
+ #include <cassert>
+ #include <cerrno>
+-extern "C" {
+-  #define PROTOTYPES
+-  #include <stdio.h>
+-  #include <uulib/uudeview.h>
+-  #include <glib/gi18n.h>
+-  #include <gmime/gmime-utils.h>
+-  #include <zlib.h>
+-}
++#define PROTOTYPES
++#include <stdio.h>
++#include <uulib/uudeview.h>
++#include <glib/gi18n.h>
++#include <gmime/gmime-utils.h>
++#include <zlib.h>
+ #include <fstream>
+ #include <iostream>
+ #include <pan/general/debug.h>
diff --git a/news/pan/files/patch-pan_usenet-utils_filter-info.cc b/news/pan/files/patch-pan_usenet-utils_filter-info.cc
new file mode 100644
index 000000000000..b08dd28f7442
--- /dev/null
+++ b/news/pan/files/patch-pan_usenet-utils_filter-info.cc
@@ -0,0 +1,15 @@
+--- pan/usenet-utils/filter-info.cc.orig	2021-08-03 01:59:02 UTC
++++ pan/usenet-utils/filter-info.cc
+@@ -18,10 +18,8 @@
+  */
+ 
+ #include <config.h>
+-extern "C" {
+-  #include <glib.h>
+-  #include <glib/gi18n.h>
+-}
++#include <glib.h>
++#include <glib/gi18n.h>
+ #include <pan/general/macros.h>
+ #include "filter-info.h"
+