Received: by mail.netbsd.org (Postfix, from userid 605) id 2FBD584F3E; Tue, 6 Jul 2021 19:50:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 65E8984F3D for ; Tue, 6 Jul 2021 19:50:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id FWggCGehPke2 for ; Tue, 6 Jul 2021 19:50:11 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id CB39584F03 for ; Tue, 6 Jul 2021 19:50:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4BDB4FA95; Tue, 6 Jul 2021 19:50:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1625601010147100" MIME-Version: 1.0 Date: Tue, 6 Jul 2021 19:50:10 +0000 From: "Olaf Seibert" Subject: CVS commit: pkgsrc/x11/qt5-qtbase To: pkgsrc-changes@NetBSD.org Reply-To: rhialto@netbsd.org X-Mailer: log_accum Message-Id: <20210706195010.4BDB4FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1625601010147100 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rhialto Date: Tue Jul 6 19:50:10 UTC 2021 Modified Files: pkgsrc/x11/qt5-qtbase: Makefile pkgsrc/x11/qt5-qtbase/files: qmake.conf qmake.conf.mac Log Message: x11/qt5-qtbase: add QMAKE_STRIP to pkgsrc qmake.conf. In upstream qmake, QMAKE_STRIP is defined in places such as common/bsd/bsd.conf and common/linux.conf. The pkgsrc version of qmake.conf includes none of those. So add it there. For the special mac version, just include bsd/bsd.conf. The missing name was discovered while updating x11/XaoS. To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 pkgsrc/x11/qt5-qtbase/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/qt5-qtbase/files/qmake.conf cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/qt5-qtbase/files/qmake.conf.mac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1625601010147100 Content-Disposition: inline Content-Length: 1683 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qt5-qtbase/Makefile diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.110 pkgsrc/x11/qt5-qtbase/Makefile:1.111 --- pkgsrc/x11/qt5-qtbase/Makefile:1.110 Tue May 25 09:26:32 2021 +++ pkgsrc/x11/qt5-qtbase/Makefile Tue Jul 6 19:50:09 2021 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.110 2021/05/25 09:26:32 thor Exp $ +# $NetBSD: Makefile,v 1.111 2021/07/06 19:50:09 rhialto Exp $ DISTNAME= qtbase-everywhere-src-${QTVERSION} PKGNAME= qt5-qtbase-${QTVERSION} -PKGREVISION= 5 +PKGREVISION= 6 COMMENT= C++ X GUI toolkit .include "../../x11/qt5-qtbase/Makefile.common" Index: pkgsrc/x11/qt5-qtbase/files/qmake.conf diff -u pkgsrc/x11/qt5-qtbase/files/qmake.conf:1.10 pkgsrc/x11/qt5-qtbase/files/qmake.conf:1.11 --- pkgsrc/x11/qt5-qtbase/files/qmake.conf:1.10 Fri Aug 9 17:41:39 2019 +++ pkgsrc/x11/qt5-qtbase/files/qmake.conf Tue Jul 6 19:50:10 2021 @@ -48,6 +48,9 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = @QMAKE_RANLIB@ +QMAKE_STRIP = strip +QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_MOC = $(QTDIR)/bin/moc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_UIC3 = $(QTDIR)/bin/uic3 Index: pkgsrc/x11/qt5-qtbase/files/qmake.conf.mac diff -u pkgsrc/x11/qt5-qtbase/files/qmake.conf.mac:1.4 pkgsrc/x11/qt5-qtbase/files/qmake.conf.mac:1.5 --- pkgsrc/x11/qt5-qtbase/files/qmake.conf.mac:1.4 Fri Aug 9 17:41:39 2019 +++ pkgsrc/x11/qt5-qtbase/files/qmake.conf.mac Tue Jul 6 19:50:10 2021 @@ -14,7 +14,7 @@ QMAKE_COMPILER_DEFINES += TARGET_OS_MAC include(../common/gcc-base-mac.conf) include(../common/g++-unix.conf) -include(../common/unix.conf) +include(../common/bsd/bsd.conf) QMAKE_COMPILER = @CC@ --_----------=_1625601010147100--