From owner-dev-commits-ports-all@freebsd.org Fri Apr 23 10:28:29 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 D52705EC66C; Fri, 23 Apr 2021 10:28:29 +0000 (UTC) (envelope-from git@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 4FRVqx5jScz4TR3; Fri, 23 Apr 2021 10:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B6C69344B; Fri, 23 Apr 2021 10:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13NASTWT044885; Fri, 23 Apr 2021 10:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13NASTZu044884; Fri, 23 Apr 2021 10:28:29 GMT (envelope-from git) Date: Fri, 23 Apr 2021 10:28:29 GMT Message-Id: <202104231028.13NASTZu044884@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 2ac5b8bb6d20 - main - devel/qtcreator: fix general weirdness MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ac5b8bb6d20b6cfbd77894f524b194103bdf02a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 10:28:29 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ac5b8bb6d20b6cfbd77894f524b194103bdf02a commit 2ac5b8bb6d20b6cfbd77894f524b194103bdf02a Author: Adriaan de Groot AuthorDate: 2021-04-23 10:23:13 +0000 Commit: Adriaan de Groot CommitDate: 2021-04-23 10:28:27 +0000 devel/qtcreator: fix general weirdness - there were REINPLACE_CMDs that did nothing, because the replaced strings were (no longer) in the files being edited. - a .bak file (from REINPLACE_CMD) was left in the plist. - testport failed in check-plist because the install target tries to strip(1) a text file (!?) and that leaves behind an empty `ecp.` file in the dirname of the file being stripped. --- devel/qtcreator/Makefile | 12 +++++++----- devel/qtcreator/pkg-plist | 1 - 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index 64add472a74c..e9a34da27d9a 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -2,6 +2,7 @@ PORTNAME= qtcreator DISTVERSION= 4.13.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION} DISTNAME= qt-creator-opensource-src-${DISTVERSION} @@ -99,11 +100,6 @@ EXTRA_PATCHES= ${PATCHDIR}/llvm10_patch-src_shared_clang_clang__installation.pri .endif post-patch: -# Fix paths for gnuplot and ant. - ${REINPLACE_CMD} -e 's|/usr/bin/gnuplot|${LOCALBASE}/bin/gnuplot|' \ - ${WRKSRC}/share/qtcreator/debugger/dumper.py - ${REINPLACE_CMD} -e 's|/usr/bin/ant|${LOCALBASE}/bin/ant|' \ - ${WRKSRC}/src/plugins/android/androidsettingswidget.cpp # Fix python binary in pro file. ${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|g' \ ${WRKSRC}/qtcreator.pro @@ -119,4 +115,10 @@ pre-configure: # See QTBUG-40825 and ports bugs 194088, 195105 and 198720. ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${WRKSRC}/lib' >> ${WRKSRC}/.qmake.cache +post-stage: +# There is **one** qmldir file that is staged, which gets stripped. +# Since it's a text file, strip complains / falls over, but it does +# leave a 0-size file behind. That in turn trips up check-plist. + ${RM} ${STAGEDIR}/${PREFIX}/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ecp.* + .include diff --git a/devel/qtcreator/pkg-plist b/devel/qtcreator/pkg-plist index ca5e1d79a5e6..5b7bcffe6fbc 100644 --- a/devel/qtcreator/pkg-plist +++ b/devel/qtcreator/pkg-plist @@ -179,7 +179,6 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png %%DATADIR%%/debugger/cdbbridge.py %%DATADIR%%/debugger/creatortypes.py %%DATADIR%%/debugger/dumper.py -%%DATADIR%%/debugger/dumper.py.bak %%DATADIR%%/debugger/gdbbridge.py %%DATADIR%%/debugger/lldbbridge.py %%DATADIR%%/debugger/misctypes.py