Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(x11/kf6-kwindowsystem): Fix qml and plugins directory #20794

Merged
merged 1 commit into from
Jul 9, 2024

Conversation

Biswa96
Copy link
Member

@Biswa96 Biswa96 commented Jul 7, 2024

This fixes the following warning while running lxqt.
kf.windowsystem: Could not find any platform plugin.

The cmake options move plugin files from lib/plugins to lib/qt6/plugins
and qml files from lib/qml to lib/qt6/qml. The new paths are set by
TERMUX_PKG_EXTRA_CONFIGURE_ARGS in qt6-qtbase.

This fixes the following warning while running lxqt.
kf.windowsystem: Could not find any platform plugin.

The cmake options move plugin files from lib/plugins to lib/qt6/plugins
and qml files from lib/qml to lib/qt6/qml. The new paths are set by
TERMUX_PKG_EXTRA_CONFIGURE_ARGS in qt6-qtbase.
@Biswa96
Copy link
Member Author

Biswa96 commented Jul 7, 2024

Would it be possible to move the new options in scripts/build/configure/termux_step_configure_cmake.sh file? Otherwise, those options need to be added in many build scripts.

The condition could be like this - if TERMUX_PKG_BUILD_DEPENDS has extra_cmake_modules add KDE_INSTALL_QMLDIR and KDE_INSTALL_QTPLUGINDIR options with cmake command. Fedora has a nice list of correct install directories for qt6/kde6 https://src.fedoraproject.org/rpms/qt6/blob/rawhide/f/macros.qt6

@Biswa96
Copy link
Member Author

Biswa96 commented Jul 7, 2024

Click here to see the list of changed files in kf6-kwindowsystem after this change
@@ -56,19 +56,20 @@
 ./data/data/com.termux/files/usr/lib/libKF6WindowSystem.so.6.3.0
 ./data/data/com.termux/files/usr/lib/pkgconfig/
 ./data/data/com.termux/files/usr/lib/pkgconfig/KF6WindowSystem.pc
-./data/data/com.termux/files/usr/lib/plugins/
-./data/data/com.termux/files/usr/lib/plugins/kf6/
-./data/data/com.termux/files/usr/lib/plugins/kf6/kwindowsystem/
-./data/data/com.termux/files/usr/lib/plugins/kf6/kwindowsystem/KF6WindowSystemKWaylandPlugin.so
-./data/data/com.termux/files/usr/lib/plugins/kf6/kwindowsystem/KF6WindowSystemX11Plugin.so
-./data/data/com.termux/files/usr/lib/qml/
-./data/data/com.termux/files/usr/lib/qml/org/
-./data/data/com.termux/files/usr/lib/qml/org/kde/
-./data/data/com.termux/files/usr/lib/qml/org/kde/kwindowsystem/
-./data/data/com.termux/files/usr/lib/qml/org/kde/kwindowsystem/kde-qmlmodule.version
-./data/data/com.termux/files/usr/lib/qml/org/kde/kwindowsystem/KWindowSystem.qmltypes
-./data/data/com.termux/files/usr/lib/qml/org/kde/kwindowsystem/libKWindowSystem.so
-./data/data/com.termux/files/usr/lib/qml/org/kde/kwindowsystem/qmldir
+./data/data/com.termux/files/usr/lib/qt6/
+./data/data/com.termux/files/usr/lib/qt6/plugins/
+./data/data/com.termux/files/usr/lib/qt6/plugins/kf6/
+./data/data/com.termux/files/usr/lib/qt6/plugins/kf6/kwindowsystem/
+./data/data/com.termux/files/usr/lib/qt6/plugins/kf6/kwindowsystem/KF6WindowSystemKWaylandPlugin.so
+./data/data/com.termux/files/usr/lib/qt6/plugins/kf6/kwindowsystem/KF6WindowSystemX11Plugin.so
+./data/data/com.termux/files/usr/lib/qt6/qml/
+./data/data/com.termux/files/usr/lib/qt6/qml/org/
+./data/data/com.termux/files/usr/lib/qt6/qml/org/kde/
+./data/data/com.termux/files/usr/lib/qt6/qml/org/kde/kwindowsystem/
+./data/data/com.termux/files/usr/lib/qt6/qml/org/kde/kwindowsystem/kde-qmlmodule.version
+./data/data/com.termux/files/usr/lib/qt6/qml/org/kde/kwindowsystem/KWindowSystem.qmltypes
+./data/data/com.termux/files/usr/lib/qt6/qml/org/kde/kwindowsystem/libKWindowSystem.so
+./data/data/com.termux/files/usr/lib/qt6/qml/org/kde/kwindowsystem/qmldir
 ./data/data/com.termux/files/usr/share/
 ./data/data/com.termux/files/usr/share/doc/
 ./data/data/com.termux/files/usr/share/doc/kf6-kwindowsystem/

Copy link
Contributor

@truboxl truboxl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can go ahead and merge qt and kde related changes without waiting anyone next time. Just leave a note on the changes as usual. I probably will be busy from time to time.

@truboxl truboxl merged commit 36d850d into termux:master Jul 9, 2024
5 checks passed
@truboxl
Copy link
Contributor

truboxl commented Jul 9, 2024

Would it be possible to move the new options in scripts/build/configure/termux_step_configure_cmake.sh file? Otherwise, those options need to be added in many build scripts.

The condition could be like this - if TERMUX_PKG_BUILD_DEPENDS has extra_cmake_modules add KDE_INSTALL_QMLDIR and KDE_INSTALL_QTPLUGINDIR options with cmake command. Fedora has a nice list of correct install directories for qt6/kde6 https://src.fedoraproject.org/rpms/qt6/blob/rawhide/f/macros.qt6

Good idea. Can follow like for example:

if [ "$TERMUX_PKG_DEPENDS" != "${TERMUX_PKG_DEPENDS/libllvm/}" ] ||

@Biswa96 Biswa96 deleted the kde branch July 9, 2024 17:38
@Grimler91
Copy link
Member

The condition could be like this - if TERMUX_PKG_BUILD_DEPENDS has extra_cmake_modules add KDE_INSTALL_QMLDIR and KDE_INSTALL_QTPLUGINDIR options with cmake command

Does it need to check TERMUX_PKG_BUILD_DEPENDS for extra_cmake_modules, can't we just add KDE_INSTALL_QMLDIR and KDE_INSTALL_QTPLUGINDIR unconditionally to termux_step_configure_cmake? c

make gives a warning if option isn't used, but nothing breaks, so I am thinking it could work to just set the options always

@Biswa96
Copy link
Member Author

Biswa96 commented Jul 10, 2024

make gives a warning if option isn't used

But that warning will be shown for every other cmake based packages. Whereas there are handful of packages that use extra_cmake_modules. That is just my initial thought. Please feel free to add those options as you see fit or prefer.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants