On Thu 02/01/2020 07:31, Björn Ketelaars wrote: > Enclosed diff brings hexchat to 2.14.3, which is a maintenance release. > Changelog: https://hexchat.readthedocs.io/en/latest/changelog.html > > Changes to port: > - Drop patch which has been addressed upstream > - sync PLIST > > Lightly tested on amd64 > > Comments/OK?
Ping.. Diff enclosed for your convenience. diff --git Makefile Makefile index 8f77d857e50..8e065b8e8ce 100644 --- Makefile +++ Makefile @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.27 2019/10/23 05:06:11 bket Exp $ COMMENT = GTK+2 IRC Client -DISTNAME = hexchat-2.14.2 +DISTNAME = hexchat-2.14.3 EXTRACT_SUFX = .tar.xz CATEGORIES = net x11 diff --git distinfo distinfo index 88f02c3cc50..9dcbf475ec2 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (hexchat-2.14.2.tar.xz) = d5K55SVg+9PhDXW/tdE4ogkTqHdx1nbSllR/G0rAlhg= -SIZE (hexchat-2.14.2.tar.xz) = 1288732 +SHA256 (hexchat-2.14.3.tar.xz) = kBqdE9taTaabgn9gkzBrvRaGPcSQFvdmi9PkUGUS6II= +SIZE (hexchat-2.14.3.tar.xz) = 1292072 diff --git patches/patch-src_common_meson_build patches/patch-src_common_meson_build deleted file mode 100644 index 86c20ee93e5..00000000000 --- patches/patch-src_common_meson_build +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_common_meson_build,v 1.1 2019/10/23 05:06:11 bket Exp $ - -Ensure that generated headers are built before anything else, from: -https://github.com/hexchat/hexchat/commit/92014628d1cc06334a9ca8c91a7184d50f5ab9a0 - -Index: src/common/meson.build ---- src/common/meson.build.orig -+++ src/common/meson.build -@@ -109,6 +109,7 @@ hexchat_common = static_library('hexchatcommon', - ) - - hexchat_common_dep = declare_dependency( -+ sources: [textevents] + marshal, - link_with: hexchat_common, - include_directories: common_includes, - compile_args: common_cflags, diff --git pkg/PLIST pkg/PLIST index ff1668bb67c..66e66606572 100644 --- pkg/PLIST +++ pkg/PLIST @@ -4,15 +4,15 @@ include/hexchat-plugin.h lib/hexchat/ lib/hexchat/plugins/ @comment lib/hexchat/plugins/checksum.la -lib/hexchat/plugins/checksum.so +@so lib/hexchat/plugins/checksum.so @comment lib/hexchat/plugins/fishlim.la -lib/hexchat/plugins/fishlim.so +@so lib/hexchat/plugins/fishlim.so @comment lib/hexchat/plugins/lua.la -lib/hexchat/plugins/lua.so +@so lib/hexchat/plugins/lua.so @comment lib/hexchat/plugins/perl.la -lib/hexchat/plugins/perl.so +@so lib/hexchat/plugins/perl.so @comment lib/hexchat/plugins/python.la -lib/hexchat/plugins/python.so +@so lib/hexchat/plugins/python.so lib/pkgconfig/hexchat-plugin.pc @man man/man1/hexchat.1 share/applications/io.github.Hexchat.desktop