Skip to contentSkip to conversation

package/qt5webengine: fix translations target install path

PATCH New Peter Seiderer 3 participants 3 messages Feb 21, 2020 – Mar 14, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/qt5webengine: fix translations target install path

Through the evolution of the qt5webengine package patch ([1], [2]) until the initial commit ([3]) the translations target install path got mangled resulting in a double trailing qtwebengine_locales path:
/usr/translations/qtwebengine_locales/qtwebengine_locales
Instead of:
/usr/translations/qtwebengine_locales

Fixes the translations runtime access failure resulting in the following warning:

WARNING:resource_bundle_qt.cpp(116): locale_file_path.empty() for locale

[1] http://lists.busybox.net/pipermail/buildroot/2015-July/132010.html
[2] https://patchwork.ozlabs.org/patch/640633
[3] https://git.buildroot.net/buildroot/commit/?id=89080bac9bc47946a09c1e74f2f872363bf6785b

---
Changes v1 -> v2:
- re-add mkdir to fix translation installation path

---
 package/qt5/qt5webengine/qt5webengine.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/qt5/qt5webengine/qt5webengine.mk +2 -2
index 1d5ee8d819..898725937b 100644
@@ -90,8 +90,8 @@ define QT5WEBENGINE_INSTALL_TARGET_LIBS
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebEngine*.so.* $(TARGET_DIR)/usr/lib
 	cp -dpf $(STAGING_DIR)/usr/libexec/QtWebEngineProcess $(TARGET_DIR)/usr/libexec/
 	cp -dpfr $(STAGING_DIR)/usr/resources/ $(TARGET_DIR)/usr/
-	mkdir -p $(TARGET_DIR)/usr/translations/qtwebengine_locales/
-	cp -dpfr $(STAGING_DIR)/usr/translations/qtwebengine_locales $(TARGET_DIR)/usr/translations/qtwebengine_locales/
+	mkdir -p $(TARGET_DIR)/usr/translations/
+	cp -dpfr $(STAGING_DIR)/usr/translations/qtwebengine_locales $(TARGET_DIR)/usr/translations/
 endef
 endif
 
Signature · 1 line
2.25.0
#1 lore raw

PATCH v2 1/1 package/qt5webengine: fix translations target install path

Quoted 17 lines · On Fri, 21 Feb 2020 08:33:31 +0100 Peter Seiderer <[email protected]> wrote:

Through the evolution of the qt5webengine package patch ([1], [2]) until the initial commit ([3]) the translations target install path got mangled resulting in a double trailing qtwebengine_locales path:
/usr/translations/qtwebengine_locales/qtwebengine_locales
Instead of:
/usr/translations/qtwebengine_locales

Fixes the translations runtime access failure resulting in the following warning:

WARNING:resource_bundle_qt.cpp(116): locale_file_path.empty() for locale

[1] http://lists.busybox.net/pipermail/buildroot/2015-July/132010.html
[2] https://patchwork.ozlabs.org/patch/640633
[3] https://git.buildroot.net/buildroot/commit/?id=89080bac9bc47946a09c1e74f2f872363bf6785b

Quoted 7 lines

---
Changes v1 -> v2:
- re-add mkdir to fix translation installation path

---
 package/qt5/qt5webengine/qt5webengine.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v2 1/1 package/qt5webengine: fix translations target install path

In reply to Peter Seiderer
Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Through the evolution of the qt5webengine package patch ([1], [2]) until the initial commit ([3]) the translations target install path got mangled resulting in a double trailing qtwebengine_locales path:
/usr/translations/qtwebengine_locales/qtwebengine_locales
Instead of:
/usr/translations/qtwebengine_locales

Fixes the translations runtime access failure resulting in the following warning:

WARNING:resource_bundle_qt.cpp(116): locale_file_path.empty() for locale

Quoted 8 lines

[1] http://lists.busybox.net/pipermail/buildroot/2015-July/132010.html
[2] https://patchwork.ozlabs.org/patch/640633
[3] https://git.buildroot.net/buildroot/commit/?id=89080bac9bc47946a09c1e74f2f872363bf6785b

---
Changes v1 -> v2:
- re-add mkdir to fix translation installation path

Committed to 2019.02.x and 2019.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard