Date: Thu, 18 Mar 2021 23:43:40 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568764 - in head/deskutils/semantik: . files Message-ID: <202103182343.12INhecm011584@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <kio/job.h>\n#include <KDE/KDialog>\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()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103182343.12INhecm011584>