hexchat: Update to 2.14.2. Changes: * remove shift+click binding to close tabs * re-add option to build against legacy perl * add appstream metainfo for plugins * add build option to set perl binary * add option to build without appstream * fix not unminimizing when restoring from tray * fix translations containing invalid text events * fix server passwords starting with : * update libraries on windows, fixing CVE-2018-15120 (and emoji!)diff -r1.31 -r1.32 pkgsrc/chat/hexchat/Makefile
(nia)
@@ -1,52 +1,66 @@ | @@ -1,52 +1,66 @@ | |||
1 | # $NetBSD: Makefile,v 1.31 2019/04/25 07:32:38 maya Exp $ | 1 | # $NetBSD: Makefile,v 1.32 2019/05/08 17:19:41 nia Exp $ | |
2 | 2 | |||
3 | DISTNAME= hexchat-2.14.1 | 3 | DISTNAME= hexchat-2.14.2 | |
4 | PKGREVISION= 6 | |||
5 | CATEGORIES= chat | 4 | CATEGORIES= chat | |
6 | MASTER_SITES= http://dl.hexchat.net/hexchat/ | 5 | MASTER_SITES= https://dl.hexchat.net/hexchat/ | |
7 | EXTRACT_SUFX= .tar.xz | 6 | EXTRACT_SUFX= .tar.xz | |
8 | 7 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://hexchat.github.io/ | 9 | HOMEPAGE= https://hexchat.github.io/ | |
11 | COMMENT= IRC client based on XChat | 10 | COMMENT= IRC client based on XChat | |
12 | LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit | 11 | LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit | |
13 | 12 | |||
14 | USE_LIBTOOL= yes | 13 | USE_LIBTOOL= yes | |
15 | USE_TOOLS+= bison gmake intltool msgfmt msgmerge pkg-config xgettext | 14 | USE_TOOLS+= bison gmake intltool msgfmt msgmerge pkg-config xgettext | |
16 | USE_LANGUAGES= c c++ | 15 | USE_LANGUAGES= c c++ | |
17 | 16 | |||
18 | PKGCONFIG_OVERRIDE+= share/pkgconfig/hexchat-plugin.pc.in | 17 | PKGCONFIG_OVERRIDE+= share/pkgconfig/hexchat-plugin.pc.in | |
19 | 18 | |||
20 | # XXX fails without GNU msgfmt | 19 | # XXX fails without GNU msgfmt | |
21 | _TOOLS_USE_PKGSRC.msgfmt= yes | 20 | _TOOLS_USE_PKGSRC.msgfmt= yes | |
22 | 21 | |||
23 | .include "options.mk" | 22 | .include "options.mk" | |
24 | 23 | |||
25 | MESON_ARGS+= -Dwith-text=true | 24 | MESON_ARGS+= -Dwith-text=true | |
25 | MESON_ARGS+= -Dwith-appdata=false | |||
26 | 26 | |||
27 | # XXX meson | 27 | # XXX meson | |
28 | PYTHON_VERSIONS_INCOMPATIBLE= 27 | 28 | PYTHON_VERSIONS_INCOMPATIBLE= 27 | |
29 | .if empty(PKG_OPTIONS:Mpython) | 29 | .if empty(PKG_OPTIONS:Mpython) | |
30 | PYTHON_FOR_BUILD_ONLY= yes | 30 | PYTHON_FOR_BUILD_ONLY= yes | |
31 | .endif | 31 | .endif | |
32 | .include "../../lang/python/pyversion.mk" | 32 | .include "../../lang/python/pyversion.mk" | |
33 | REPLACE_PYTHON+= plugins/perl/generate_header.py | 33 | REPLACE_PYTHON+= plugins/perl/generate_header.py | |
34 | REPLACE_PYTHON+= src/common/make-te.py | 34 | REPLACE_PYTHON+= src/common/make-te.py | |
35 | REPLACE_PYTHON+= meson_post_install.py | 35 | REPLACE_PYTHON+= meson_post_install.py | |
36 | 36 | |||
37 | OPSYSVARS+= SOEXT | 37 | OPSYSVARS+= SOEXT | |
38 | SOEXT.Darwin= dylib | 38 | SOEXT.Darwin= dylib | |
39 | SOEXT.*= so | 39 | SOEXT.*= so | |
40 | PLIST_SUBST+= SOEXT=${SOEXT} | 40 | PLIST_SUBST+= SOEXT=${SOEXT} | |
41 | 41 | |||
42 | LDFLAGS.SunOS+= -lsocket -lnsl | 42 | LDFLAGS.SunOS+= -lsocket -lnsl | |
43 | 43 | |||
44 | # I have no idea why it sometimes isn't doing this, causing the build | |||
45 | # to fail without the generated files. | |||
46 | post-configure: | |||
47 | ${PYTHONBIN} ${WRKSRC}/src/common/make-te.py \ | |||
48 | ${WRKSRC}/src/common/textevents.in \ | |||
49 | ${WRKSRC}/src/common/textevents.h \ | |||
50 | ${WRKSRC}/src/common/textenums.h | |||
51 | cd ${WRKSRC} && ${PREFIX}/bin/glib-genmarshal \ | |||
52 | --prefix _hexchat_marshal --internal \ | |||
53 | --output src/common/marshal.c \ | |||
54 | --body src/common/marshalers.list \ | |||
55 | --include-header marshal.h | |||
56 | ||||
57 | ||||
44 | .include "../../devel/py-meson/build.mk" | 58 | .include "../../devel/py-meson/build.mk" | |
45 | .include "../../textproc/iso-codes/buildlink3.mk" | 59 | .include "../../textproc/iso-codes/buildlink3.mk" | |
46 | .include "../../devel/pango/buildlink3.mk" | 60 | .include "../../devel/pango/buildlink3.mk" | |
47 | .include "../../textproc/libxml2/buildlink3.mk" | 61 | .include "../../textproc/libxml2/buildlink3.mk" | |
48 | .include "../../mk/dlopen.buildlink3.mk" | 62 | .include "../../mk/dlopen.buildlink3.mk" | |
49 | .include "../../converters/libiconv/buildlink3.mk" | 63 | .include "../../converters/libiconv/buildlink3.mk" | |
50 | .include "../../mk/pthread.buildlink3.mk" | 64 | .include "../../mk/pthread.buildlink3.mk" | |
51 | .include "../../devel/glib2/buildlink3.mk" | 65 | .include "../../devel/glib2/buildlink3.mk" | |
52 | .include "../../mk/bsd.pkg.mk" | 66 | .include "../../mk/bsd.pkg.mk" |
@@ -1,30 +1,29 @@ | @@ -1,30 +1,29 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.4 2018/04/04 17:40:23 tron Exp $ | 1 | @comment $NetBSD: PLIST,v 1.5 2019/05/08 17:19:41 nia Exp $ | |
2 | ${PLIST.gtk2}bin/hexchat | 2 | ${PLIST.gtk2}bin/hexchat | |
3 | bin/hexchat-text | 3 | bin/hexchat-text | |
4 | include/hexchat-plugin.h | 4 | include/hexchat-plugin.h | |
5 | lib/hexchat/plugins/checksum.${SOEXT} | 5 | lib/hexchat/plugins/checksum.${SOEXT} | |
6 | ${PLIST.fishlim}lib/hexchat/plugins/fishlim.${SOEXT} | 6 | ${PLIST.fishlim}lib/hexchat/plugins/fishlim.${SOEXT} | |
7 | ${PLIST.lua}lib/hexchat/plugins/lua.${SOEXT} | 7 | ${PLIST.lua}lib/hexchat/plugins/lua.${SOEXT} | |
8 | ${PLIST.perl}lib/hexchat/plugins/perl.${SOEXT} | 8 | ${PLIST.perl}lib/hexchat/plugins/perl.${SOEXT} | |
9 | ${PLIST.python}lib/hexchat/plugins/python.${SOEXT} | 9 | ${PLIST.python}lib/hexchat/plugins/python.${SOEXT} | |
10 | ${PLIST.libpci}lib/hexchat/plugins/sysinfo.${SOEXT} | 10 | ${PLIST.libpci}lib/hexchat/plugins/sysinfo.${SOEXT} | |
11 | lib/pkgconfig/hexchat-plugin.pc | 11 | lib/pkgconfig/hexchat-plugin.pc | |
12 | ${PLIST.gtk2}man/man1/hexchat.1 | 12 | ${PLIST.gtk2}man/man1/hexchat.1 | |
13 | ${PLIST.gtk2}share/applications/io.github.Hexchat.desktop | 13 | ${PLIST.gtk2}share/applications/io.github.Hexchat.desktop | |
14 | ${PLIST.dbus}share/dbus-1/services/org.hexchat.service.service | 14 | ${PLIST.dbus}share/dbus-1/services/org.hexchat.service.service | |
15 | ${PLIST.gtk2}share/icons/hicolor/48x48/apps/hexchat.png | 15 | ${PLIST.gtk2}share/icons/hicolor/48x48/apps/hexchat.png | |
16 | ${PLIST.gtk2}share/icons/hicolor/scalable/apps/hexchat.svg | 16 | ${PLIST.gtk2}share/icons/hicolor/scalable/apps/hexchat.svg | |
17 | ${PLIST.gtk2}share/metainfo/io.github.Hexchat.appdata.xml | |||
18 | share/locale/af/LC_MESSAGES/hexchat.mo | 17 | share/locale/af/LC_MESSAGES/hexchat.mo | |
19 | share/locale/am/LC_MESSAGES/hexchat.mo | 18 | share/locale/am/LC_MESSAGES/hexchat.mo | |
20 | share/locale/ast/LC_MESSAGES/hexchat.mo | 19 | share/locale/ast/LC_MESSAGES/hexchat.mo | |
21 | share/locale/az/LC_MESSAGES/hexchat.mo | 20 | share/locale/az/LC_MESSAGES/hexchat.mo | |
22 | share/locale/be/LC_MESSAGES/hexchat.mo | 21 | share/locale/be/LC_MESSAGES/hexchat.mo | |
23 | share/locale/bg/LC_MESSAGES/hexchat.mo | 22 | share/locale/bg/LC_MESSAGES/hexchat.mo | |
24 | share/locale/ca/LC_MESSAGES/hexchat.mo | 23 | share/locale/ca/LC_MESSAGES/hexchat.mo | |
25 | share/locale/cs/LC_MESSAGES/hexchat.mo | 24 | share/locale/cs/LC_MESSAGES/hexchat.mo | |
26 | share/locale/da/LC_MESSAGES/hexchat.mo | 25 | share/locale/da/LC_MESSAGES/hexchat.mo | |
27 | share/locale/de/LC_MESSAGES/hexchat.mo | 26 | share/locale/de/LC_MESSAGES/hexchat.mo | |
28 | share/locale/el/LC_MESSAGES/hexchat.mo | 27 | share/locale/el/LC_MESSAGES/hexchat.mo | |
29 | share/locale/en_GB/LC_MESSAGES/hexchat.mo | 28 | share/locale/en_GB/LC_MESSAGES/hexchat.mo | |
30 | share/locale/es/LC_MESSAGES/hexchat.mo | 29 | share/locale/es/LC_MESSAGES/hexchat.mo |
@@ -1,11 +1,11 @@ | @@ -1,11 +1,11 @@ | |||
1 | $NetBSD: distinfo,v 1.7 2018/03/24 07:05:53 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.8 2019/05/08 17:19:41 nia Exp $ | |
2 | 2 | |||
3 | SHA1 (hexchat-2.14.1.tar.xz) = 3cb9c8734eded5d55e08ef801b668ee730374a5a | 3 | SHA1 (hexchat-2.14.2.tar.xz) = 650f6247cc68c022ba4fee09ebde578dc2ec1c33 | |
4 | RMD160 (hexchat-2.14.1.tar.xz) = 87f0aadaaeb4fd16650b3622a45510bd470c32d1 | 4 | RMD160 (hexchat-2.14.2.tar.xz) = a41067f7dd9b0eceaf2252aa7a8b8eca7dd228fd | |
5 | SHA512 (hexchat-2.14.1.tar.xz) = 2728d6f084530c1a65ddb7960db6574fef2bca77e726a2155c8b5724256f37b47421e990b1bf7c9fad7987027b2f6de4534a8df28a98cb3d28da726e16ac32dd | 5 | SHA512 (hexchat-2.14.2.tar.xz) = 488799700e439a137ad469f618cb1abf75d1f1ebf223c750d658004ef7b2c728543a5a9ae4e6317d6447428dc59e12dded619346a5d8bba12c92dab653512fca | |
6 | Size (hexchat-2.14.1.tar.xz) = 1281872 bytes | 6 | Size (hexchat-2.14.2.tar.xz) = 1288732 bytes | |
7 | SHA1 (patch-osx_launcher.sh) = 7493430921809182898aca2ebb8fd1f493dbd9d3 | 7 | SHA1 (patch-osx_launcher.sh) = 7493430921809182898aca2ebb8fd1f493dbd9d3 | |
8 | SHA1 (patch-plugins_sysinfo_meson.build) = 4f5309ddded3c23014711e1b3305ff6a1c5f62d6 | 8 | SHA1 (patch-plugins_sysinfo_meson.build) = 4f5309ddded3c23014711e1b3305ff6a1c5f62d6 | |
9 | SHA1 (patch-plugins_sysinfo_unix_parse.c) = 92b882b7573cfcfc280351353a7bdcb0a7940c06 | 9 | SHA1 (patch-plugins_sysinfo_unix_parse.c) = 92b882b7573cfcfc280351353a7bdcb0a7940c06 | |
10 | SHA1 (patch-plugins_sysinfo_unix_pci.c) = db2d20261419bed6d6c4b716b4416d73b3386053 | 10 | SHA1 (patch-plugins_sysinfo_unix_pci.c) = db2d20261419bed6d6c4b716b4416d73b3386053 | |
11 | SHA1 (patch-plugins_sysinfo_unix_pci.h) = 018b74796143b26d6a1f9ad821f3889b74b09cc8 | 11 | SHA1 (patch-plugins_sysinfo_unix_pci.h) = 018b74796143b26d6a1f9ad821f3889b74b09cc8 |