File tree Expand file tree Collapse file tree 2 files changed +25
-1
lines changed Expand file tree Collapse file tree 2 files changed +25
-1
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ $(package)_qt_libs=corelib network widgets gui plugins testlib
11
11
$(package)_patches =fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch
12
12
$(package)_patches+ = fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch no-xlib.patch
13
13
$(package)_patches+ = fix_android_qmake_conf.patch fix_android_jni_static.patch dont_hardcode_pwd.patch
14
- $(package)_patches+ = freetype_back_compat.patch drop_lrelease_dependency.patch
14
+ $(package)_patches+ = freetype_back_compat.patch drop_lrelease_dependency.patch fix_powerpc_libpng.patch
15
15
16
16
# Update OSX_QT_TRANSLATIONS when this is updated
17
17
$(package)_qttranslations_file_name =qttranslations-$($(package ) _suffix)
@@ -194,6 +194,7 @@ endef
194
194
195
195
define $(package)_preprocess_cmds
196
196
patch -p1 -i $($(package ) _patch_dir) /freetype_back_compat.patch && \
197
+ patch -p1 -i $($(package ) _patch_dir) /fix_powerpc_libpng.patch && \
197
198
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package ) _extract_dir) /qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
198
199
patch -p1 -i $($(package ) _patch_dir) /drop_lrelease_dependency.patch && \
199
200
patch -p1 -i $($(package ) _patch_dir) /dont_hardcode_pwd.patch &&\
Original file line number Diff line number Diff line change
1
+ commit 6f9feb773a43c5abfa3455da2e324180e789285b
2
+ Author: fanquake <
[email protected] >
3
+ Date: Tue Sep 15 21:44:31 2020 +0800
4
+
5
+ Fix PowerPC build of libpng
6
+
7
+ See https://bugreports.qt.io/browse/QTBUG-66388.
8
+
9
+ Can be dropped when we are building qt 5.12.0 or later.
10
+
11
+ diff --git a/qtbase/src/3rdparty/libpng/libpng.pro b/qtbase/src/3rdparty/libpng/libpng.pro
12
+ index 577b61d8..a2f56669 100644
13
+ --- a/qtbase/src/3rdparty/libpng/libpng.pro
14
+ +++ b/qtbase/src/3rdparty/libpng/libpng.pro
15
+ @@ -10,7 +10,7 @@ MODULE_INCLUDEPATH = $$PWD
16
+
17
+ load(qt_helper_lib)
18
+
19
+ - DEFINES += PNG_ARM_NEON_OPT=0
20
+ + DEFINES += PNG_ARM_NEON_OPT=0 PNG_POWERPC_VSX_OPT=0
21
+ SOURCES += \
22
+ png.c \
23
+ pngerror.c \
You can’t perform that action at this time.
0 commit comments