Skip to content

Commit bc48e30

Browse files
committed
Revert "Remove drop_lrelease_dependency.patch"
This reverts commit 3b6c56c.
1 parent d71b175 commit bc48e30

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

depends/packages/qt.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no
1010
$(package)_patches += dont_hardcode_x86_64.patch fix_montery_include.patch
1111
$(package)_patches += fix_android_jni_static.patch dont_hardcode_pwd.patch
1212
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch
13-
$(package)_patches += fix_bigsur_style.patch no_qrhi.patch subdirs.pro
13+
$(package)_patches += fix_bigsur_style.patch no_qrhi.patch drop_lrelease_dependency.patch subdirs.pro
1414

1515
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
1616
$(package)_qttranslations_sha256_hash=d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8
@@ -247,6 +247,7 @@ endef
247247
# CROSS_LIBRARY_PATH. See #15277.
248248
define $(package)_preprocess_cmds
249249
rm -f $(BASEDIR)/.qmake.stash && \
250+
patch -p1 -i $($(package)_patch_dir)/drop_lrelease_dependency.patch && \
250251
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
251252
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_x86_64.patch && \
252253
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
commit 67b3ed7406e1d0762188dbad2c44a06824ba0778
2+
Author: fanquake <[email protected]>
3+
Date: Tue Aug 18 15:24:01 2020 +0800
4+
5+
Drop dependency on lrelease
6+
7+
Qts buildsystem insists on using the installed lrelease, but gets
8+
confused about how to find it. Since we manually control the build
9+
order, just drop the dependency.
10+
11+
See #9469
12+
13+
diff --git a/qttranslations/translations/translations.pro b/qttranslations/translations/translations.pro
14+
index 694544c..eff339d 100644
15+
--- a/qttranslations/translations/translations.pro
16+
+++ b/qttranslations/translations/translations.pro
17+
@@ -107,3 +107,2 @@ updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
18+
silent:updateqm.commands = @echo lrelease ${QMAKE_FILE_IN} && $$updateqm.commands
19+
-updateqm.depends = $$LRELEASE_EXE
20+
updateqm.name = LRELEASE ${QMAKE_FILE_IN}

depends/patches/qt/no_qrhi.patch

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
This can be removed when QT6 is introduced.
2+
13
--- a/qtbase/src/gui/gui.pro
24
+++ b/qtbase/src/gui/gui.pro
35
@@ -49,7 +49,6 @@

0 commit comments

Comments
 (0)