From f1f2ac8542f3cef3766d1c7f887c46256725fb28 Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Mon, 5 Jun 2023 16:52:59 +0300 Subject: [PATCH 1/4] qt6-multimedia: don't move qmldir to -devel subpkg This breaks "import QtMultimedia" and prevents any QML from using it without the -devel subpkg which makes no sense. --- srcpkgs/qt6-multimedia/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template index c622b7c9e8fc..a6832fdd69bf 100644 --- a/srcpkgs/qt6-multimedia/template +++ b/srcpkgs/qt6-multimedia/template @@ -1,7 +1,7 @@ # Template file for 'qt6-multimedia' pkgname=qt6-multimedia version=6.5.0 -revision=1 +revision=2 build_style=cmake configure_args="-DQT_FEATURE_gstreamer=ON" hostmakedepends="perl qt6-declarative-host-tools pkg-config qt6-shadertools" @@ -43,7 +43,6 @@ qt6-multimedia-devel_package() { vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes - vmove usr/lib/qt6/qml/QtMultimedia/qmldir vmove "usr/lib/*.so" vmove "usr/lib/*.a" vmove "usr/lib/*.prl" From 5a2d1d8b6b56aa908fb2dab8ebf2a20ec29362fa Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Mon, 5 Jun 2023 16:54:42 +0300 Subject: [PATCH 2/4] qt6-remoteobjects: don't move qmldir to -devel subpkg This breaks "import QtRemoteObjects" and prevents any QML from using it without the -devel subpkg which makes no sense. --- srcpkgs/qt6-remoteobjects/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template index b37d82bed03d..8cdd45e4ea8a 100644 --- a/srcpkgs/qt6-remoteobjects/template +++ b/srcpkgs/qt6-remoteobjects/template @@ -1,7 +1,7 @@ # Template file for 'qt6-remoteobjects' pkgname=qt6-remoteobjects version=6.5.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools pkg-config" makedepends="qt6-declarative-devel" @@ -39,7 +39,6 @@ qt6-remoteobjects-devel_package() { vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes - vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir vmove "usr/lib/*.so" vmove "usr/lib/*.prl" } From 56df759b30a161e5b3d2c58f7c130f804b0a0bf2 Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Mon, 5 Jun 2023 16:55:27 +0300 Subject: [PATCH 3/4] qt6-sensors: don't move qmldir to -devel subpkg This breaks "import QtSensors" and prevents any QML from using it without the -devel subpkg which makes no sense. --- srcpkgs/qt6-sensors/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template index 5e6a1e2a7776..8f6d6ece628d 100644 --- a/srcpkgs/qt6-sensors/template +++ b/srcpkgs/qt6-sensors/template @@ -1,7 +1,7 @@ # Template file for 'qt6-sensors' pkgname=qt6-sensors version=6.5.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools pkg-config" makedepends="qt6-declarative-devel qt6-svg-devel" @@ -27,7 +27,6 @@ qt6-sensors-devel_package() { vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes - vmove usr/lib/qt6/qml/QtSensors/qmldir vmove "usr/lib/*.so" vmove "usr/lib/*.prl" } From 70b6e746a2b8b8ca280f7ce1e720cdd6e160074e Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Mon, 5 Jun 2023 16:56:01 +0300 Subject: [PATCH 4/4] qt6-webchannel: don't move qmldir to -devel subpkg This breaks "import QtWebChannel" and prevents any QML from using it without the -devel subpkg which makes no sense. --- srcpkgs/qt6-webchannel/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template index 9c3def385a7b..30484a12b4f1 100644 --- a/srcpkgs/qt6-webchannel/template +++ b/srcpkgs/qt6-webchannel/template @@ -1,7 +1,7 @@ # Template file for 'qt6-webchannel' pkgname=qt6-webchannel version=6.5.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel" @@ -31,7 +31,6 @@ qt6-webchannel-devel_package() { vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes - vmove usr/lib/qt6/qml/QtWebChannel/qmldir vmove "usr/lib/*.so" vmove "usr/lib/*.prl" vmove usr/lib/qt6/modules