From d2782ed91ce1e5c058e35ce1e6517b90957132e1 Mon Sep 17 00:00:00 2001
From: gambas <g4mba5@gmail.com>
Date: Wed, 19 Sep 2018 20:51:13 +0200
Subject: [PATCH] WebView: Temporarily redirect stderr to /dev/null when
 creating the first WebView, to get rid of spurious libpng warnings on PNG
 files integrated inside the Qt WebKit library.

[GB.QT4.WEBKIT]
* BUG: WebView: Temporarily redirect stderr to /dev/null when creating the first WebView, to get rid of spurious libpng warnings on PNG files integrated inside the Qt WebKit library.

[GB.QT5.WEBKIT]
* BUG: WebView: Temporarily redirect stderr to /dev/null when creating the first WebView, to get rid of spurious libpng warnings on PNG files integrated inside the Qt WebKit library.
---
 gb.qt4/src/webkit/control/webview.png | Bin 1189 -> 1160 bytes
 gb.qt4/src/webkit/cwebview.cpp        |  18 ++++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/gb.qt4/src/webkit/control/webview.png b/gb.qt4/src/webkit/control/webview.png
index 9c8dbf4664759cc8a9ee814e537e013758b4f58d..7b9ef3e26d3d764a819d70db6792a28351728d25 100644
GIT binary patch
delta 1140
zcmV-)1dIEn35W@hBYy->Nkl<ZSi{Yi-ES2|7{-6^?AbjZ<!C9kw47Q&TZ2L<g2aS)
zK}@)@ew&ym5tI-KUKsxc5>31nLr6`z@x}`iyfH?U3sEEiAt*&4K;^3kX;0hJ!fAWD
zyEEg(E|k_DI8-c7@?<izJ9(dZ-kEowmF?TNziO@R1nQaFR(}wYtqE&w=awy7>T|i=
zoJP;*^YvX_U7ZS;^WXq+%z8EFk*Br$P9QOxMLnaIejh>$#R*LiYL?X|SekYII|Abd
z4i8y+%a-RG6m@PiKkO-9*jJ#Wg_atZx0a;Y+?F9(rM6YQc6<c(T-H2M1M3$Efwr6~
z`n<Tek1x)SQh(z(pe>iKhkVjqV%^>%M~A|DL*SQ!<*zY=2V5An_!_=ETjHypG0GwA
zK3$@(q`@dK0!DGAWO(z(65sR&|1Jf;4;dO9p~)43q)_w?AO1YRk%EsE!77DVKndL1
zi!fmfyG~8;aK@p%uJS%BJ{b$4R0eG=zP4QVH6I-s;D2zRk1>L^3PP|}usRxBBUq!b
z2CP+_88#feswwMPq~QAtWfInKVqk)cBLSO#xXSSX9}Hjxw2gWraSvz#W8+i^FE@KU
z`;f!F-pc2pVhTPzQsB?w5G%r}hBU+D7DPZ|&Z6RR3>3(XdBysi%Ns2oz6Q_Sr2;1h
z19}ES(tnPF)xyy}e^OpeEVE2P$FduRHH!MA!^YO+&Gcnm;g5l!dIIN0prf^x_g2)!
za!;3?nPrdXG6G^D(33b{G}RO6A6EpDCgUbp-;xEZViGC}cw=l-M8c?>&%`R~Qx3jn
z3QGQ6oB^W^doLOe<l(tSm!_1%+J`f=&G$Gx6n{_{Hyp_OfCUww1p}f4YoNQ|a(0pC
zk?iFDEK)szhIAzRsD|%)6_3rUVO>iafLu0OvgCmThpvX4DH=c!6{{nPasZvjC)m*D
zAWFFATUO`X>Ipo#Kt=f`%HN|8dIZz%@~VYNRxV8P@xc<siTIp|L^lD;;Fw~^u@I|$
zP=5(Fwx_Bm@OYhKaaM7D*dV|&je;K&n%+KGo#D4W&B;N_nd0<!9FP=?YZa~YXD&Gv
z3(<yU3D6)0`bYW4p}GM_gw>4+-d^VNN^7)c3XHI6xmzhrWdiTEyENB;2`yir3h~3K
z*J>tQ7&1}nZb8dDVN?4o2qY8m`Acb%0)M?l!~XLj<uEENGoe_v9LwvdP{r^Bc6KE3
zZsSvK`#E0GsMyhwA}N;rJt2F#1N@K~(SLpF?vrBqtRux!i*E0d?&yd*mL_P*W_W*3
znZA+84@__83WlSXb(C|UrB<=)^%N@?-Pxj5Wyx0M9DdqX!|uaAm#!Hy-ege;v~A_v
z6H%F4vOuxvX^(f-cz9Ksy{bK-mw;_+Jpg{~HFRIm6vr*DE9`tN&GIIPwpqCRS-Ijh
z&5AY6_r}rR_y2<b1%X07pP%!<am+$OM7DNyb=|k$^S=R*89p_|U-K;h0000<MNUMn
GLSTY3bSIMl

delta 1170
zcmV;D1a13>38e{;BYyx1a7bBm000ie000ie0hKEb8vp<VS4l)cR9J=0m)~zxMHI(B
zXYSp*Kgwz;wzO=ipshh66hUG_d>|&gSbv+CC=rwp2|gJA1rkks6+=i(dGW;u6MQj7
zlm}5H0U;;_N`T6*F4At>ZDHGP@7|g5;a(`MyJc;#ILSAYnSZ&H^PTTGbM6`0wQJXF
z*4j>>p80J#5!vBdYdg1Z-(H`|Waia+Hk+;Q>gwuLz`Pp=h-}uYdAB^HJ#Yf<TsHNN
zSq6LvEaWFOr9iW?)@4Q7`R@o!7&ta;=_^`ZXi(I}!ub(T@#4W81ueAH#CUsol5K4%
z;#F!})n}(hVSoQM&672-X^~LUmY%%NO9%S-^1>K3jsx0q^;W>A-32xt$a7*ixIYAb
z%~}2$H+aD1F^jL^s|y9b?j5HXz`k<@`U@J20wZ7)*9(TXek$;7U+JC%W_7_I!-fV&
zXo?A?xRCb^AN?}O@tltp!77DVKndL4i!f;ndwV8XntyU=ud95{iYwy*6pEm&#n+Zw
zzUJejgB<JkF-EXfK>*eYR)=G21Zx!5fVGPABZeb4G(}zckQE91aJh(U4W|buxiVT}
z+mAOmHRyu@tbn#*ZzSpgEnsZq3gMMzkLMn7IM`P?9xA%vv*S7b90{-@tZhg#GGRdk
zB;qV88h=MXf!v-~Y|6xVv&F;L;F*7^z}cY^y+Z*>$H8jhM87{JuO^aNrl2F)jlvp5
zecWM7Yy6J;(lO!8VEKS7OW@)tbhOs;{_46&Zf3|%dD)}6lz><$=_y>wmzSX|fq@A{
zNs^>uE}L4?U{ypyg$8erjS5K^b!SbiqCVl^Yk#Jp;Fotn*%&a|aNvsJa2B3#jM0>E
z*swH3+d_|X!zFSPhQnDOu%Mz?Fd#~>2D%3<7nW!qO;4TABGnUUNQSbHY52ZR@%Vxo
zHnt=I$fUz9%O7$%dL!U`-T;EANF7lWOVD|0lFe-nqJ*2iWnCs#J%OhdsnFkq{(J0U
zkAKpPyS#RBoHdK%d~&2felm&^k?<y985&pYJ{e%O56Wdrd!l**Pt+-vr4^S(3<5mc
zDEJYfneD@MDSq$QoE@^9&(HkE0ZFi|R?)h!e9Ebqh&HcuL4z0=7~>y7bsLTd>l$6&
zSsCNi)^N`>7-8$G^77A0;Jx-3%{5>G%YQdL0e&$3T9w1)VH3LUF0?EVwzkiKK-`5d
zUQQAh=*t@pT?!}$VPYwVe9>|;tHVSU!4ufi5yzXQPMP(0yt+}byCXqdEQfjn_IH=?
z1Il9H*7VcI#qxPaf~S|vUM1bLBI;P-(v(i|!TuusqhUQTvt7&?PF&NW&w-X&#ed#6
z60Et0@u~;_tj#$5yt9UV$9%5dG^D(#q*BtB?@otlZuug`)@MB4UGL#lS?pC^6M8P}
z+~5K5Tc4r(x+XtiiN%CHuP0g6<j^*UDt}H@@%m=P`sVvn(LeBa!T*9lE}PBHyWz-Y
k&J~dzU0q!d?0Nn-kQqKT_S`Z701E&B07*qoM6N<$g2W6r(EtDd

diff --git a/gb.qt4/src/webkit/cwebview.cpp b/gb.qt4/src/webkit/cwebview.cpp
index e41efc2bb..d1cc84694 100644
--- a/gb.qt4/src/webkit/cwebview.cpp
+++ b/gb.qt4/src/webkit/cwebview.cpp
@@ -64,6 +64,7 @@ DECLARE_EVENT(EVENT_DOWNLOAD);
 static QNetworkAccessManager *_network_access_manager = 0;
 static CWEBVIEW *_network_access_manager_view = 0;
 static QT_COLOR_FUNC _old_after_set_color;
+static bool _ignore_png_warnings = false;
 
 /*
 static WEBVIEW_ACTION _actions[] = 
@@ -203,7 +204,24 @@ static void stop_view(void *_object)
 
 BEGIN_METHOD(WebView_new, GB_OBJECT parent)
 
+	int fd_save = -1;
+	
+	if (!_ignore_png_warnings)
+	{
+		int fd = ::open("/dev/null", O_RDWR);
+		fd_save = ::dup(2);
+		::dup2(fd, 2);
+		::close(fd);
+	}
+
   MyWebView *wid = new MyWebView(QT.GetContainer(VARG(parent)));
+	
+	if (!_ignore_png_warnings)
+	{
+		::dup2(fd_save, 2);
+		::close(fd_save);
+		_ignore_png_warnings = true;
+	}
 
   QT.InitWidget(wid, _object, false);