Skip to content

Commit f07fb5a

Browse files
committed
build: patch qt libpng to fix powerpc build
This is an alternative to #19751 that fixes the build without requiring splitting out libpng. This patch can be dropped once we are building qt 5.12.0 or later.
1 parent 48a9968 commit f07fb5a

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

depends/packages/qt.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $(package)_qt_libs=corelib network widgets gui plugins testlib
1111
$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch
1212
$(package)_patches+= fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch no-xlib.patch
1313
$(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
1515

1616
# Update OSX_QT_TRANSLATIONS when this is updated
1717
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
@@ -194,6 +194,7 @@ endef
194194

195195
define $(package)_preprocess_cmds
196196
patch -p1 -i $($(package)_patch_dir)/freetype_back_compat.patch && \
197+
patch -p1 -i $($(package)_patch_dir)/fix_powerpc_libpng.patch && \
197198
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
198199
patch -p1 -i $($(package)_patch_dir)/drop_lrelease_dependency.patch && \
199200
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch &&\
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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 \

0 commit comments

Comments
 (0)