PR#1: Add missing unpackaged files for QtGraphicalEffects - rpms/qt6-qt5compat

rpms / qt6-qt5compat

#1 Add missing unpackaged files for QtGraphicalEffects

Merged 2 years ago by jgrulich. Opened 2 years ago by uklotzde.

rpms/ uklotzde/qt6-qt5compat bug2047369-graphicaleffects into rawhide

Add missing unpackaged files for QtGraphicalEffects

Uwe Klotz • 2 years ago

3dd7b03

qt6-qt5compat.spec

file modified

+9 -1

		`@@ -12,7 +12,7 @@`
		`Summary: Qt6 - Qt 5 Compatibility Libraries`
		`Name: qt6-%{qt_module}`
		`Version: 6.2.2`
		`- Release: 2%{?dist}`
		`+ Release: 3%{?dist}`

		`License: LGPLv3`
		`Url: http://www.qt.io`
		`@@ -34,6 +34,9 @@`
		`BuildRequires: ninja-build`
		`BuildRequires: qt6-qtbase-devel >= %{version}`
		`BuildRequires: qt6-qtbase-private-devel`
		`+ # qt6-qtdeclarative is required for QtGraphicalEffects`
		`+ BuildRequires: qt6-qtdeclarative-devel`
		`+ BuildRequires: pkgconfig(xkbcommon)`
		`%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}`
		`BuildRequires: libicu-devel`

		`@@ -80,12 +83,14 @@`
		`%files`
		`%license LICENSE.*`
		`%{_qt6_libdir}/libQt6Core5Compat.so.6*`
		`+ %{_qt6_libdir}/qt6/qml/Qt5Compat/GraphicalEffects/*`

		`%files devel`
		`%{_qt6_headerdir}/QtCore5Compat/`
		`%{_qt6_libdir}/libQt6Core5Compat.prl`
		`%{_qt6_libdir}/libQt6Core5Compat.so`
		`%{_qt6_libdir}/cmake/Qt6/FindWrapIconv.cmake`
		`+ %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake`
		`%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/Qt5CompatTestsConfig.cmake`
		`%dir %{_qt6_libdir}/cmake/Qt6Core5Compat/`
		`%{_qt6_libdir}/cmake/Qt6Core5Compat/*.cmake`
		`@@ -94,6 +99,9 @@`
		`%{_qt6_libdir}/metatypes/qt6*_metatypes.json`

		`%changelog`
		`+ * Mon Jan 31 2022 Uwe Klotz <uwe.klotz@gmail.com> - 6.2.2-3`
		`+ - Add missing unpackaged files for QtGraphicalEffects`
		`+`
		`* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.2-2`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild`

uklotzde commented 2 years ago

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2047369
Needs to be backported to f35/f34

Use case: https://github.com/mixxxdj/mixxx/pull/4649#pullrequestreview-867545014

jgrulich commented 2 years ago

I think you need to add BuildRequires: qt6-qtdeclarative-devel.

rebased onto 01c4e09

2 years ago

uklotzde commented 2 years ago

Thanks for the hint. I have force pushed the branch to fix last commit.

This adds dependencies on libQt6Qml and libQt6Quick as expected.

jgrulich commented 2 years ago

Probably "BuildRequires: pkgconfig(xkbcommon) >= 0.4.1" is needed as well. I think I had same problem with some Qt6 module.

uklotzde commented 2 years ago

Thanks again :) The minimum required version according to the log is 0.5.0.

Why not add BuildRequires: libxkbcommon-devel then?

jgrulich commented 2 years ago

Thanks again :) The minimum required version according to the log is 0.5.0.

Why not add BuildRequires: libxkbcommon-devel then?

In that case only BuildRequires: pkgconfig(xkbcommon). This will result into the same, it's just that using pkgconfig(foo) will work in case the package gets renamed etc.

rebased onto 3dd7b03

2 years ago

uklotzde commented 2 years ago

I wasn't aware of that renaming consideration, thanks for the explanation!

Btw, do you have an idea why the local package builds fail as expected whereas the CI builds succeed in case of unpackaged files? I also noticed this for rubberband recently.

jgrulich commented 2 years ago

Because on your local machine you have all the dependencies installed, while in the CI (Koji) you have only dependencies that are specified in the SPEC file.