Will do. Thanks! — Antoine
> On 29 Dec 2021, at 15:18, [email protected] wrote: > > Hello, > > ok pea@ but please remove me as maintainer. > Thanks. > > > Le 2021-12-28 23:43, Antoine Jacoutot a écrit : >> Hi. >> This diff updatges news/pan to the lastest available release. >> Tested with a few newsgroups and it seems to work fine. >> OK? >> Index: Makefile >> =================================================================== >> RCS file: /cvs/ports/news/pan/Makefile,v >> retrieving revision 1.64 >> diff -u -p -r1.64 Makefile >> --- Makefile 9 May 2021 09:10:17 -0000 1.64 >> +++ Makefile 28 Dec 2021 22:39:01 -0000 >> @@ -2,39 +2,40 @@ >> COMMENT= powerful newsreader >> -V= 0.140 >> +V= 0.149 >> DISTNAME= pan-${V} >> CATEGORIES= news x11 >> -REVISION= 7 >> HOMEPAGE= http://pan.rebelbase.com/ >> MAINTAINER= Pierre-Emmanuel Andre <[email protected]> >> -# GPLv2 >> +# GPLv2 - GFDLv1.1 >> PERMIT_PACKAGE= Yes >> -WANTLIB += ${COMPILER_LIBCXX} atk-1.0 c cairo cairo-gobject enchant >> -WANTLIB += enchant-2 gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmime-2.6 >> -WANTLIB += gmodule-2.0 gnome-keyring gnutls gobject-2.0 gthread-2.0 >> -WANTLIB += gtk-3 gtkspell3-3 harfbuzz iconv intl m notify pango-1.0 >> -WANTLIB += pangocairo-1.0 z >> +WANTLIB += ${COMPILER_LIBCXX} atk-1.0 c cairo cairo-gobject enchant-2 >> +WANTLIB += gck-1 gcr-base-3 gcr-ui-3 gdk-3 gdk_pixbuf-2.0 gio-2.0 >> +WANTLIB += glib-2.0 gmime-3.0 gmodule-2.0 gnutls gobject-2.0 gthread-2.0 >> +WANTLIB += gtk-3 gtkspell3-3 harfbuzz iconv intl m notify p11-kit >> +WANTLIB += pango-1.0 pangocairo-1.0 secret-1 z >> -COMPILER = base-clang ports-gcc base-gcc >> +COMPILER= base-clang ports-gcc base-gcc >> USE_GMAKE= Yes >> MASTER_SITES= http://pan.rebelbase.com/download/releases/${V}/source/ >> -MODULES= textproc/intltool >> +BUILD_DEPENDS= devel/gettext,-tools \ >> + textproc/itstool >> LIB_DEPENDS= devel/libnotify \ >> - mail/gmime \ >> + mail/gmime30 \ >> security/gnutls \ >> - textproc/enchant \ >> textproc/gtkspell3 \ >> - x11/gnome/libgnome-keyring >> -RUN_DEPENDS= devel/desktop-file-utils >> + x11/gnome/gcr >> + >> +RUN_DEPENDS= devel/desktop-file-utils \ >> + x11/gtk+3,-guic >> CONFIGURE_STYLE=gnu >> @@ -42,6 +43,9 @@ CONFIGURE_STYLE=gnu >> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include >> -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26" \ >> LDFLAGS="-L${LOCALBASE}/lib -liconv" >> -CONFIGURE_ARGS= --with-gtk3 --enable-libnotify --enable-gkr --with-gnutls >> +CONFIGURE_ARGS= --with-gtk3 \ >> + --enable-libnotify \ >> + --enable-gkr \ >> + --with-gnutls >> .include <bsd.port.mk> >> Index: distinfo >> =================================================================== >> RCS file: /cvs/ports/news/pan/distinfo,v >> retrieving revision 1.21 >> diff -u -p -r1.21 distinfo >> --- distinfo 20 Apr 2016 07:20:34 -0000 1.21 >> +++ distinfo 28 Dec 2021 22:39:01 -0000 >> @@ -1,2 +1,2 @@ >> -SHA256 (pan-0.140.tar.gz) = XNcElj0Y1V5oG7Hz23CCbJQ2ybfDxpyoIn4ENrs1+Sg= >> -SIZE (pan-0.140.tar.gz) = 2338609 >> +SHA256 (pan-0.149.tar.gz) = JEUlISW8VtAi3aEjat+AroUnS0HlACxWZ7DgMnJbMrc= >> +SIZE (pan-0.149.tar.gz) = 3339054 >> Index: patches/patch-pan_data-impl_article-filter_cc >> =================================================================== >> RCS file: patches/patch-pan_data-impl_article-filter_cc >> diff -N patches/patch-pan_data-impl_article-filter_cc >> --- patches/patch-pan_data-impl_article-filter_cc 12 Apr 2018 18:10:27 >> -0000 1.1 >> +++ /dev/null 1 Jan 1970 00:00:00 -0000 >> @@ -1,16 +0,0 @@ >> -$OpenBSD: patch-pan_data-impl_article-filter_cc,v 1.1 2018/04/12 >> 18:10:27 jasper Exp $ >> - >> -https://svnweb.freebsd.org/ports/head/news/pan/files/patch-c%2B%2B11?revision=458276&view=markup >> - >> -Index: pan/data-impl/article-filter.cc >> ---- pan/data-impl/article-filter.cc.orig >> -+++ pan/data-impl/article-filter.cc >> -@@ -162,7 +162,7 @@ ArticleFilter :: test_article (const Data & dat >> - s += xit->group; >> - s += ':'; >> - char buf[32]; >> -- g_snprintf (buf, sizeof(buf), "%"G_GUINT64_FORMAT, >> xit->number); >> -+ g_snprintf (buf, sizeof(buf), "%" G_GUINT64_FORMAT, >> xit->number); >> - s += buf; >> - s += ' '; >> - } >> Index: patches/patch-pan_general_string-view_h >> =================================================================== >> RCS file: /cvs/ports/news/pan/patches/patch-pan_general_string-view_h,v >> retrieving revision 1.1 >> diff -u -p -r1.1 patch-pan_general_string-view_h >> --- patches/patch-pan_general_string-view_h 12 Apr 2018 18:10:27 -0000 >> 1.1 >> +++ patches/patch-pan_general_string-view_h 28 Dec 2021 22:39:01 -0000 >> @@ -1,6 +1,6 @@ >> -$OpenBSD: patch-pan_general_string-view_h,v 1.1 2018/04/12 18:10:27 >> jasper Exp $ >> +$OpenBSD$ >> -https://svnweb.freebsd.org/ports/head/news/pan/files/patch-c%2B%2B11?revision=458276&view=markup >> +text-match.cc:475:8: error: no viable conversion from >> 'pan::StringView' to 'std::string' >> Index: pan/general/string-view.h >> --- pan/general/string-view.h.orig >> Index: patches/patch-pan_gui_gui_cc >> =================================================================== >> RCS file: patches/patch-pan_gui_gui_cc >> diff -N patches/patch-pan_gui_gui_cc >> --- patches/patch-pan_gui_gui_cc 20 Apr 2016 07:20:34 -0000 1.4 >> +++ /dev/null 1 Jan 1970 00:00:00 -0000 >> @@ -1,15 +0,0 @@ >> -$OpenBSD: patch-pan_gui_gui_cc,v 1.4 2016/04/20 07:20:34 pea Exp $ >> - >> -Fix compiling on 64-bit. >> - >> ---- pan/gui/gui.cc.orig Mon Apr 18 18:16:20 2016 >> -+++ pan/gui/gui.cc Mon Apr 18 18:16:36 2016 >> -@@ -2275,7 +2275,7 @@ GUI :: set_queue_size_label (unsigned int running, >> - uint64_t KiB_remain; >> - #else >> - gulong queued, unused, stopped; >> -- guint64 KiB_remain; >> -+ uint64_t KiB_remain; >> - #endif >> - double KiBps; >> - int hr, min, sec; >> Index: patches/patch-pan_tasks_nntp_cc >> =================================================================== >> RCS file: patches/patch-pan_tasks_nntp_cc >> diff -N patches/patch-pan_tasks_nntp_cc >> --- patches/patch-pan_tasks_nntp_cc 12 Apr 2018 18:10:27 -0000 1.1 >> +++ /dev/null 1 Jan 1970 00:00:00 -0000 >> @@ -1,52 +0,0 @@ >> -$OpenBSD: patch-pan_tasks_nntp_cc,v 1.1 2018/04/12 18:10:27 jasper Exp $ >> - >> -https://svnweb.freebsd.org/ports/head/news/pan/files/patch-c%2B%2B11?revision=458276&view=markup >> - >> -Index: pan/tasks/nntp.cc >> ---- pan/tasks/nntp.cc.orig >> -+++ pan/tasks/nntp.cc >> -@@ -355,7 +355,7 @@ NNTP :: xover (const Quark & group, >> - _listener = l; >> - >> - enter_group(group); >> -- _commands.push_back (build_command ("XOVER >> %"G_GUINT64_FORMAT"-%"G_GUINT64_FORMAT"\r\n", low, high)); >> -+ _commands.push_back (build_command ("XOVER %" G_GUINT64_FORMAT >> "-%" G_GUINT64_FORMAT "\r\n", low, high)); >> - write_next_command (); >> - } >> - >> -@@ -368,7 +368,7 @@ NNTP :: xzver (const Quark & group, >> - _listener = l; >> - >> - enter_group(group); >> -- _commands.push_back (build_command ("XZVER >> %"G_GUINT64_FORMAT"-%"G_GUINT64_FORMAT"\r\n", low, high)); >> -+ _commands.push_back (build_command ("XZVER %" G_GUINT64_FORMAT >> "-%" G_GUINT64_FORMAT "\r\n", low, high)); >> - write_next_command (); >> - } >> - >> -@@ -409,7 +409,7 @@ NNTP :: article (const Quark & group, >> - >> - enter_group(group); >> - >> -- _commands.push_back (build_command ("ARTICLE >> %"G_GUINT64_FORMAT"\r\n", article_number)); >> -+ _commands.push_back (build_command ("ARTICLE %" G_GUINT64_FORMAT >> "\r\n", article_number)); >> - >> - write_next_command (); >> - } >> -@@ -451,7 +451,7 @@ NNTP :: get_headers (const Quark & group, >> - >> - enter_group(group); >> - >> -- _commands.push_back (build_command ("HEAD >> %"G_GUINT64_FORMAT"\r\n", article_number)); >> -+ _commands.push_back (build_command ("HEAD %" G_GUINT64_FORMAT >> "\r\n", article_number)); >> - >> - write_next_command (); >> - } >> -@@ -479,7 +479,7 @@ NNTP :: get_body (const Quark & group, >> - >> - enter_group(group); >> - >> -- _commands.push_back (build_command ("BODY >> %"G_GUINT64_FORMAT"\r\n", article_number)); >> -+ _commands.push_back (build_command ("BODY %" G_GUINT64_FORMAT >> "\r\n", article_number)); >> - >> - write_next_command (); >> - } >> Index: patches/patch-pan_tasks_task-xover_cc >> =================================================================== >> RCS file: patches/patch-pan_tasks_task-xover_cc >> diff -N patches/patch-pan_tasks_task-xover_cc >> --- patches/patch-pan_tasks_task-xover_cc 12 Apr 2018 18:10:27 -0000 >> 1.1 >> +++ /dev/null 1 Jan 1970 00:00:00 -0000 >> @@ -1,16 +0,0 @@ >> -$OpenBSD: patch-pan_tasks_task-xover_cc,v 1.1 2018/04/12 18:10:27 jasper >> Exp $ >> - >> -https://svnweb.freebsd.org/ports/head/news/pan/files/patch-c%2B%2B11?revision=458276&view=markup >> - >> -Index: pan/tasks/task-xover.cc >> ---- pan/tasks/task-xover.cc.orig >> -+++ pan/tasks/task-xover.cc >> -@@ -391,7 +391,7 @@ TaskXOver::on_nntp_line_process(NNTP * nntp, const Str >> - // if news server doesn't provide an xref, fake one >> - char * buf(0); >> - if (xref.empty()) >> -- xref = buf = g_strdup_printf("%s %s:%"G_GUINT64_FORMAT, >> -+ xref = buf = g_strdup_printf("%s %s:%" G_GUINT64_FORMAT, >> - nntp->_server.c_str(), nntp->_group.c_str(), number); >> - >> - uint64_t& h(_high[nntp->_server]); >> Index: patches/patch-pan_usenet-utils_numbers_cc >> =================================================================== >> RCS file: patches/patch-pan_usenet-utils_numbers_cc >> diff -N patches/patch-pan_usenet-utils_numbers_cc >> --- patches/patch-pan_usenet-utils_numbers_cc 12 Apr 2018 18:10:27 -0000 >> 1.1 >> +++ /dev/null 1 Jan 1970 00:00:00 -0000 >> @@ -1,19 +0,0 @@ >> -$OpenBSD: patch-pan_usenet-utils_numbers_cc,v 1.1 2018/04/12 18:10:27 >> jasper Exp $ >> - >> -https://svnweb.freebsd.org/ports/head/news/pan/files/patch-c%2B%2B11?revision=458276&view=markup >> - >> -Index: pan/usenet-utils/numbers.cc >> ---- pan/usenet-utils/numbers.cc.orig >> -+++ pan/usenet-utils/numbers.cc >> -@@ -267,9 +267,9 @@ Numbers :: to_string (std::string & str) const >> - Range r (*it); >> - >> - if (r.low == r.high) >> -- bytes = g_snprintf (buf, sizeof(buf), "%"G_GUINT64_FORMAT",", >> r.low); >> -+ bytes = g_snprintf (buf, sizeof(buf), "%" G_GUINT64_FORMAT >> ",", r.low); >> - else >> -- bytes = g_snprintf (buf, sizeof(buf), >> "%"G_GUINT64_FORMAT"-%"G_GUINT64_FORMAT",", r.low, r.high); >> -+ bytes = g_snprintf (buf, sizeof(buf), "%" G_GUINT64_FORMAT >> "-%" G_GUINT64_FORMAT ",", r.low, r.high); >> - temp.append(buf, bytes); >> - } >> - >> Index: pkg/PLIST >> =================================================================== >> RCS file: /cvs/ports/news/pan/pkg/PLIST,v >> retrieving revision 1.15 >> diff -u -p -r1.15 PLIST >> --- pkg/PLIST 27 Jun 2018 21:04:01 -0000 1.15 >> +++ pkg/PLIST 28 Dec 2021 22:39:01 -0000 >> @@ -1,8 +1,12 @@ >> @comment $OpenBSD: PLIST,v 1.15 2018/06/27 21:04:01 espie Exp $ >> @bin bin/pan >> -share/appdata/ >> -share/appdata/pan.appdata.xml >> -share/applications/pan.desktop >> +@man man/man1/pan.1 >> +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/locale/am/LC_MESSAGES/pan.mo >> share/locale/ar/LC_MESSAGES/pan.mo >> share/locale/az/LC_MESSAGES/pan.mo >> @@ -26,6 +30,7 @@ share/locale/ga/LC_MESSAGES/pan.mo >> share/locale/gl/LC_MESSAGES/pan.mo >> share/locale/hr/LC_MESSAGES/pan.mo >> share/locale/hu/LC_MESSAGES/pan.mo >> +share/locale/id/LC_MESSAGES/pan.mo >> share/locale/it/LC_MESSAGES/pan.mo >> share/locale/ja/LC_MESSAGES/pan.mo >> share/locale/ko/LC_MESSAGES/pan.mo >> @@ -35,6 +40,7 @@ share/locale/ms/LC_MESSAGES/pan.mo >> share/locale/nb/LC_MESSAGES/pan.mo >> share/locale/nl/LC_MESSAGES/pan.mo >> share/locale/oc/LC_MESSAGES/pan.mo >> +share/locale/pl/LC_MESSAGES/pan.mo >> share/locale/pt/LC_MESSAGES/pan.mo >> share/locale/pt_BR/LC_MESSAGES/pan.mo >> share/locale/ro/LC_MESSAGES/pan.mo >> @@ -50,6 +56,7 @@ share/locale/uk/LC_MESSAGES/pan.mo >> share/locale/vi/LC_MESSAGES/pan.mo >> share/locale/zh_CN/LC_MESSAGES/pan.mo >> share/locale/zh_TW/LC_MESSAGES/pan.mo >> -share/pixmaps/ >> -share/pixmaps/pan.png >> +share/metainfo/ >> +share/metainfo/org.gnome.pan.metainfo.xml >> @tag update-desktop-database >> +@tag gtk-update-icon-cache %D/share/icons/hicolor >
