CVS commit: pkgsrc/x11/qt5-qtbase

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

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.

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@