On Wed, 16 Oct 2019 22:46:20 +0100 Stuart Henderson wrote:
> eyeballed only; [...] > the "@comment ... doat.la" above should go as well. [...] > It probably doesn't really matter, but @tag is usually added > right at the end of the plist so it probably makes sense to > maintain that. > I tried on macppc first (the full log is here [0]), adding sthen's recommendations. Then i came across the following error: --8<-- error: textenums.h: No such file or directory -->8-- It appears that there is some "race condition" in the project's meson.build, that can be more difficultly reproduced on amd64 with MAKE_JOBS=1. Upstream had a fix [1], so i added it. After that i met some undefined references. libproxy wants libestdc++, so i've brought back COMPILER with ports-gcc in it, and it built. The runtime is fine on amd64 and macppc. I've tested basic lua, python and perl scripts from hexchat's repo without issues on these platforms. Obviously, that diff is OK cwen@ Charlène. [0] https://bin.charlenew.xyz/hexchat.log [1] https://github.com/hexchat/hexchat/commit/92014628d1cc06334a9ca8c91a7184d50f5ab9a0 Index: Makefile =================================================================== RCS file: /cvs/ports/net/hexchat/Makefile,v retrieving revision 1.26 diff -u -p -u -p -r1.26 Makefile --- Makefile 12 Jul 2019 20:48:27 -0000 1.26 +++ Makefile 22 Oct 2019 18:50:02 -0000 @@ -1,64 +1,46 @@ # $OpenBSD: Makefile,v 1.26 2019/07/12 20:48:27 sthen Exp $ COMMENT = GTK+2 IRC Client -DISTNAME = hexchat-2.12.3 +DISTNAME = hexchat-2.14.2 EXTRACT_SUFX = .tar.xz CATEGORIES = net x11 -REVISION = 8 -HOMEPAGE = http://hexchat.github.io/ +HOMEPAGE = https://hexchat.github.io/ # GPLv2+ PERMIT_PACKAGE = Yes -WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB += Xrandr Xrender atk-1.0 c cairo crypto dbus-1 dbus-glib-1 -WANTLIB += expat ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 -WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 -WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl ${MODLUA_WANTLIB} m -WANTLIB += notify pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre perl pixman-1 -WANTLIB += png proxy pthread ${MODPY_WANTLIB} ssl ${COMPILER_LIBCXX} util -WANTLIB += xcb xcb-render xcb-shm z fribidi - -COMPILER = base-clang ports-gcc base-gcc - -MASTER_SITES = http://dl.hexchat.net/hexchat/ - -MODULES = textproc/intltool \ - lang/lua \ - lang/python +WANTLIB += X11 c crypto dbus-glib-1 gdk-x11-2.0 gdk_pixbuf-2.0 +WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-x11-2.0 +WANTLIB += intl luajit-5.1 notify pango-1.0 perl proxy ssl +WANTLIB += ${MODPY_WANTLIB} + +# libproxy requires libestdc++ +COMPILER = base-clang ports-gcc + +MASTER_SITES = https://dl.hexchat.net/hexchat/ + +MODULES = devel/meson \ + lang/python \ + textproc/intltool -MODLUA_VERSION = 5.3 +MODPY_BUILDDEP = No +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} BUILD_DEPENDS = devel/iso-codes LIB_DEPENDS = devel/gettext,-runtime \ devel/libnotify \ + lang/luajit \ net/libproxy \ - x11/gtk+2 \ x11/dbus-glib \ - ${MODPY_LIB_DEPENDS} \ - ${MODLUA_LIB_DEPENDS} - -MODPY_BUILDDEP = No + x11/gtk+2 \ + ${MODPY_LIB_DEPENDS} RUN_DEPENDS = devel/desktop-file-utils \ devel/iso-codes \ x11/gtk+3,-guic -CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += --enable-ipv6 \ - --enable-dbus \ - --disable-sysinfo \ - --disable-libcanberra -CONFIGURE_ENV = CPPFLAGS=-I${LOCALBASE}/include \ - LDFLAGS=-L${LOCALBASE}/lib \ - OBJC="${CC}" \ - LUA=${MODLUA_FLAVOR} - -LIBTOOL_FLAGS = --tag=disable-static - -USE_GMAKE = Yes - -NO_TEST = Yes +CONFIGURE_ARGS += -Dwith-libcanberra=false \ + -Dwith-sysinfo=false .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/hexchat/distinfo,v retrieving revision 1.7 diff -u -p -u -p -r1.7 distinfo --- distinfo 28 Oct 2016 14:55:19 -0000 1.7 +++ distinfo 22 Oct 2019 18:50:02 -0000 @@ -1,2 +1,2 @@ -SHA256 (hexchat-2.12.3.tar.xz) = bysiNyx6ntj/q4FweWOOj0F49fi6Y8ics7qgG+YU8ro= -SIZE (hexchat-2.12.3.tar.xz) = 1577736 +SHA256 (hexchat-2.14.2.tar.xz) = d5K55SVg+9PhDXW/tdE4ogkTqHdx1nbSllR/G0rAlhg= +SIZE (hexchat-2.14.2.tar.xz) = 1288732 Index: patches/patch-src_common_meson_build =================================================================== RCS file: patches/patch-src_common_meson_build diff -N patches/patch-src_common_meson_build --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_common_meson_build 22 Oct 2019 18:50:02 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +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, Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/hexchat/pkg/PLIST,v retrieving revision 1.4 diff -u -p -u -p -r1.4 PLIST --- pkg/PLIST 29 Jun 2018 22:16:19 -0000 1.4 +++ pkg/PLIST 22 Oct 2019 18:50:02 -0000 @@ -5,8 +5,6 @@ lib/hexchat/ lib/hexchat/plugins/ @comment lib/hexchat/plugins/checksum.la lib/hexchat/plugins/checksum.so -@comment lib/hexchat/plugins/doat.la -lib/hexchat/plugins/doat.so @comment lib/hexchat/plugins/fishlim.la lib/hexchat/plugins/fishlim.so @comment lib/hexchat/plugins/lua.la @@ -17,9 +15,7 @@ lib/hexchat/plugins/perl.so lib/hexchat/plugins/python.so lib/pkgconfig/hexchat-plugin.pc @man man/man1/hexchat.1 -share/appdata/ -share/appdata/hexchat.appdata.xml -share/applications/hexchat.desktop +share/applications/io.github.Hexchat.desktop share/dbus-1/services/org.hexchat.service.service share/icons/hicolor/48x48/apps/hexchat.png share/icons/hicolor/scalable/apps/hexchat.svg @@ -46,6 +42,8 @@ share/locale/hi/LC_MESSAGES/hexchat.mo share/locale/hu/LC_MESSAGES/hexchat.mo share/locale/id/LC_MESSAGES/hexchat.mo share/locale/it/LC_MESSAGES/hexchat.mo +share/locale/ja_JP/ +share/locale/ja_JP/LC_MESSAGES/ share/locale/ja_JP/LC_MESSAGES/hexchat.mo share/locale/kn/LC_MESSAGES/hexchat.mo share/locale/ko/LC_MESSAGES/hexchat.mo @@ -76,5 +74,7 @@ share/locale/vi/LC_MESSAGES/hexchat.mo share/locale/wa/LC_MESSAGES/hexchat.mo share/locale/zh_CN/LC_MESSAGES/hexchat.mo share/locale/zh_TW/LC_MESSAGES/hexchat.mo +share/metainfo/ +share/metainfo/io.github.Hexchat.appdata.xml @tag gtk-update-icon-cache %D/share/icons/hicolor @tag update-desktop-database
