Attachment #866016 for bug #893718




    if(wxUSE_WEBVIEW)
        if(WXGTK)
            if(wxUSE_WEBVIEW_WEBKIT)
                set(WEBKIT_LIBSOUP_VERSION 2.4)
                if(WXGTK2)
                    find_package(WEBKIT 1.0)
                elseif(WXGTK3)
                    find_package(WEBKIT2 4.1 QUIET)
                    if(WEBKIT2_FOUND)
                        set(WEBKIT_LIBSOUP_VERSION 3.0)
                    else()
                        find_package(WEBKIT2 4.0)
                    endif()
                    if(NOT WEBKIT2_FOUND)
                        find_package(WEBKIT 3.0)
                    endif()
                endif()
                find_package(LIBSOUP ${WEBKIT_LIBSOUP_VERSION})
            endif()
            set(wxUSE_WEBVIEW_WEBKIT OFF)
            set(wxUSE_WEBVIEW_WEBKIT2 OFF)




# LibSoup does not provide an easy way to retrieve its version other than its
# .pc file, so we need to rely on PC_LIBSOUP_VERSION and REQUIRE the .pc file
# to be found.
SET(LIBSOUP_VERSION 2.4)
if(DEFINED LIBSOUP_FIND_VERSION)
    SET(LIBSOUP_VERSION ${LIBSOUP_FIND_VERSION})
endif()

set(LIBSOUP_INCLUDE_DIRS LIBSOUP_INCLUDE_DIRS-NOTFOUND)
set(LIBSOUP_LIBRARIES LIBSOUP_LIBRARIES-NOTFOUND)

FIND_PACKAGE(PkgConfig)
PKG_CHECK_MODULES(PC_LIBSOUP QUIET libsoup-${LIBSOUP_VERSION})

if(PC_LIBSOUP_FOUND)
    FIND_PATH(LIBSOUP_INCLUDE_DIRS
        NAMES libsoup/soup.h
        HINTS ${PC_LIBSOUP_INCLUDEDIR}
        ${PC_LIBSOUP_INCLUDE_DIRS}
        PATH_SUFFIXES libsoup-${LIBSOUP_VERSION}
        )

    FIND_LIBRARY(LIBSOUP_LIBRARIES
        NAMES soup-${LIBSOUP_VERSION}
        HINTS ${PC_LIBSOUP_LIBDIR}
        ${PC_LIBSOUP_LIBRARY_DIRS}
        )

Lines 5-11 Link Here

(-)a/build/cmake/modules/FindWEBKIT2.cmake (-1 / +4 lines)
5	# WEBKIT2_LIBRARIES - List of libraries when using Webkit2.	5	# WEBKIT2_LIBRARIES - List of libraries when using Webkit2.
6	# WEBKIT2_FOUND - True if Webkit2 found.	6	# WEBKIT2_FOUND - True if Webkit2 found.
7		7
8	SET( WEBKIT2_VERSION 4.0)	8	SET(WEBKIT2_VERSION 4.0)
		9	if(DEFINED WEBKIT2_FIND_VERSION)
		10	SET(WEBKIT2_VERSION ${WEBKIT2_FIND_VERSION})
		11	endif()
9		12
10	set(WEBKIT2_INCLUDE_DIR WEBKIT2_INCLUDE_DIR-NOTFOUND)	13	set(WEBKIT2_INCLUDE_DIR WEBKIT2_INCLUDE_DIR-NOTFOUND)
11	set(WEBKIT2_LIBRARY WEBKIT2_LIBRARY-NOTFOUND)	14	set(WEBKIT2_LIBRARY WEBKIT2_LIBRARY-NOTFOUND)




        pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS"
    else
        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.1\""; } >&5
  ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.1") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
  pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit2gtk-4.1" 2>/dev/null`
else
  pkg_failed=yes
fi

        pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS"
    else
        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.1\""; } >&5
  ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.1") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
  pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit2gtk-4.1" 2>/dev/null`
else
  pkg_failed=yes
fi

        _pkg_short_errors_supported=no
fi
        if test $_pkg_short_errors_supported = yes; then
	        WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "webkit2gtk-4.1"`
        else
	        WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit2gtk-4.1"`
        fi
	# Put the nasty error message in config.log where it belongs
	echo "$WEBKIT_PKG_ERRORS" >&5

        ;;
esac
if test "$wxUSE_STC" = "yes" ; then
    wxconfig_3rdparty="scintilla lexilla $wxconfig_3rdparty"
