From owner-svn-ports-head@freebsd.org Sun Dec 22 13:57:00 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CDBBE1D4087; Sun, 22 Dec 2019 13:57:00 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47gkYm52mvz4QdT; Sun, 22 Dec 2019 13:57:00 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A811172A; Sun, 22 Dec 2019 13:57:00 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBMDv0CE034480; Sun, 22 Dec 2019 13:57:00 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBMDuxrU034473; Sun, 22 Dec 2019 13:56:59 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201912221356.xBMDuxrU034473@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sun, 22 Dec 2019 13:56:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520626 - in head/irc/hexchat: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/irc/hexchat: . files X-SVN-Commit-Revision: 520626 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Dec 2019 13:57:00 -0000 Author: pkubaj Date: Sun Dec 22 13:56:59 2019 New Revision: 520626 URL: https://svnweb.freebsd.org/changeset/ports/520626 Log: irc/hexchat: update to 2.14.3, change maintainer to my FreeBSD.org address, regenerate patches, add USES=localbase Changelog: fix various incorrect parsing of IRC messages relating to trailing parameters fix SASL negotiation combined with multi-line cap fix input box theming with Yaru theme python: Work around Python 3.7 regression causing crash on unload sysinfo: Add support for /etc/os-release sysinfo: Ignore irrelevant mounts when calculating storage size Modified: head/irc/hexchat/Makefile head/irc/hexchat/distinfo head/irc/hexchat/files/patch-meson.build head/irc/hexchat/files/patch-plugins_sysinfo_meson.build Modified: head/irc/hexchat/Makefile ============================================================================== --- head/irc/hexchat/Makefile Sun Dec 22 13:54:34 2019 (r520625) +++ head/irc/hexchat/Makefile Sun Dec 22 13:56:59 2019 (r520626) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= hexchat -PORTVERSION= 2.14.2 +PORTVERSION= 2.14.3 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= irc gnome -MAINTAINER= pkubaj@anongoth.pl +MAINTAINER= pkubaj@FreeBSD.org COMMENT= IRC chat program with GTK and Text Frontend LICENSE= GPLv2+ @@ -21,7 +20,8 @@ LIB_DEPENDS= libproxy.so:net/libproxy \ RUN_DEPENDS= ${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes USES= compiler:c++11-lang desktop-file-utils gettext-tools gnome \ - libtool meson ninja pkgconfig python:3.5+ shebangfix ssl xorg + libtool localbase meson ninja pkgconfig python:3.5+ shebangfix \ + ssl xorg USE_GNOME= cairo gtk20 intltool libxml2 USE_XORG= x11 USE_GITHUB= yes @@ -30,8 +30,7 @@ MESON_ARGS= -Dwith-ssl=true -Dwith-gtk=true -Dwith-pyt INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -lX11 +LIBS+= -lX11 SUB_FILES= pkg-message Modified: head/irc/hexchat/distinfo ============================================================================== --- head/irc/hexchat/distinfo Sun Dec 22 13:54:34 2019 (r520625) +++ head/irc/hexchat/distinfo Sun Dec 22 13:56:59 2019 (r520626) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535716329 -SHA256 (hexchat-hexchat-v2.14.2_GH0.tar.gz) = 4f2c2137020913513ea559f788c41039ca6230764d8158862d5d1ee8785592d9 -SIZE (hexchat-hexchat-v2.14.2_GH0.tar.gz) = 2759172 +TIMESTAMP = 1577021248 +SHA256 (hexchat-hexchat-v2.14.3_GH0.tar.gz) = 3e32b120a0fde6a3949cc9d2b87b00534e11c150b3249830736e7f86b050343a +SIZE (hexchat-hexchat-v2.14.3_GH0.tar.gz) = 2759502 Modified: head/irc/hexchat/files/patch-meson.build ============================================================================== --- head/irc/hexchat/files/patch-meson.build Sun Dec 22 13:54:34 2019 (r520625) +++ head/irc/hexchat/files/patch-meson.build Sun Dec 22 13:56:59 2019 (r520626) @@ -1,4 +1,4 @@ ---- meson.build.orig 2018-03-14 02:26:31 UTC +--- meson.build.orig 2019-12-21 06:38:06 UTC +++ meson.build @@ -16,11 +16,21 @@ cc = meson.get_compiler('c') libgio_dep = dependency('gio-2.0', version: '>= 2.34.0') @@ -23,7 +23,7 @@ endif config_h = configuration_data() -@@ -49,7 +59,7 @@ config_h.set('GLIB_VERSION_MIN_REQUIRED' +@@ -49,7 +59,7 @@ config_h.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSIO config_h.set('HAVE_MEMRCHR', cc.has_function('memrchr')) config_h.set('HAVE_STRINGS_H', cc.has_header('strings.h')) @@ -32,7 +32,7 @@ config_h.set('HAVE_X509_GET_SIGNATURE_NID', cc.has_function('X509_get_signature_nid', dependencies: libssl_dep) ) -@@ -131,9 +141,6 @@ global_ldflags = [] +@@ -129,9 +139,6 @@ global_ldflags = [] test_ldflags = [ '-Wl,-z,relro', '-Wl,-z,now', @@ -41,4 +41,4 @@ - '-Wl,--nxcompat', ] foreach ldflag : test_ldflags - if cc.has_argument(ldflag) and cc.links('int main (void) { return 0; }', args: ldflag) + if meson.version().version_compare('>= 0.46.0') Modified: head/irc/hexchat/files/patch-plugins_sysinfo_meson.build ============================================================================== --- head/irc/hexchat/files/patch-plugins_sysinfo_meson.build Sun Dec 22 13:54:34 2019 (r520625) +++ head/irc/hexchat/files/patch-plugins_sysinfo_meson.build Sun Dec 22 13:56:59 2019 (r520626) @@ -1,18 +1,18 @@ ---- plugins/sysinfo/meson.build.orig 2018-05-07 13:58:41 UTC +--- plugins/sysinfo/meson.build.orig 2019-12-22 13:48:33 UTC +++ plugins/sysinfo/meson.build @@ -13,13 +13,13 @@ sysinfo_includes = [] sysinfo_cargs = [] system = host_machine.system() --if system == 'linux' or system == 'darwin' -+if system == 'linux' or system == 'darwin' or system == 'freebsd' +-if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin' ++if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin' or system == 'freebsd' sysinfo_includes += 'shared' sysinfo_sources += [ 'shared/df.c' ] -- if system == 'linux' -+ if system == 'linux' or system == 'freebsd' +- if system == 'linux' or system == 'gnu' or system.startswith('gnu/') ++ if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'freebsd' libpci = dependency('libpci', required: false, method: 'pkg-config') if libpci.found() sysinfo_deps += libpci