|
 |
6bdfdf5 |
diff -up gnucash-2.6.17/configure.foo gnucash-2.6.17/configure
|
|
|
6bdfdf5 |
--- gnucash-2.6.17/configure.foo 2017-07-10 22:16:35.894106443 -0400
|
|
|
6bdfdf5 |
+++ gnucash-2.6.17/configure 2017-07-10 22:19:39.317530206 -0400
|
|
|
6bdfdf5 |
@@ -23454,105 +23454,6 @@ $as_echo "$with_html_engine" >&6; }
|
|
|
6bdfdf5 |
;;
|
|
|
6bdfdf5 |
|
|
|
6bdfdf5 |
webkit)
|
|
|
6bdfdf5 |
-
|
|
|
6bdfdf5 |
- succeeded=no
|
|
|
6bdfdf5 |
-
|
|
|
6bdfdf5 |
- if test -z "$PKG_CONFIG"; then
|
|
|
6bdfdf5 |
- # Extract the first word of "pkg-config", so it can be a program name with args.
|
|
|
6bdfdf5 |
-set dummy pkg-config; ac_word=$2
|
|
|
6bdfdf5 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
|
6bdfdf5 |
-$as_echo_n "checking for $ac_word... " >&6; }
|
|
|
6bdfdf5 |
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
|
|
|
6bdfdf5 |
- $as_echo_n "(cached) " >&6
|
|
|
6bdfdf5 |
-else
|
|
|
6bdfdf5 |
- case $PKG_CONFIG in
|
|
|
6bdfdf5 |
- [\\/]* | ?:[\\/]*)
|
|
|
6bdfdf5 |
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
|
|
6bdfdf5 |
- ;;
|
|
|
6bdfdf5 |
- *)
|
|
|
6bdfdf5 |
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
6bdfdf5 |
-for as_dir in $PATH
|
|
|
6bdfdf5 |
-do
|
|
|
6bdfdf5 |
- IFS=$as_save_IFS
|
|
|
6bdfdf5 |
- test -z "$as_dir" && as_dir=.
|
|
|
6bdfdf5 |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
6bdfdf5 |
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
|
6bdfdf5 |
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
|
|
6bdfdf5 |
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
|
6bdfdf5 |
- break 2
|
|
|
6bdfdf5 |
- fi
|
|
|
6bdfdf5 |
-done
|
|
|
6bdfdf5 |
- done
|
|
|
6bdfdf5 |
-IFS=$as_save_IFS
|
|
|
6bdfdf5 |
-
|
|
|
6bdfdf5 |
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
|
|
|
6bdfdf5 |
- ;;
|
|
|
6bdfdf5 |
-esac
|
|
|
6bdfdf5 |
-fi
|
|
|
6bdfdf5 |
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
|
|
6bdfdf5 |
-if test -n "$PKG_CONFIG"; then
|
|
|
6bdfdf5 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
|
|
|
6bdfdf5 |
-$as_echo "$PKG_CONFIG" >&6; }
|
|
|
6bdfdf5 |
-else
|
|
|
6bdfdf5 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
6bdfdf5 |
-$as_echo "no" >&6; }
|
|
|
6bdfdf5 |
-fi
|
|
|
6bdfdf5 |
-
|
|
|
6bdfdf5 |
-
|
|
|
6bdfdf5 |
- fi
|
|
|
6bdfdf5 |
-
|
|
|
6bdfdf5 |
- if test "$PKG_CONFIG" = "no" ; then
|
|
|
6bdfdf5 |
- echo "*** The pkg-config script could not be found. Make sure it is"
|
|
|
6bdfdf5 |
- echo "*** in your path, or set the PKG_CONFIG environment variable"
|
|
|
6bdfdf5 |
- echo "*** to the full path to pkg-config."
|
|
|
6bdfdf5 |
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
|
|
6bdfdf5 |
- else
|
|
|
6bdfdf5 |
- pkg_config_min_version=0.9.0
|
|
|
6bdfdf5 |
- if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
|
|
|
6bdfdf5 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for webkit-1.0 >= \"1.2\"" >&5
|
|
|
6bdfdf5 |
-$as_echo_n "checking for webkit-1.0 >= \"1.2\"... " >&6; }
|
|
|
6bdfdf5 |
-
|
|
|
6bdfdf5 |
- if $PKG_CONFIG --silence-errors --exists "webkit-1.0 >= "1.2"" ; then
|
|
|
6bdfdf5 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
|
6bdfdf5 |
-$as_echo "yes" >&6; }
|
|
|
6bdfdf5 |
- succeeded=yes
|
|
|
6bdfdf5 |
-
|
|
|
6bdfdf5 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking WEBKIT_CFLAGS" >&5
|
|
|
6bdfdf5 |
-$as_echo_n "checking WEBKIT_CFLAGS... " >&6; }
|
|
|
6bdfdf5 |
- WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit-1.0 >= "1.2""`
|
|
|
6bdfdf5 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WEBKIT_CFLAGS" >&5
|
|
|
6bdfdf5 |
-$as_echo "$WEBKIT_CFLAGS" >&6; }
|
|
|
6bdfdf5 |
-
|
|
|
6bdfdf5 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking WEBKIT_LIBS" >&5
|
|
|
6bdfdf5 |
-$as_echo_n "checking WEBKIT_LIBS... " >&6; }
|
|
|
6bdfdf5 |
- WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit-1.0 >= "1.2""`
|
|
|
6bdfdf5 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WEBKIT_LIBS" >&5
|
|
|
6bdfdf5 |
-$as_echo "$WEBKIT_LIBS" >&6; }
|
|
|
6bdfdf5 |
- else
|
|
|
6bdfdf5 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
6bdfdf5 |
-$as_echo "no" >&6; }
|
|
|
6bdfdf5 |
- WEBKIT_CFLAGS=""
|
|
|
6bdfdf5 |
- WEBKIT_LIBS=""
|
|
|
6bdfdf5 |
- ## If we have a custom action on failure, don't print errors, but
|
|
|
6bdfdf5 |
- ## do set a variable so people can do so.
|
|
|
6bdfdf5 |
- WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit-1.0 >= "1.2"" 2>&1`
|
|
|
6bdfdf5 |
- echo $WEBKIT_PKG_ERRORS
|
|
|
6bdfdf5 |
- fi
|
|
|
6bdfdf5 |
-
|
|
|
6bdfdf5 |
-
|
|
|
6bdfdf5 |
-
|
|
|
6bdfdf5 |
- else
|
|
|
6bdfdf5 |
- echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
|
|
|
6bdfdf5 |
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
|
|
|
6bdfdf5 |
- fi
|
|
|
6bdfdf5 |
- fi
|
|
|
6bdfdf5 |
-
|
|
|
6bdfdf5 |
- if test $succeeded = yes; then
|
|
|
6bdfdf5 |
- :
|
|
|
6bdfdf5 |
- else
|
|
|
6bdfdf5 |
- as_fn_error $? "Library requirements (webkit-1.0 >= \"1.2\") not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
|
|
|
6bdfdf5 |
- fi
|
|
|
6bdfdf5 |
-
|
|
|
6bdfdf5 |
;;
|
|
|
6bdfdf5 |
|
|
|
6bdfdf5 |
*) as_fn_error $? "Invalid HTML engine: must be webkit" "$LINENO" 5 ;;
|
|
|
6bdfdf5 |
diff -up gnucash-2.6.17/src/html/Makefile.in.foo gnucash-2.6.17/src/html/Makefile.in
|
|
|
6bdfdf5 |
--- gnucash-2.6.17/src/html/Makefile.in.foo 2017-07-02 14:50:42.000000000 -0400
|
|
|
6bdfdf5 |
+++ gnucash-2.6.17/src/html/Makefile.in 2017-07-10 22:16:35.890106412 -0400
|
|
|
6bdfdf5 |
@@ -552,7 +552,8 @@ libgncmod_html_la_LIBADD = \
|
|
|
6bdfdf5 |
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
|
|
|
6bdfdf5 |
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
|
|
|
6bdfdf5 |
$(top_builddir)/lib/libc/libc-missing.la \
|
|
|
6bdfdf5 |
- ${WEBKIT_LIBS} \
|
|
|
6bdfdf5 |
+ ${top_builddir}/webkitgtk-2.4.11/libjavascriptcoregtk-1.0.la \
|
|
|
6bdfdf5 |
+ ${top_builddir}/webkitgtk-2.4.11/libwebkitgtk-1.0.la \
|
|
|
6bdfdf5 |
${GTK_LIBS} \
|
|
|
6bdfdf5 |
${GLIB_LIBS} \
|
|
|
6bdfdf5 |
${DB_LIBS} \
|
|
|
6bdfdf5 |
diff -up gnucash-2.6.17/src/html/gnc-html-webkit.c.cow gnucash-2.6.17/src/html/gnc-html-webkit.c
|
|
|
6bdfdf5 |
--- gnucash-2.6.17/src/html/gnc-html-webkit.c.cow 2017-07-11 23:47:07.175542657 -0400
|
|
|
6bdfdf5 |
+++ gnucash-2.6.17/src/html/gnc-html-webkit.c 2017-07-11 23:47:16.821580424 -0400
|
|
|
6bdfdf5 |
@@ -39,7 +39,7 @@
|
|
|
6bdfdf5 |
#include <regex.h>
|
|
|
6bdfdf5 |
#include <libguile.h>
|
|
|
6bdfdf5 |
|
|
|
6bdfdf5 |
-#include <webkit/webkit.h>
|
|
|
6bdfdf5 |
+#include "webkit/webkit.h"
|
|
|
6bdfdf5 |
|
|
|
6bdfdf5 |
#include "Account.h"
|
|
|
6bdfdf5 |
#include "gnc-prefs.h"
|