fi
case "$wxUSE_EXPAT" in
    builtin)




        if test "$wxUSE_GTK" = 1; then
            if test "$WXGTK3" = 1; then
                PKG_CHECK_MODULES([WEBKIT],
                                  [webkit2gtk-4.1],
                                  [
                                    USE_WEBVIEW_WEBKIT2=1
                                    CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS"
                                    EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
                                  ],
                                  [
                                    AC_MSG_WARN([webkit2gtk-4.1 not found, falling back to webkitgtk])
                                  ])
            fi
            if test "$USE_WEBVIEW_WEBKIT2" = 0; then

        ;;
esac
if test "$wxUSE_STC" = "yes" ; then
    wxconfig_3rdparty="scintilla lexilla $wxconfig_3rdparty"
fi
case "$wxUSE_EXPAT" in
    builtin)




    {
        switch (error->code)
        {
#if SOUP_MAJOR_VERSION < 3
            case SOUP_STATUS_CANCELLED:
                type = wxWEBVIEW_NAV_ERR_USER_CANCELLED;
                break;

            case SOUP_STATUS_CANT_RESOLVE:
#endif
            case SOUP_STATUS_NOT_FOUND:
                type = wxWEBVIEW_NAV_ERR_NOT_FOUND;
                break;

#if SOUP_MAJOR_VERSION < 3
            case SOUP_STATUS_CANT_RESOLVE_PROXY:
            case SOUP_STATUS_CANT_CONNECT:
            case SOUP_STATUS_CANT_CONNECT_PROXY:

            case SOUP_STATUS_MALFORMED:
                type = wxWEBVIEW_NAV_ERR_REQUEST;
                break;
#endif

            case SOUP_STATUS_BAD_REQUEST:
                type = wxWEBVIEW_NAV_ERR_REQUEST;

Return to bug 893718

Lines 439-453 Link Here

(-)a/build/cmake/init.cmake (-2 / +8 lines)
439	if(wxUSE_WEBVIEW)	439	if(wxUSE_WEBVIEW)
440	if(WXGTK)	440	if(WXGTK)
441	if(wxUSE_WEBVIEW_WEBKIT)	441	if(wxUSE_WEBVIEW_WEBKIT)
442	find_package(LIBSOUP)	442	set(WEBKIT_LIBSOUP_VERSION 2.4)
443	if(WXGTK2)	443	if(WXGTK2)
444	find_package(WEBKIT 1.0)	444	find_package(WEBKIT 1.0)
445	elseif(WXGTK3)	445	elseif(WXGTK3)
446	find_package(WEBKIT2)	446	find_package(WEBKIT2 4.1 QUIET)
		447	if(WEBKIT2_FOUND)
		448	set(WEBKIT_LIBSOUP_VERSION 3.0)
		449	else()
		450	find_package(WEBKIT2 4.0)
		451	endif()
447	if(NOT WEBKIT2_FOUND)	452	if(NOT WEBKIT2_FOUND)
448	find_package(WEBKIT 3.0)	453	find_package(WEBKIT 3.0)
449	endif()	454	endif()
450	endif()	455	endif()
		456	find_package(LIBSOUP ${WEBKIT_LIBSOUP_VERSION})
451	endif()	457	endif()
452	set(wxUSE_WEBVIEW_WEBKIT OFF)	458	set(wxUSE_WEBVIEW_WEBKIT OFF)
453	set(wxUSE_WEBVIEW_WEBKIT2 OFF)	459	set(wxUSE_WEBVIEW_WEBKIT2 OFF)

Lines 31-49 Link Here

(-)a/build/cmake/modules/FindLIBSOUP.cmake (-3 / +11 lines)
31	# LibSoup does not provide an easy way to retrieve its version other than its	31	# LibSoup does not provide an easy way to retrieve its version other than its
32	# .pc file, so we need to rely on PC_LIBSOUP_VERSION and REQUIRE the .pc file	32	# .pc file, so we need to rely on PC_LIBSOUP_VERSION and REQUIRE the .pc file
33	# to be found.	33	# to be found.
		34	SET(LIBSOUP_VERSION 2.4)
		35	if(DEFINED LIBSOUP_FIND_VERSION)
		36	SET(LIBSOUP_VERSION ${LIBSOUP_FIND_VERSION})
		37	endif()
		38
		39	set(LIBSOUP_INCLUDE_DIRS LIBSOUP_INCLUDE_DIRS-NOTFOUND)
		40	set(LIBSOUP_LIBRARIES LIBSOUP_LIBRARIES-NOTFOUND)
		41
34	FIND_PACKAGE(PkgConfig)	42	FIND_PACKAGE(PkgConfig)
35	PKG_CHECK_MODULES(PC_LIBSOUP QUIET libsoup-2.4)	43	PKG_CHECK_MODULES(PC_LIBSOUP QUIET libsoup-${LIBSOUP_VERSION})
36		44
37	if(PC_LIBSOUP_FOUND)	45	if(PC_LIBSOUP_FOUND)
38	FIND_PATH(LIBSOUP_INCLUDE_DIRS	46	FIND_PATH(LIBSOUP_INCLUDE_DIRS
39	NAMES libsoup/soup.h	47	NAMES libsoup/soup.h
40	HINTS ${PC_LIBSOUP_INCLUDEDIR}	48	HINTS ${PC_LIBSOUP_INCLUDEDIR}
41	${PC_LIBSOUP_INCLUDE_DIRS}	49	${PC_LIBSOUP_INCLUDE_DIRS}
42	PATH_SUFFIXES libsoup-2.4	50	PATH_SUFFIXES libsoup-${LIBSOUP_VERSION}
43	)	51	)
44		52
45	FIND_LIBRARY(LIBSOUP_LIBRARIES	53	FIND_LIBRARY(LIBSOUP_LIBRARIES
46	NAMES soup-2.4	54	NAMES soup-${LIBSOUP_VERSION}
47	HINTS ${PC_LIBSOUP_LIBDIR}	55	HINTS ${PC_LIBSOUP_LIBDIR}
48	${PC_LIBSOUP_LIBRARY_DIRS}	56	${PC_LIBSOUP_LIBRARY_DIRS}
49	)	57	)

Lines 41737-41748 Link Here

(-)a/configure (-9 / +9 lines)
41737	pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS"	41737	pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS"
41738	else	41738	else
41739	if test -n "$PKG_CONFIG" && \	41739	if test -n "$PKG_CONFIG" && \
41740	{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.0\""; } >&5	41740	{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.1\""; } >&5
41741	($PKG_CONFIG --exists --print-errors "webkit2gtk-4.0") 2>&5	41741	($PKG_CONFIG --exists --print-errors "webkit2gtk-4.1") 2>&5
41742	ac_status=$?	41742	ac_status=$?
41743	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5	41743	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
41744	test $ac_status = 0; }; then	41744	test $ac_status = 0; }; then
41745	pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit2gtk-4.0" 2>/dev/null`	41745	pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit2gtk-4.1" 2>/dev/null`
41746	else	41746	else
41747	pkg_failed=yes	41747	pkg_failed=yes
41748	fi	41748	fi
Lines 41755-41766 Link Here
41755	pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS"	41755	pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS"
41756	else	41756	else
41757	if test -n "$PKG_CONFIG" && \	41757	if test -n "$PKG_CONFIG" && \
41758	{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.0\""; } >&5	41758	{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.1\""; } >&5
41759	($PKG_CONFIG --exists --print-errors "webkit2gtk-4.0") 2>&5	41759	($PKG_CONFIG --exists --print-errors "webkit2gtk-4.1") 2>&5
41760	ac_status=$?	41760	ac_status=$?
41761	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5	41761	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
41762	test $ac_status = 0; }; then	41762	test $ac_status = 0; }; then
41763	pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit2gtk-4.0" 2>/dev/null`	41763	pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit2gtk-4.1" 2>/dev/null`
41764	else	41764	else
41765	pkg_failed=yes	41765	pkg_failed=yes
41766	fi	41766	fi
Lines 41779-41787 Link Here
41779	_pkg_short_errors_supported=no	41779	_pkg_short_errors_supported=no
41780	fi	41780	fi
41781	if test $_pkg_short_errors_supported = yes; then	41781	if test $_pkg_short_errors_supported = yes; then
41782	WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "webkit2gtk-4.0"`	41782	WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "webkit2gtk-4.1"`
41783	else	41783	else
41784	WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit2gtk-4.0"`	41784	WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit2gtk-4.1"`
41785	fi	41785	fi
41786	# Put the nasty error message in config.log where it belongs	41786	# Put the nasty error message in config.log where it belongs
41787	echo "$WEBKIT_PKG_ERRORS" >&5	41787	echo "$WEBKIT_PKG_ERRORS" >&5
Lines 43055-43061 Link Here
43055	;;	43055	;;
43056	esac	43056	esac
43057	if test "$wxUSE_STC" = "yes" ; then	43057	if test "$wxUSE_STC" = "yes" ; then
43058	wxconfig_3rdparty="scintilla $wxconfig_3rdparty"	43058	wxconfig_3rdparty="scintilla lexilla $wxconfig_3rdparty"
43059	fi	43059	fi
43060	case "$wxUSE_EXPAT" in	43060	case "$wxUSE_EXPAT" in
43061	builtin)	43061	builtin)

Lines 7503-7516 Link Here

(-)a/configure.in (-3 / +3 lines)
7503	if test "$wxUSE_GTK" = 1; then	7503	if test "$wxUSE_GTK" = 1; then
7504	if test "$WXGTK3" = 1; then	7504	if test "$WXGTK3" = 1; then
7505	PKG_CHECK_MODULES([WEBKIT],	7505	PKG_CHECK_MODULES([WEBKIT],
7506	[webkit2gtk-4.0],	7506	[webkit2gtk-4.1],
7507	[	7507	[
7508	USE_WEBVIEW_WEBKIT2=1	7508	USE_WEBVIEW_WEBKIT2=1
7509	CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS"	7509	CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS"
7510	EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"	7510	EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
7511	],	7511	],
7512	[	7512	[
7513	AC_MSG_WARN([webkit2gtk not found, falling back to webkitgtk])	7513	AC_MSG_WARN([webkit2gtk-4.1 not found, falling back to webkitgtk])
7514	])	7514	])
7515	fi	7515	fi
7516	if test "$USE_WEBVIEW_WEBKIT2" = 0; then	7516	if test "$USE_WEBVIEW_WEBKIT2" = 0; then
Lines 8299-8305 Link Here
8299	;;	8299	;;
8300	esac	8300	esac
8301	if test "$wxUSE_STC" = "yes" ; then	8301	if test "$wxUSE_STC" = "yes" ; then
8302	wxconfig_3rdparty="scintilla $wxconfig_3rdparty"	8302	wxconfig_3rdparty="scintilla lexilla $wxconfig_3rdparty"
8303	fi	8303	fi
8304	case "$wxUSE_EXPAT" in	8304	case "$wxUSE_EXPAT" in
8305	builtin)	8305	builtin)

Lines 166-180 Link Here

(-)a/src/gtk/webview_webkit2.cpp (+4 lines)
166	{	166	{
167	switch (error->code)	167	switch (error->code)
168	{	168	{
		169	#if SOUP_MAJOR_VERSION < 3
169	case SOUP_STATUS_CANCELLED:	170	case SOUP_STATUS_CANCELLED:
170	type = wxWEBVIEW_NAV_ERR_USER_CANCELLED;	171	type = wxWEBVIEW_NAV_ERR_USER_CANCELLED;
171	break;	172	break;
172		173
173	case SOUP_STATUS_CANT_RESOLVE:	174	case SOUP_STATUS_CANT_RESOLVE:
		175	#endif
174	case SOUP_STATUS_NOT_FOUND:	176	case SOUP_STATUS_NOT_FOUND:
175	type = wxWEBVIEW_NAV_ERR_NOT_FOUND;	177	type = wxWEBVIEW_NAV_ERR_NOT_FOUND;
176	break;	178	break;
177		179
		180	#if SOUP_MAJOR_VERSION < 3
178	case SOUP_STATUS_CANT_RESOLVE_PROXY:	181	case SOUP_STATUS_CANT_RESOLVE_PROXY:
179	case SOUP_STATUS_CANT_CONNECT:	182	case SOUP_STATUS_CANT_CONNECT:
180	case SOUP_STATUS_CANT_CONNECT_PROXY:	183	case SOUP_STATUS_CANT_CONNECT_PROXY:
Lines 186-191 Link Here
186	case SOUP_STATUS_MALFORMED:	189	case SOUP_STATUS_MALFORMED:
187	type = wxWEBVIEW_NAV_ERR_REQUEST;	190	type = wxWEBVIEW_NAV_ERR_REQUEST;
188	break;	191	break;
		192	#endif
189		193
190	case SOUP_STATUS_BAD_REQUEST:	194	case SOUP_STATUS_BAD_REQUEST:
191	type = wxWEBVIEW_NAV_ERR_REQUEST;	195	type = wxWEBVIEW_NAV_ERR_REQUEST;