CVS commit: pkgsrc/lang/qt6-qtdeclarative

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Oct  1 11:48:57 UTC 2024

Modified Files:
        pkgsrc/lang/qt6-qtdeclarative: Makefile PLIST

Log Message:
qt6-qtdeclarative: restore post-install hack and adjust PLIST


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/qt6-qtdeclarative/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/qt6-qtdeclarative/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/qt6-qtdeclarative/Makefile
diff -u pkgsrc/lang/qt6-qtdeclarative/Makefile:1.20 pkgsrc/lang/qt6-qtdeclarative/Makefile:1.21
--- pkgsrc/lang/qt6-qtdeclarative/Makefile:1.20 Tue Oct  1 05:54:20 2024
+++ pkgsrc/lang/qt6-qtdeclarative/Makefile      Tue Oct  1 11:48:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2024/10/01 05:54:20 adam Exp $
+# $NetBSD: Makefile,v 1.21 2024/10/01 11:48:57 adam Exp $
 
 DISTNAME=      qtdeclarative-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtdeclarative-${QTVERSION}
@@ -44,6 +44,11 @@ PLIST_VARS+= jit
 PLIST.jit=     yes
 .endif
 
+# installs .cpp.o file that should not be there
+post-install:
+       ${RM} -f -r ${DESTDIR}${QTPREFIX}/lib/objects-Release
+       ${RM} -f -r ${DESTDIR}${QTPREFIX}/qml/Qt/test/controls/objects-Release
+
 .include "../../graphics/qt6-qtimageformats/buildlink3.mk"
 .include "../../graphics/qt6-qtshadertools/buildlink3.mk"
 .include "../../graphics/qt6-qtsvg/buildlink3.mk"

Index: pkgsrc/lang/qt6-qtdeclarative/PLIST
diff -u pkgsrc/lang/qt6-qtdeclarative/PLIST:1.9 pkgsrc/lang/qt6-qtdeclarative/PLIST:1.10
--- pkgsrc/lang/qt6-qtdeclarative/PLIST:1.9     Tue Oct  1 09:59:17 2024
+++ pkgsrc/lang/qt6-qtdeclarative/PLIST Tue Oct  1 11:48:57 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2024/10/01 09:59:17 abs Exp $
+@comment $NetBSD: PLIST,v 1.10 2024/10/01 11:48:57 adam Exp $
 lib/pkgconfig/Qt6LabsAnimation.pc
 lib/pkgconfig/Qt6LabsFolderListModel.pc
 lib/pkgconfig/Qt6LabsQmlModels.pc
@@ -2293,7 +2293,6 @@ qt6/lib/libQt6QuickWidgets.prl
 qt6/lib/libQt6QuickWidgets.so
 qt6/lib/libQt6QuickWidgets.so.${PKGVERSION}
 qt6/lib/libQt6QuickWidgets.so.6
-qt6/lib/objects-Release/QmlTypeRegistrarPrivate_resources_1/.qt/rcc/qrc_jsRootMetaTypes_init.cpp.o
 qt6/lib/pkgconfig/Qt6LabsAnimation.pc
 qt6/lib/pkgconfig/Qt6LabsFolderListModel.pc
 qt6/lib/pkgconfig/Qt6LabsQmlModels.pc
@@ -2550,7 +2549,6 @@ qt6/qml/Qt/labs/wavefrontmesh/plugins.qm
 qt6/qml/Qt/labs/wavefrontmesh/qmldir
 qt6/qml/Qt/test/controls/QuickControlsTestUtilsPrivate.qmltypes
 qt6/qml/Qt/test/controls/libquickcontrolstestutilsprivateplugin.so
-qt6/qml/Qt/test/controls/objects-Release/QuickControlsTestUtilsPrivate_resources_1/.qt/rcc/qrc_qmake_Qt_test_controls_init.cpp.o
 qt6/qml/Qt/test/controls/qmldir
 qt6/qml/QtCore/libqtqmlcoreplugin.so
 qt6/qml/QtCore/plugins.qmltypes