summaryrefslogtreecommitdiff
path: root/news/pan
diff options
context:
space:
mode:
Diffstat (limited to 'news/pan')
-rw-r--r--news/pan/Makefile79
-rw-r--r--news/pan/distinfo6
-rw-r--r--news/pan/files/patch-pan_data-impl_data-impl.cc15
-rw-r--r--news/pan/files/patch-pan_data_article-cache.cc29
-rw-r--r--news/pan/files/patch-pan_general_file-util.cc28
-rw-r--r--news/pan/files/patch-pan_general_line-reader.cc13
-rw-r--r--news/pan/files/patch-pan_general_text-match.cc17
-rw-r--r--news/pan/files/patch-pan_gui_actions.cc15
-rw-r--r--news/pan/files/patch-pan_gui_dl-headers-ui.cc17
-rw-r--r--news/pan/files/patch-pan_gui_group-prefs-dialog.cc21
-rw-r--r--news/pan/files/patch-pan_gui_group-prefs.cc19
-rw-r--r--news/pan/files/patch-pan_gui_header-pane.cc19
-rw-r--r--news/pan/files/patch-pan_gui_prefs-ui.cc15
-rw-r--r--news/pan/files/patch-pan_gui_progress-view.cc13
-rw-r--r--news/pan/files/patch-pan_gui_save-attach-ui.cc15
-rw-r--r--news/pan/files/patch-pan_gui_save-ui.cc15
-rw-r--r--news/pan/files/patch-pan_gui_score-add-ui.cc13
-rw-r--r--news/pan/files/patch-pan_gui_score-view-ui.cc15
-rw-r--r--news/pan/files/patch-pan_gui_server-ui.cc17
-rw-r--r--news/pan/files/patch-pan_gui_task-pane.cc17
-rw-r--r--news/pan/files/patch-pan_tasks_nntp.cc15
-rw-r--r--news/pan/files/patch-pan_tasks_socket-impl-main.cc14
-rw-r--r--news/pan/files/patch-pan_tasks_task-groups.cc15
-rw-r--r--news/pan/files/patch-pan_tasks_task-post.cc13
-rw-r--r--news/pan/files/patch-pan_tasks_task-xover.cc17
-rw-r--r--news/pan/files/patch-pan_tasks_task-xoverinfo.cc23
-rw-r--r--news/pan/files/patch-pan_usenet-utils_filter-info.cc15
-rw-r--r--news/pan/pkg-plist101
28 files changed, 138 insertions, 473 deletions
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 7a640068ea7d..02e73c3be84f 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,56 +1,61 @@
PORTNAME= pan
-PORTVERSION= 0.145
-PORTREVISION= 3
+DISTVERSIONPREFIX= v
+DISTVERSION= 0.164
CATEGORIES= news gnome
-MASTER_SITES= http://pan.rebelbase.com/download/releases/${PORTVERSION}/source/
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Threaded GTK newsreader based on Agent for Windows
-WWW= https://pan.rebelbase.com/
+WWW= https://gitlab.gnome.org/GNOME/pan/-/blob/master/README.org
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= itstool:textproc/itstool
-LIB_DEPENDS= libpcre.so:devel/pcre \
- libenchant.so:textproc/enchant \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2 \
- libgmime-2.6.so:mail/gmime26
+LIB_DEPENDS= libgmime-3.0.so:mail/gmime30 \
+ libenchant-2.so:textproc/enchant2 \
+ libp11-kit.so:security/p11-kit
-USES= compiler:c++11-lang desktop-file-utils gettext-tools:build \
- gmake gnome iconv localbase pathfix pkgconfig tar:bzip2
-USE_CXXSTD= c++14
-USE_GNOME= cairo gdkpixbuf intlhack
+USES= cmake compiler:c++17-lang desktop-file-utils gettext-tools:build \
+ gnome iconv pkgconfig tar:bzip2
+USE_GNOME= gtk30
-GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+USE_GITLAB= yes
+GL_SITE= https://gitlab.gnome.org
+GL_ACCOUNT= GNOME
-LDFLAGS+= ${ICONV_LIB}
+CMAKE_ON= WANT_GMIME_CRYPTO
-OPTIONS_DEFINE= GTKSPELL GNUTLS NLS
-OPTIONS_DEFAULT= GTKSPELL GNUTLS GTK2
-OPTIONS_RADIO= GTK
-OPTIONS_RADIO_GTK= GTK2 GTK3
+OPTIONS_DEFINE= DBUS DOCS GNOME_KEYRING GNUTLS GSPELL NLS \
+ NOTIFY WEBKITGTK
+OPTIONS_DEFAULT= DBUS GNOME_KEYRING GNUTLS GSPELL NOTIFY
OPTIONS_SUB= yes
-GTKSPELL_DESC= Spell checking support (gtk+2 only)
+DBUS_DESC= DBus support
+GNOME_KEYRING_DESC= Credential storage via libsecret
+GSPELL_DESC= Spellcheck via GSpell
+NOTIFY_DESC= Notification support
+WEBKITGTK_DESC= WebKitGTK support (experimental, broken)
+DBUS_CMAKE_BOOL= WANT_DBUS
+DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
+
+DOCS_CMAKE_BOOL= ENABLE_MANUAL
+DOCS_BUILD_DEPENDS= itstool:textproc/itstool
+
+GNOME_KEYRING_CMAKE_BOOL= WANT_GKR
+GNOME_KEYRING_LIB_DEPENDS= libsecret-1.so:security/libsecret \
+ libgcr-base-3.so:security/gcr3
+
+GNUTLS_CMAKE_BOOL= WANT_GNUTLS
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
-GNUTLS_CONFIGURE_WITH= gnutls
-GTK2_USE= gnome=gtk20
-GTK3_PREVENTS= GTKSPELL
-GTK3_USE= gnome=gtk30
-GTK3_CONFIGURE_WITH= gtk3
-GTKSPELL_LIB_DEPENDS= libgtkspell.so:textproc/gtkspell
-GTKSPELL_CONFIGURE_WITH=gtkspell
-NLS_USES= gettext-runtime
-NLS_CONFIGURE_ENABLE= nls
-
-post-patch:
- ${REINPLACE_CMD} -e 's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g' \
- ${WRKSRC}/Makefile.in
- ${REINPLACE_CMD} -e '98s|const std|std|' ${WRKSRC}/pan/general/string-view.h
+
+GSPELL_CMAKE_BOOL= WANT_GSPELL
+GSPELL_LIB_DEPENDS= libgspell-1.so:textproc/gspell
+
+NOTIFY_CMAKE_BOOL= WANT_NOTIFY
+NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
+
+WEBKITGTK_CMAKE_BOOL= WANT_WEBKIT
+WEBKITGTK_LIB_DEPENDS= libwebkitgtk-6.0.so:www/webkit2-gtk
.include <bsd.port.mk>
diff --git a/news/pan/distinfo b/news/pan/distinfo
index 815d9b184a64..ceae58970733 100644
--- a/news/pan/distinfo
+++ b/news/pan/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1537582598
-SHA256 (gnome2/pan-0.145.tar.bz2) = 68da514a8088513502b418859a7df7638866f75d03a429197cf9c23176559cac
-SIZE (gnome2/pan-0.145.tar.bz2) = 2307162
+TIMESTAMP = 1761174170
+SHA256 (gnome/pan-v0.164.tar.bz2) = 862609baaabbc516fe23fd9f62ae54f1a6b6481178913f3c5a6f4597d0c39244
+SIZE (gnome/pan-v0.164.tar.bz2) = 2051642
diff --git a/news/pan/files/patch-pan_data-impl_data-impl.cc b/news/pan/files/patch-pan_data-impl_data-impl.cc
deleted file mode 100644
index ad15106bb61c..000000000000
--- a/news/pan/files/patch-pan_data-impl_data-impl.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index dea9b7ac7676..000000000000
--- a/news/pan/files/patch-pan_data_article-cache.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
deleted file mode 100644
index 75d30c1a8c79..000000000000
--- a/news/pan/files/patch-pan_general_file-util.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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
deleted file mode 100644
index 57a550882912..000000000000
--- a/news/pan/files/patch-pan_general_line-reader.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index a533840cc1d1..000000000000
--- a/news/pan/files/patch-pan_general_text-match.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
deleted file mode 100644
index dd1dd31f3d8c..000000000000
--- a/news/pan/files/patch-pan_gui_actions.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index f085bd0ca825..000000000000
--- a/news/pan/files/patch-pan_gui_dl-headers-ui.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
deleted file mode 100644
index 0e9ca47316b9..000000000000
--- a/news/pan/files/patch-pan_gui_group-prefs-dialog.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
deleted file mode 100644
index 21d27e88fe70..000000000000
--- a/news/pan/files/patch-pan_gui_group-prefs.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
deleted file mode 100644
index d1beb3a3a38c..000000000000
--- a/news/pan/files/patch-pan_gui_header-pane.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
deleted file mode 100644
index 5cf486b6a873..000000000000
--- a/news/pan/files/patch-pan_gui_prefs-ui.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index 5743559db89a..000000000000
--- a/news/pan/files/patch-pan_gui_progress-view.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index e6eab18c14f5..000000000000
--- a/news/pan/files/patch-pan_gui_save-attach-ui.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index 77ccb14de983..000000000000
--- a/news/pan/files/patch-pan_gui_save-ui.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index cd5020cd2a14..000000000000
--- a/news/pan/files/patch-pan_gui_score-add-ui.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index dde65a518ff0..000000000000
--- a/news/pan/files/patch-pan_gui_score-view-ui.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index e8ea7d59d5ae..000000000000
--- a/news/pan/files/patch-pan_gui_server-ui.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
deleted file mode 100644
index 56e1021d1054..000000000000
--- a/news/pan/files/patch-pan_gui_task-pane.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
deleted file mode 100644
index e73537518139..000000000000
--- a/news/pan/files/patch-pan_tasks_nntp.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index f7c62379eb79..000000000000
--- a/news/pan/files/patch-pan_tasks_socket-impl-main.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index 773e707d5102..000000000000
--- a/news/pan/files/patch-pan_tasks_task-groups.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index b8be2d176874..000000000000
--- a/news/pan/files/patch-pan_tasks_task-post.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index 5435555b6d23..000000000000
--- a/news/pan/files/patch-pan_tasks_task-xover.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
deleted file mode 100644
index 9c16ca385d82..000000000000
--- a/news/pan/files/patch-pan_tasks_task-xoverinfo.cc
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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
deleted file mode 100644
index b08dd28f7442..000000000000
--- a/news/pan/files/patch-pan_usenet-utils_filter-info.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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"
-
diff --git a/news/pan/pkg-plist b/news/pan/pkg-plist
index 5ab857e150cb..4d58ca62beff 100644
--- a/news/pan/pkg-plist
+++ b/news/pan/pkg-plist
@@ -1,12 +1,13 @@
bin/pan
share/man/man1/pan.1.gz
-share/applications/pan.desktop
-share/appdata/pan.appdata.xml
-share/icons/hicolor/16x16/apps/pan.png
-share/icons/hicolor/24x24/apps/pan.png
-share/icons/hicolor/256x256/apps/pan.png
-share/icons/hicolor/32x32/apps/pan.png
-share/icons/hicolor/48x48/apps/pan.png
+share/applications/org.gnome.pan.desktop
+share/icons/hicolor/16x16/apps/org.gnome.pan.png
+share/icons/hicolor/24x24/apps/org.gnome.pan.png
+share/icons/hicolor/256x256/apps/org.gnome.pan.png
+share/icons/hicolor/32x32/apps/org.gnome.pan.png
+share/icons/hicolor/48x48/apps/org.gnome.pan.png
+share/metainfo/org.gnome.pan.metainfo.xml
+share/dbus-1/services/org.gnome.pan.service
%%NLS%%share/locale/am/LC_MESSAGES/pan.mo
%%NLS%%share/locale/ar/LC_MESSAGES/pan.mo
%%NLS%%share/locale/az/LC_MESSAGES/pan.mo
@@ -21,17 +22,20 @@ share/icons/hicolor/48x48/apps/pan.png
%%NLS%%share/locale/en_CA/LC_MESSAGES/pan.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/pan.mo
%%NLS%%share/locale/eo/LC_MESSAGES/pan.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/pan.mo
%%NLS%%share/locale/es/LC_MESSAGES/pan.mo
%%NLS%%share/locale/et/LC_MESSAGES/pan.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/pan.mo
%%NLS%%share/locale/fi/LC_MESSAGES/pan.mo
%%NLS%%share/locale/fr/LC_MESSAGES/pan.mo
%%NLS%%share/locale/ga/LC_MESSAGES/pan.mo
%%NLS%%share/locale/gl/LC_MESSAGES/pan.mo
%%NLS%%share/locale/hr/LC_MESSAGES/pan.mo
%%NLS%%share/locale/hu/LC_MESSAGES/pan.mo
+%%NLS%%share/locale/id/LC_MESSAGES/pan.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/pan.mo
%%NLS%%share/locale/it/LC_MESSAGES/pan.mo
%%NLS%%share/locale/ja/LC_MESSAGES/pan.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pan.mo
%%NLS%%share/locale/ko/LC_MESSAGES/pan.mo
%%NLS%%share/locale/lt/LC_MESSAGES/pan.mo
%%NLS%%share/locale/lv/LC_MESSAGES/pan.mo
@@ -55,3 +59,84 @@ share/icons/hicolor/48x48/apps/pan.png
%%NLS%%share/locale/vi/LC_MESSAGES/pan.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/pan.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/pan.mo
+%%DATADIR%%/icons/icon_article_read.png
+%%DATADIR%%/icons/icon_article_unread.png
+%%DATADIR%%/icons/icon_binary_complete.png
+%%DATADIR%%/icons/icon_binary_complete_read.png
+%%DATADIR%%/icons/icon_binary_incomplete.png
+%%DATADIR%%/icons/icon_binary_incomplete_read.png
+%%DATADIR%%/icons/icon_bluecheck.png
+%%DATADIR%%/icons/icon_by_me.png
+%%DATADIR%%/icons/icon_by_others.png
+%%DATADIR%%/icons/icon_cert.png
+%%DATADIR%%/icons/icon_collapse_thread.png
+%%DATADIR%%/icons/icon_compose_followup.png
+%%DATADIR%%/icons/icon_compose_post.png
+%%DATADIR%%/icons/icon_disk.png
+%%DATADIR%%/icons/icon_empty.png
+%%DATADIR%%/icons/icon_expand_thread.png
+%%DATADIR%%/icons/icon_filter.png
+%%DATADIR%%/icons/icon_filter_only_attachments.png
+%%DATADIR%%/icons/icon_filter_only_cached.png
+%%DATADIR%%/icons/icon_filter_only_me.png
+%%DATADIR%%/icons/icon_filter_only_read.png
+%%DATADIR%%/icons/icon_filter_only_unread.png
+%%DATADIR%%/icons/icon_filter_only_watched.png
+%%DATADIR%%/icons/icon_get_dialog.png
+%%DATADIR%%/icons/icon_get_flagged.png
+%%DATADIR%%/icons/icon_get_selected.png
+%%DATADIR%%/icons/icon_get_subscribed.png
+%%DATADIR%%/icons/icon_layout_1.png
+%%DATADIR%%/icons/icon_layout_2.png
+%%DATADIR%%/icons/icon_layout_3.png
+%%DATADIR%%/icons/icon_layout_4.png
+%%DATADIR%%/icons/icon_layout_5.png
+%%DATADIR%%/icons/icon_mozilla_frown.png
+%%DATADIR%%/icons/icon_mozilla_smile.png
+%%DATADIR%%/icons/icon_mozilla_surprised.png
+%%DATADIR%%/icons/icon_mozilla_tongueout.png
+%%DATADIR%%/icons/icon_mozilla_wink.png
+%%DATADIR%%/icons/icon_pan.png
+%%DATADIR%%/icons/icon_pan_about_logo.png
+%%DATADIR%%/icons/icon_plain.png
+%%DATADIR%%/icons/icon_prefs_actions.png
+%%DATADIR%%/icons/icon_prefs_applications.png
+%%DATADIR%%/icons/icon_prefs_behavior.png
+%%DATADIR%%/icons/icon_prefs_colors.png
+%%DATADIR%%/icons/icon_prefs_extras.png
+%%DATADIR%%/icons/icon_prefs_fonts.png
+%%DATADIR%%/icons/icon_prefs_headers.png
+%%DATADIR%%/icons/icon_prefs_hotkeys.png
+%%DATADIR%%/icons/icon_prefs_layout.png
+%%DATADIR%%/icons/icon_prefs_panes.png
+%%DATADIR%%/icons/icon_prefs_upload.png
+%%DATADIR%%/icons/icon_read_group.png
+%%DATADIR%%/icons/icon_read_less.png
+%%DATADIR%%/icons/icon_read_more.png
+%%DATADIR%%/icons/icon_read_unread_article.png
+%%DATADIR%%/icons/icon_read_unread_thread.png
+%%DATADIR%%/icons/icon_red_flag.png
+%%DATADIR%%/icons/icon_score.png
+%%DATADIR%%/icons/icon_search_pulldown.png
+%%DATADIR%%/icons/icon_show_signature.png
+%%DATADIR%%/icons/icon_sig_fail.png
+%%DATADIR%%/icons/icon_sig_ok.png
+%%DATADIR%%/icons/icon_status_active.png
+%%DATADIR%%/icons/icon_status_error.png
+%%DATADIR%%/icons/icon_status_idle.png
+%%DATADIR%%/icons/icon_status_new_articles.png
+%%DATADIR%%/icons/icon_status_offline.png
+%%DATADIR%%/icons/icon_status_online.png
+%%DATADIR%%/icons/icon_status_queue_empty.png
+%%DATADIR%%/icons/icon_x.png
+%%DOCS%%share/help/C/pan/figures/pan_window.png
+%%DOCS%%share/help/C/pan/index.docbook
+%%DOCS%%share/help/C/pan/legal.xml
+%%DOCS%%share/help/cs/pan/figures/pan_window.png
+%%DOCS%%share/help/cs/pan/index.docbook
+%%DOCS%%share/help/de/pan/figures/pan_window.png
+%%DOCS%%share/help/de/pan/index.docbook
+%%DOCS%%share/help/es/pan/figures/pan_window.png
+%%DOCS%%share/help/es/pan/index.docbook
+%%DOCS%%share/help/sv/pan/figures/pan_window.png
+%%DOCS%%share/help/sv/pan/index.docbook