From owner-svn-ports-head@freebsd.org Thu Mar 18 23:43:40 2021 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 BD2AF5B0E8F; Thu, 18 Mar 2021 23:43:40 +0000 (UTC) (envelope-from adridg@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F1kB45102z3C7r; Thu, 18 Mar 2021 23:43:40 +0000 (UTC) (envelope-from adridg@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 9F0652B6C; Thu, 18 Mar 2021 23:43:40 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12INheHO011586; Thu, 18 Mar 2021 23:43:40 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12INhecm011584; Thu, 18 Mar 2021 23:43:40 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202103182343.12INhecm011584@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Thu, 18 Mar 2021 23:43:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568764 - in head/deskutils/semantik: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/deskutils/semantik: . files X-SVN-Commit-Revision: 568764 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.34 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: Thu, 18 Mar 2021 23:43:40 -0000 Author: adridg Date: Thu Mar 18 23:43:39 2021 New Revision: 568764 URL: https://svnweb.freebsd.org/changeset/ports/568764 Log: Update deskutils/semantik to latest upstream release This is prompted by the imminent release of KDE Frameworks 5.80, which had fallout with this software. I have no patience with waf as a build system, so this adds some hacks to include absolute paths to the KF5 includes, rather than -I../../../KConfig -I../../../../KConfig (on the off chance you might be one source level higher or lower; this is what the build system is doing without hacks). PR: 254256 (fallout) Added: head/deskutils/semantik/files/ head/deskutils/semantik/files/patch-wscript (contents, props changed) Modified: head/deskutils/semantik/Makefile head/deskutils/semantik/distinfo Modified: head/deskutils/semantik/Makefile ============================================================================== --- head/deskutils/semantik/Makefile Thu Mar 18 22:01:39 2021 (r568763) +++ head/deskutils/semantik/Makefile Thu Mar 18 23:43:39 2021 (r568764) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= semantik -DISTVERSION= 1.2.5 +DISTVERSION= 1.2.6 CATEGORIES= deskutils kde MASTER_SITES= https://waf.io/ @@ -42,10 +42,21 @@ PLIST_SUB= PORTVERSION="${PORTVERSION}" OPTIONS_DEFINE= NLS OPTIONS_SUB= yes +post-patch: + @${REINPLACE_CMD} -e 's+@@LOCALBASE@@+${LOCALBASE}+' \ + ${WRKSRC}/wscript + post-patch-NLS-off: @${REINPLACE_CMD} -e '/langs/ d' \ ${WRKSRC}/wscript +post-configure: + # Waf injects some bizzarre 3- and 4-level ../ stacks into the include + # paths, which don't match how KDE includes are organized, and in a + # poudriere build don't necessarily reach /usr/local/include either. + @${REINPLACE_CMD} -e "s+..PWD............/include+${LOCALBASE}/include+g" \ + ${WRKSRC}/build/c4che/_cache.py + post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-d \ Modified: head/deskutils/semantik/distinfo ============================================================================== --- head/deskutils/semantik/distinfo Thu Mar 18 22:01:39 2021 (r568763) +++ head/deskutils/semantik/distinfo Thu Mar 18 23:43:39 2021 (r568764) @@ -1,3 +1,3 @@ -TIMESTAMP = 1588315426 -SHA256 (semantik-1.2.5.tar.bz2) = ef2100c7ec784b493355b85a86a293be05db8d0db5f19946d8490a4f5f43c0ce -SIZE (semantik-1.2.5.tar.bz2) = 626691 +TIMESTAMP = 1616097322 +SHA256 (semantik-1.2.6.tar.bz2) = 3b33b4b4ab92158598d05b0d38cba2bca2b062927989249466bca668cfb7a635 +SIZE (semantik-1.2.6.tar.bz2) = 627853 Added: head/deskutils/semantik/files/patch-wscript ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/semantik/files/patch-wscript Thu Mar 18 23:43:39 2021 (r568764) @@ -0,0 +1,24 @@ +--- wscript.orig 2021-03-18 23:07:57 UTC ++++ wscript +@@ -220,20 +220,9 @@ def configure(conf): + + conf.env.append_value('LIB_KDECORE', 'KF5KDELibs4Support') + +- for x in ('', '/usr/include/KF5/KDELibs4Support', '/usr/local/include/KF5/KDELibs4Support'): +- conf.env.stash() ++ for x in ('@@LOCALBASE@@/include/KF5/KDELibs4Support', "bogus"): + if os.path.exists(x): + conf.env.append_value('INCLUDES_KDECORE', x) +- try: +- conf.check(fragment='#include \n#include \n', +- features='cxx qt5', +- msg='Checking for kdelibs4support %s' % x, +- use='KDECORE QT5CORE QT5GUI QT5WIDGETS') +- break +- except conf.errors.ConfigurationError: +- conf.env.revert() +- else: +- conf.fatal('kdelibs4support was not found, check the config.log file') + + for x in ('', '/usr/local/include'): + conf.env.stash()