Skip to content

Commit

Permalink
Revert "Remove drop_lrelease_dependency.patch"
Browse files Browse the repository at this point in the history
This reverts commit 3b6c56c.
  • Loading branch information
barton2526 committed Apr 8, 2022
1 parent d71b175 commit bc48e30
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
3 changes: 2 additions & 1 deletion depends/packages/qt.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no
$(package)_patches += dont_hardcode_x86_64.patch fix_montery_include.patch
$(package)_patches += fix_android_jni_static.patch dont_hardcode_pwd.patch
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch
$(package)_patches += fix_bigsur_style.patch no_qrhi.patch subdirs.pro
$(package)_patches += fix_bigsur_style.patch no_qrhi.patch drop_lrelease_dependency.patch subdirs.pro

$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
$(package)_qttranslations_sha256_hash=d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8
Expand Down Expand Up @@ -247,6 +247,7 @@ endef
# CROSS_LIBRARY_PATH. See #15277.
define $(package)_preprocess_cmds
rm -f $(BASEDIR)/.qmake.stash && \
patch -p1 -i $($(package)_patch_dir)/drop_lrelease_dependency.patch && \
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_x86_64.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
Expand Down
20 changes: 20 additions & 0 deletions depends/patches/qt/drop_lrelease_dependency.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
commit 67b3ed7406e1d0762188dbad2c44a06824ba0778
Author: fanquake <[email protected]>
Date: Tue Aug 18 15:24:01 2020 +0800

Drop dependency on lrelease

Qts buildsystem insists on using the installed lrelease, but gets
confused about how to find it. Since we manually control the build
order, just drop the dependency.

See #9469

diff --git a/qttranslations/translations/translations.pro b/qttranslations/translations/translations.pro
index 694544c..eff339d 100644
--- a/qttranslations/translations/translations.pro
+++ b/qttranslations/translations/translations.pro
@@ -107,3 +107,2 @@ updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
silent:updateqm.commands = @echo lrelease ${QMAKE_FILE_IN} && $$updateqm.commands
-updateqm.depends = $$LRELEASE_EXE
updateqm.name = LRELEASE ${QMAKE_FILE_IN}
2 changes: 2 additions & 0 deletions depends/patches/qt/no_qrhi.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
This can be removed when QT6 is introduced.

--- a/qtbase/src/gui/gui.pro
+++ b/qtbase/src/gui/gui.pro
@@ -49,7 +49,6 @@
Expand Down

0 comments on commit bc48e30

Please sign in to comment.