pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/hexchat hexchat: update to 2.14.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/ad3a32689274
branches: trunk
changeset: 377463:ad3a32689274
user: tnn <tnn%pkgsrc.org@localhost>
date: Sat Mar 17 11:56:15 2018 +0000
description:
hexchat: update to 2.14.1
2.14.1 (2018-03-13)
fix performance regression on Unix
fix building plugins with some compilers
add missing gtk pixbuf theme engine in Windows installer
2.14.0 (2018-03-10)
rewrite build system in Meson
replace intltool build depenency with gettext >= 0.19.6
rename data files to use io.github.Hexchat name
add option (irc_reconnect_rejoin) to disable auto-rejoin on reconnect
add ability to set custom tray icon separate of app icon
fix building against OpenSSL 1.1.0
fix Enchant 2.0+ support
fix input box theming with Adwaita-dark
fix custom sounds not respecting omit if away option
fix detecting if a tray doesn?t exist on x11
fix cutting off ctcp text after ending \01
fix /ignore not accepting full hosts
fix characters getting cut off when their width changes (on Unix)
fix various possible crashes
change preference window to be scroll-able
remove ctrl+w binding by default
remove mpcinfo plugin
doat: fix channels with / in them
fishlim: fix key exchange
fishlim: fix building against LibreSSL
sysinfo: fix pci.ids file not being found on some distros
sysinfo: make libpci optional
lua: avoid loading the same script multiple times
update translations
update libraries on Windows, including Python to 3.6
diffstat:
chat/hexchat/Makefile | 28 +++---
chat/hexchat/PLIST | 21 ++--
chat/hexchat/distinfo | 15 +--
chat/hexchat/options.mk | 73 ++++++----------
chat/hexchat/patches/patch-configure | 25 -----
chat/hexchat/patches/patch-plugins_sysinfo_Makefile.in | 15 ---
chat/hexchat/patches/patch-plugins_sysinfo_meson.build | 22 +++++
chat/hexchat/patches/patch-plugins_sysinfo_unix_parse.c | 16 +-
chat/hexchat/patches/patch-src_fe-gtk_Makefile.in | 15 ---
9 files changed, 90 insertions(+), 140 deletions(-)
diffs (truncated from 378 to 300 lines):
diff -r 0c633a07043b -r ad3a32689274 chat/hexchat/Makefile
--- a/chat/hexchat/Makefile Sat Mar 17 11:39:01 2018 +0000
+++ b/chat/hexchat/Makefile Sat Mar 17 11:56:15 2018 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2018/03/12 11:16:09 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2018/03/17 11:56:15 tnn Exp $
-DISTNAME= hexchat-2.12.3
-PKGREVISION= 7
+DISTNAME= hexchat-2.14.1
CATEGORIES= chat
MASTER_SITES= http://dl.hexchat.net/hexchat/
EXTRACT_SUFX= .tar.xz
@@ -11,27 +10,30 @@
COMMENT= IRC client based on XChat
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit
-GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= bison gmake intltool msgfmt msgmerge pkg-config xgettext
USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE+= share/pkgconfig/hexchat-plugin.pc.in
+# XXX fails without GNU msgfmt
+_TOOLS_USE_PKGSRC.msgfmt= yes
+
.include "options.mk"
-CONFIGURE_ARGS+= --enable-textfe
+MESON_ARGS+= -Dwith-text=true
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= --disable-xlib
-.else
-.include "../../x11/libX11/buildlink3.mk"
+# XXX meson
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+.if empty(PKG_OPTIONS:Mpython)
+PYTHON_FOR_BUILD_ONLY= yes
.endif
+.include "../../lang/python/pyversion.mk"
+REPLACE_PYTHON+= plugins/perl/generate_header.py
+REPLACE_PYTHON+= src/common/make-te.py
+REPLACE_PYTHON+= meson_post_install.py
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+= --enable-mmx
-.endif
-
+.include "../../devel/py-meson/build.mk"
.include "../../textproc/iso-codes/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff -r 0c633a07043b -r ad3a32689274 chat/hexchat/PLIST
--- a/chat/hexchat/PLIST Sat Mar 17 11:39:01 2018 +0000
+++ b/chat/hexchat/PLIST Sat Mar 17 11:56:15 2018 +0000
@@ -1,21 +1,20 @@
-@comment $NetBSD: PLIST,v 1.2 2016/08/16 08:30:14 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/03/17 11:56:15 tnn Exp $
${PLIST.gtk2}bin/hexchat
bin/hexchat-text
include/hexchat-plugin.h
-lib/hexchat/plugins/checksum.la
-lib/hexchat/plugins/doat.la
-lib/hexchat/plugins/fishlim.la
-${PLIST.lua}lib/hexchat/plugins/lua.la
-${PLIST.perl}lib/hexchat/plugins/perl.la
-${PLIST.python}lib/hexchat/plugins/python.la
-${PLIST.libpci}lib/hexchat/plugins/sysinfo.la
+lib/hexchat/plugins/checksum.so
+${PLIST.fishlim}lib/hexchat/plugins/fishlim.so
+${PLIST.lua}lib/hexchat/plugins/lua.so
+${PLIST.perl}lib/hexchat/plugins/perl.so
+${PLIST.python}lib/hexchat/plugins/python.so
+${PLIST.libpci}lib/hexchat/plugins/sysinfo.so
lib/pkgconfig/hexchat-plugin.pc
-man/man1/hexchat.1
-${PLIST.gtk2}share/appdata/hexchat.appdata.xml
-${PLIST.gtk2}share/applications/hexchat.desktop
+${PLIST.gtk2}man/man1/hexchat.1
+${PLIST.gtk2}share/applications/io.github.Hexchat.desktop
${PLIST.dbus}share/dbus-1/services/org.hexchat.service.service
${PLIST.gtk2}share/icons/hicolor/48x48/apps/hexchat.png
${PLIST.gtk2}share/icons/hicolor/scalable/apps/hexchat.svg
+${PLIST.gtk2}share/metainfo/io.github.Hexchat.appdata.xml
share/locale/af/LC_MESSAGES/hexchat.mo
share/locale/am/LC_MESSAGES/hexchat.mo
share/locale/ast/LC_MESSAGES/hexchat.mo
diff -r 0c633a07043b -r ad3a32689274 chat/hexchat/distinfo
--- a/chat/hexchat/distinfo Sat Mar 17 11:39:01 2018 +0000
+++ b/chat/hexchat/distinfo Sat Mar 17 11:56:15 2018 +0000
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.5 2018/02/02 14:01:59 jperkin Exp $
+$NetBSD: distinfo,v 1.6 2018/03/17 11:56:15 tnn Exp $
-SHA1 (hexchat-2.12.3.tar.xz) = 69c91e374eed4b869941d55a7d50362c667119bb
-RMD160 (hexchat-2.12.3.tar.xz) = b9340b949012f4f86e6d14b7b8c6e7794967bb0b
-SHA512 (hexchat-2.12.3.tar.xz) = 1ee8348b70ed27786874aebb136e78b9d3b24bc55b7cebb5c6a730970f6aa3ec690f8c7422003d7ace56987ca84c993694c8ab6b830ef39b620e544fc7353b04
-Size (hexchat-2.12.3.tar.xz) = 1577736 bytes
-SHA1 (patch-configure) = 86c76dec0de83f6ac68a596a8fff5d84a94bb04f
+SHA1 (hexchat-2.14.1.tar.xz) = 3cb9c8734eded5d55e08ef801b668ee730374a5a
+RMD160 (hexchat-2.14.1.tar.xz) = 87f0aadaaeb4fd16650b3622a45510bd470c32d1
+SHA512 (hexchat-2.14.1.tar.xz) = 2728d6f084530c1a65ddb7960db6574fef2bca77e726a2155c8b5724256f37b47421e990b1bf7c9fad7987027b2f6de4534a8df28a98cb3d28da726e16ac32dd
+Size (hexchat-2.14.1.tar.xz) = 1281872 bytes
SHA1 (patch-osx_launcher.sh) = 7493430921809182898aca2ebb8fd1f493dbd9d3
-SHA1 (patch-plugins_sysinfo_Makefile.in) = cd1d3b70a59ecd18b895a1633f59e6ab745c2e42
-SHA1 (patch-plugins_sysinfo_unix_parse.c) = 2639ca0d8cfca47e6e88291ba318db21cb89a234
+SHA1 (patch-plugins_sysinfo_unix_parse.c) = 92b882b7573cfcfc280351353a7bdcb0a7940c06
SHA1 (patch-plugins_sysinfo_unix_pci.c) = db2d20261419bed6d6c4b716b4416d73b3386053
SHA1 (patch-plugins_sysinfo_unix_pci.h) = 018b74796143b26d6a1f9ad821f3889b74b09cc8
-SHA1 (patch-src_fe-gtk_Makefile.in) = ea3df3ff0618a0894d8640783e440a7df4d62c74
diff -r 0c633a07043b -r ad3a32689274 chat/hexchat/options.mk
--- a/chat/hexchat/options.mk Sat Mar 17 11:39:01 2018 +0000
+++ b/chat/hexchat/options.mk Sat Mar 17 11:56:15 2018 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.5 2017/03/28 16:18:25 khorben Exp $
+# $NetBSD: options.mk,v 1.6 2018/03/17 11:56:15 tnn Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.hexchat
-PKG_SUPPORTED_OPTIONS= dbus gtk2 inet6 libcanberra libnotify libpci libproxy
-PKG_SUPPORTED_OPTIONS+= libsexy lua ntlm openssl perl python tests themes xft2
-PKG_SUGGESTED_OPTIONS+= gtk2 inet6 libproxy libsexy openssl xft2
+PKG_SUPPORTED_OPTIONS= dbus gtk2 libcanberra libnotify libpci libproxy
+PKG_SUPPORTED_OPTIONS+= libsexy lua openssl perl python
+PKG_SUGGESTED_OPTIONS+= gtk2 libproxy libsexy openssl
-PLIST_VARS+= dbus gtk2 libpci lua perl python
+PLIST_VARS+= dbus gtk2 libpci lua perl python fishlim
.include "../../mk/bsd.options.mk"
@@ -13,8 +13,9 @@
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
PLIST.dbus= yes
+MESON_ARGS+= -Dwith-dbus=true
.else
-CONFIGURE_ARGS+= --disable-dbus
+MESON_ARGS+= -Dwith-dbus=false
.endif
.if !empty(PKG_OPTIONS:Mgtk2)
@@ -23,24 +24,23 @@
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
PLIST.gtk2= yes
+MESON_ARGS+= -Dwith-gtk=true
.else
-CONFIGURE_ARGS+= --disable-gtkfe
-.endif
-
-.if empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --disable-ipv6
+MESON_ARGS+= -Dwith-gtk=false
.endif
.if !empty(PKG_OPTIONS:Mlibcanberra)
.include "../../audio/libcanberra/buildlink3.mk"
+MESON_ARGS+= -Dwith-libcanberra=true
.else
-CONFIGURE_ARGS+= --disable-libcanberra
+MESON_ARGS+= -Dwith-libcanberra=false
.endif
.if !empty(PKG_OPTIONS:Mlibnotify)
.include "../../sysutils/libnotify/buildlink3.mk"
+MESON_ARGS+= -Dwith-libnotify=true
.else
-CONFIGURE_ARGS+= --disable-libnotify
+MESON_ARGS+= -Dwith-libnotify=false
.endif
.if !empty(PKG_OPTIONS:Mlibpci)
@@ -51,67 +51,52 @@
LIBS+= -lpci
.endif
PLIST.libpci= yes
+MESON_ARGS+= -Dwith-sysinfo=true
+.else
+MESON_ARGS+= -Dwith-sysinfo=false
.endif
.if !empty(PKG_OPTIONS:Mlibproxy)
.include "../../www/libproxy/buildlink3.mk"
+MESON_ARGS+= -Dwith-libproxy=true
.else
-CONFIGURE_ARGS+= --disable-libproxy
+MESON_ARGS+= -Dwith-libproxy=false
.endif
.if !empty(PKG_OPTIONS:Mlua)
.include "../../lang/lua/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-lua
+MESON_ARGS+= -Dwith-lua=lua
PLIST.lua= yes
.else
-CONFIGURE_ARGS+= --disable-lua
-.endif
-
-.if !empty(PKG_OPTIONS:Mntlm)
-.include "../../devel/libntlm/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-ntlm=yes
-.else
-CONFIGURE_ARGS+= --enable-ntlm=no
+MESON_ARGS+= -Dwith-lua=false
.endif
.if !empty(PKG_OPTIONS:Mopenssl)
.include "../../security/openssl/buildlink3.mk"
+MESON_ARGS+= -Dwith-ssl=true
+MESON_ARGS+= -Dwith-fishlim=true
+PLIST.fishlim= yes
.else
-CONFIGURE_ARGS+= --enable-openssl=no
+MESON_ARGS+= -Dwith-ssl=false
+MESON_ARGS+= -Dwith-fishlim=false
.endif
.if !empty(PKG_OPTIONS:Mperl)
.include "../../lang/perl5/buildlink3.mk"
USE_TOOLS+= perl
PLIST.perl= yes
+MESON_ARGS+= -Dwith-perl=true
.else
-CONFIGURE_ARGS+= --disable-perl
+MESON_ARGS+= -Dwith-perl=false
.endif
.if !empty(PKG_OPTIONS:Mpython)
-.include "../../lang/python/pyversion.mk"
PLIST.python= yes
+MESON_ARGS+= -Dwith-python=python-${PYVERSSUFFIX}
.else
-CONFIGURE_ARGS+= --enable-python=no
+MESON_ARGS+= -Dwith-python=false
.endif
.if !empty(PKG_OPTIONS:Mlibsexy)
.include "../../devel/libsexy/buildlink3.mk"
.endif
-
-.if !empty(PKG_OPTIONS:Mtests)
-CONFIGURE_ARGS+= --enable-glibtest
-.else
-CONFIGURE_ARGS+= --disable-glibtest
-.endif
-
-.if !empty(PKG_OPTIONS:Mthemes)
-#BROKEN= The themes option does not build at the moment.
-.include "../../devel/monodevelop/buildlink3.mk"
-CONFIGURE_ARGS+= --with-theme-manager=on
-.endif
-
-.if !empty(PKG_OPTIONS:Mxft2)
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-.endif
diff -r 0c633a07043b -r ad3a32689274 chat/hexchat/patches/patch-configure
--- a/chat/hexchat/patches/patch-configure Sat Mar 17 11:39:01 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2018/02/02 14:01:59 jperkin Exp $
-
-Fix bashism.
-Leave pkgsrc to handle security features.
-
---- configure.orig 2016-10-22 12:49:46.000000000 +0000
-+++ configure
-@@ -19174,7 +19174,7 @@ else
- WITH_TM_FALSE=
- fi
-
-- if test "x$platform_osx" == "xyes"; then
-+ if test "x$platform_osx" = "xyes"; then
- PLATFORM_OSX_TRUE=
- PLATFORM_OSX_FALSE='#'
- else
-@@ -19320,7 +19320,7 @@ fi
- eval ac_res=\$$as_CACHEVAR
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
-+if eval test \"x\$"$as_CACHEVAR"\" = x"DISABLED"; then :
-
- if ${CFLAGS+:} false; then :
-
diff -r 0c633a07043b -r ad3a32689274 chat/hexchat/patches/patch-plugins_sysinfo_Makefile.in
--- a/chat/hexchat/patches/patch-plugins_sysinfo_Makefile.in Sat Mar 17 11:39:01 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-plugins_sysinfo_Makefile.in,v 1.1 2016/08/16 08:30:14 tnn Exp $
-
-Specify libtool tag.
-
---- plugins/sysinfo/Makefile.in.orig 2016-05-01 18:35:33.000000000 +0000
-+++ plugins/sysinfo/Makefile.in
-@@ -162,7 +162,7 @@ AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
Home |
Main Index |
Thread Index |
Old Index