# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1572955087 0 # Node ID dee122916f3c8745dfdd238a487becb04b41b189 # Parent a2931caa342283bbf30a4e724760c6ca4b7a1ae3 GTK: Switch GTK3 to be the default. GTK2 requires --with-gtk2 Remove obsolete libgtkhtml-2 and gtkmozembed support. #define USE_WEBKIT2 when including webkit2 on GTK3. diff -r a2931caa3422 -r dee122916f3c config.h.in --- a/config.h.in Mon Nov 04 01:15:03 2019 +0000 +++ b/config.h.in Tue Nov 05 11:58:07 2019 +0000 @@ -30,12 +30,6 @@ /* Determine whether we have the vsnprintf function */ #undef HAVE_VSNPRINTF -/* Define if GtkMozEmbed is available */ -#undef USE_GTKMOZEMBED - -/* Define if libgtkhtml-2.0 is available */ -#undef USE_LIBGTKHTML2 - /* Define if WebKit is available */ #undef USE_WEBKIT @@ -45,6 +39,9 @@ /* Define if webkit-1.1 is available */ #undef USE_WEBKIT11 +/* Define if webkit2 is available */ +#undef USE_WEBKIT2 + /* Define for name of webkit library */ #undef WEBKIT_LIB diff -r a2931caa3422 -r dee122916f3c configure --- a/configure Mon Nov 04 01:15:03 2019 +0000 +++ b/configure Tue Nov 05 11:58:07 2019 +0000 @@ -730,12 +730,8 @@ ac_user_opts=' enable_option_checking with_dwcompat -with_gtk3 +with_gtk2 with_deprecated -with_gtk -with_gtkframework -with_gtkhtml -with_gtkmozembed with_arch with_glib_prefix with_glib_exec_prefix @@ -1390,12 +1386,8 @@ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-dwcompat specify this to build the optional dwcompat library - --with-gtk3 specify this to build with GTK+ 3.x if available - --with-deprecated specify this to build with deprecated functions - --with-gtk specify this to build dwindows with GTK+ (only relevant for OSX) - --with-gtkframework specify this to build dwindows with GTK+ Framework (only relevant for OSX) - --with-gtkhtml specify this to build dwindows with libgtkhtml-2 - --with-gtkmozembed specify this to build dwindows with Mozilla gtkmozembed + --with-gtk2 specify this to build with GTK+ 2.x if available + --with-deprecated specify this to build with deprecated functions --with-arch specify architecture: one of all, 32bit, 64bit, intel, ppc, ppc64, x86_64, i386 --with-glib-prefix=PFX Prefix where GLIB is installed (optional) --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional) @@ -2243,7 +2235,7 @@ -DW_DIR=gtk +DW_DIR=gtk3 DW_SRC=dw.c DW_DEFINE=__UNIX__ SHAREDFLAG=-shared @@ -3668,11 +3660,11 @@ -# Check whether --with-gtk3 was given. -if test "${with_gtk3+set}" = set; then : - withval=$with_gtk3; with_gtk3=$withval -else - with_gtk3=no +# Check whether --with-gtk2 was given. +if test "${with_gtk2+set}" = set; then : + withval=$with_gtk2; with_gtk2=$withval +else + with_gtk2=no fi @@ -3698,42 +3690,6 @@ SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" -# Check whether --with-gtk was given. -if test "${with_gtk+set}" = set; then : - withval=$with_gtk; with_gtk=$withval -else - with_gtk=no -fi - - - -# Check whether --with-gtkframework was given. -if test "${with_gtkframework+set}" = set; then : - withval=$with_gtkframework; with_gtkframework=$withval -else - with_gtkframework=no -fi - - - -# Check whether --with-gtkhtml was given. -if test "${with_gtkhtml+set}" = set; then : - withval=$with_gtkhtml; with_gtkhtml=$withval -else - with_gtkhtml=no -fi - - - -# Check whether --with-gtkmozembed was given. -if test "${with_gtkmozembed+set}" = set; then : - withval=$with_gtkmozembed; with_gtkmozembed=$withval -else - with_gtkmozembed=no -fi - - - # Check whether --with-arch was given. if test "${with_arch+set}" = set; then : withval=$with_arch; with_arch=$withval @@ -4666,26 +4622,20 @@ intel) ARCH="-arch i386 -arch x86_64" ;; + powerpc) + ARCH="-arch ppc -arch ppc64" + ;; *) ARCH="-arch $with_arch" ;; esac SHAREDFLAG="-dynamiclib -flat_namespace -undefined suppress -headerpad_max_install_names" SOSUFFIX=dylib - if test $with_gtkframework = yes; then - DW_DIR=gtk - LIBS="$LIBS -framework Gtk -framework Glib -framework Cairo" - GTK_CFLAGS="-I/Library/Frameworks/Gtk.framework/Headers -I/Library/Frameworks/Glib.framework/Headers -I/Library/Frameworks/Cairo.framework/Headers" - build_gtk="no" - elif test $with_gtk = yes; then - build_gtk="yes" - else - DW_DIR=mac - DW_SRC=dw.m - DW_DEFINE=__MAC__ - LIBS="$LIBS -framework Cocoa -framework WebKit" - build_gtk="no" - fi + DW_DIR=mac + DW_SRC=dw.m + DW_DEFINE=__MAC__ + LIBS="$LIBS -framework Cocoa -framework WebKit" + build_gtk="no" ;; *) ;; @@ -4731,65 +4681,55 @@ if test x"$PKG_CFG" != x; then GTK_LIBS="" - if test $with_gtk3 = "yes"; then - GTK_PACKAGES="gtk+-3.0" + if test $with_gtk2 = "yes"; then + GTK_PACKAGES="gtk+-2.0 gthread-2.0" GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` fi - WEBKIT_PKG="webkit-1.1" + WEBKIT_PKG="webkitgtk-3.0" if test x"$GTK_LIBS" = x; then - GTK_PACKAGES="gtk+-2.0 gthread-2.0" + GTK_PACKAGES="gtk+-3.0" GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` else - DW_DIR=gtk3 - WEBKIT_PKG="webkitgtk-3.0" + DW_DIR=gtk + WEBKIT_PKG="webkit-1.1" fi - if test $with_gtkmozembed = yes; then - MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed` - MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags firefox-gtkmozembed` - RPATH=`$PKG_CFG --silence-errors --libs-only-L firefox-gtkmozembed | cut -b 3-` - if test x"$MOZEMBED_LIBS" = x; then - MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs mozilla-gtkmozembed` - MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags mozilla-gtkmozembed` - RPATH=`$PKG_CFG --silence-errors --libs-only-L mozilla-gtkmozembed | cut -b 3-` - fi - elif test $with_gtkhtml = yes; then - MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs libgtkhtml-2.0` - MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags libgtkhtml-2.0` - RPATH=`$PKG_CFG --silence-errors --libs-only-L libgtkhtml-2.0 | cut -b 3-` - else - # test for webkit-1.1 or webkitgtk-3.0 packages - MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` + # test for webkit2gtk or webkitgtk packages + WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` + RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` + if test x"$WEBKIT_CFLAGS" = x; then + # no webkit-1.1 or webkitgtk-3.0, look for webkit-1.0 + WEBKIT_PKG="webkit-1.0" + WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` - if test x"$MOZEMBED_CFLAGS" = x; then - # no webkit-1.1 or webkitgtk-3.0, look for webkit-1.0 - WEBKIT_PKG="webkit-1.0" - MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` + if test x"$WEBKIT_CFLAGS" = x; then + WEBKIT_PKG="WebKitGtk" + WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` + WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` - if test x"$MOZEMBED_CFLAGS" = x; then - WEBKIT_PKG="WebKitGtk" - MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` - MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` - RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` - else - $as_echo "#define USE_WEBKIT10 1" >>confdefs.h - - WEBKIT_LIB=$WEBKIT_PKG - MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` - RESULT=`echo $MOZEMBED_LIBS | grep lwebkitgtk-1.0` - if test x"$RESULT" != x; then - WEBKIT_LIB=webkitgtk-1.0 - fi - fi else - $as_echo "#define USE_WEBKIT11 1" >>confdefs.h + $as_echo "#define USE_WEBKIT10 1" >>confdefs.h WEBKIT_LIB=$WEBKIT_PKG + WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` + RESULT=`echo $WEBKIT_LIBS | grep lwebkitgtk-1.0` + if test x"$RESULT" != x; then + WEBKIT_LIB=webkitgtk-1.0 + fi fi - cat >>confdefs.h <<_ACEOF + else + if test $with_gtk2 = "yes"; then + $as_echo "#define USE_WEBKIT11 1" >>confdefs.h + + else + $as_echo "#define USE_WEBKIT2 1" >>confdefs.h + + fi + WEBKIT_LIB=$WEBKIT_PKG + fi + cat >>confdefs.h <<_ACEOF #define WEBKIT_LIB "$WEBKIT_LIB" _ACEOF - fi if test x"$RPATH" != x; then RPATH="-Wl,-R$RPATH" fi @@ -5735,106 +5675,15 @@ fi -CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS $MOZEMBED_CFLAGS" +CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS $WEBKIT_CFLAGS" if test $with_deprecated = yes; then CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED" fi -BROWSER_OBJECT="" -if test x"$MOZEMBED_CFLAGS" != x; then +if test x"$WEBKIT_CFLAGS" != x; then SAVE_LIBS="$LIBS" - LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $MOZEMBED_LIBS" - BROWSER_OBJECT="browser.o" - if test $with_gtkmozembed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk_moz_embed_new in -lgtkembedmoz" >&5 -$as_echo_n "checking for gtk_moz_embed_new in -lgtkembedmoz... " >&6; } -if ${ac_cv_lib_gtkembedmoz_gtk_moz_embed_new+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgtkembedmoz $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gtk_moz_embed_new (); -int -main () -{ -return gtk_moz_embed_new (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_gtkembedmoz_gtk_moz_embed_new=yes -else - ac_cv_lib_gtkembedmoz_gtk_moz_embed_new=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gtkembedmoz_gtk_moz_embed_new" >&5 -$as_echo "$ac_cv_lib_gtkembedmoz_gtk_moz_embed_new" >&6; } -if test "x$ac_cv_lib_gtkembedmoz_gtk_moz_embed_new" = xyes; then : - $as_echo "#define USE_GTKMOZEMBED 1" >>confdefs.h - -else - BROWSER_OBJECT="" -fi - - elif test $with_gtkhtml = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for html_document_new in -lgtkhtml-2" >&5 -$as_echo_n "checking for html_document_new in -lgtkhtml-2... " >&6; } -if ${ac_cv_lib_gtkhtml_2_html_document_new+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgtkhtml-2 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char html_document_new (); -int -main () -{ -return html_document_new (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_gtkhtml_2_html_document_new=yes -else - ac_cv_lib_gtkhtml_2_html_document_new=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gtkhtml_2_html_document_new" >&5 -$as_echo "$ac_cv_lib_gtkhtml_2_html_document_new" >&6; } -if test "x$ac_cv_lib_gtkhtml_2_html_document_new" = xyes; then : - $as_echo "#define USE_LIBGTKHTML2 1" >>confdefs.h - -else - BROWSER_OBJECT="" -fi - - else - as_ac_Lib=`$as_echo "ac_cv_lib_$WEBKIT_LIB''_webkit_web_view_new" | $as_tr_sh` + LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $WEBKIT_LIBS" + as_ac_Lib=`$as_echo "ac_cv_lib_$WEBKIT_LIB''_webkit_web_view_new" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for webkit_web_view_new in -l$WEBKIT_LIB" >&5 $as_echo_n "checking for webkit_web_view_new in -l$WEBKIT_LIB... " >&6; } if eval \${$as_ac_Lib+:} false; then : @@ -5875,16 +5724,12 @@ if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : $as_echo "#define USE_WEBKIT 1" >>confdefs.h -else - BROWSER_OBJECT="" -fi - - BROWSER_OBJECT="" - fi +fi + LIBS="$SAVE_LIBS" fi -LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $MOZEMBED_LIBS $PLATLIBS" +LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $WEBKIT_LIBS $PLATLIBS" for ac_func in ubuntu_overlay_scrollbar_set_enabled do : diff -r a2931caa3422 -r dee122916f3c configure.in --- a/configure.in Mon Nov 04 01:15:03 2019 +0000 +++ b/configure.in Tue Nov 05 11:58:07 2019 +0000 @@ -8,7 +8,7 @@ AC_DEFUN([AC_DATAROOTDIR_CHECKED]) -DW_DIR=gtk +DW_DIR=gtk3 DW_SRC=dw.c DW_DEFINE=__UNIX__ SHAREDFLAG=-shared @@ -48,16 +48,16 @@ [with_dwcompat=no], ) -dnl ---------------------- check for '--with-gtk3' switch ----------------- -AC_ARG_WITH(gtk3, - [ --with-gtk3 specify this to build with GTK+ 3.x if available], - [with_gtk3=$withval], - [with_gtk3=no], +dnl ---------------------- check for '--with-gtk2' switch ----------------- +AC_ARG_WITH(gtk2, + [ --with-gtk2 specify this to build with GTK+ 2.x if available], + [with_gtk2=$withval], + [with_gtk2=no], ) dnl ---------------------- check for '--with-deprecated' switch ----------------- AC_ARG_WITH(deprecated, - [ --with-deprecated specify this to build with deprecated functions], + [ --with-deprecated specify this to build with deprecated functions], [with_deprecated=$withval], [with_deprecated=no], ) @@ -75,34 +75,6 @@ SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" -dnl ---------------------- check for '--with-gtk+' switch ----------------- -AC_ARG_WITH(gtk, - [ --with-gtk specify this to build dwindows with GTK+ (only relevant for OSX)], - [with_gtk=$withval], - [with_gtk=no], -) - -dnl ---------------------- check for '--with-gtkframework' switch ----------------- -AC_ARG_WITH(gtkframework, - [ --with-gtkframework specify this to build dwindows with GTK+ Framework (only relevant for OSX)], - [with_gtkframework=$withval], - [with_gtkframework=no], -) - -dnl ---------------------- check for '--with-gtkhtml' switch ----------------- -AC_ARG_WITH(gtkhtml, - [ --with-gtkhtml specify this to build dwindows with libgtkhtml-2], - [with_gtkhtml=$withval], - [with_gtkhtml=no], -) - -dnl ---------------------- check for '--with-gtkmozembed' switch ----------------- -AC_ARG_WITH(gtkmozembed, - [ --with-gtkmozembed specify this to build dwindows with Mozilla gtkmozembed], - [with_gtkmozembed=$withval], - [with_gtkmozembed=no], -) - dnl ---------------------- check for '--with-arch' switch ----------------- AC_ARG_WITH(arch, [ --with-arch specify architecture: one of all, 32bit, 64bit, intel, ppc, ppc64, x86_64, i386], @@ -190,26 +162,20 @@ intel) ARCH="-arch i386 -arch x86_64" ;; + powerpc) + ARCH="-arch ppc -arch ppc64" + ;; *) ARCH="-arch $with_arch" ;; esac SHAREDFLAG="-dynamiclib -flat_namespace -undefined suppress -headerpad_max_install_names" SOSUFFIX=dylib - if test $with_gtkframework = yes; then - DW_DIR=gtk - LIBS="$LIBS -framework Gtk -framework Glib -framework Cairo" - GTK_CFLAGS="-I/Library/Frameworks/Gtk.framework/Headers -I/Library/Frameworks/Glib.framework/Headers -I/Library/Frameworks/Cairo.framework/Headers" - build_gtk="no" - elif test $with_gtk = yes; then - build_gtk="yes" - else - DW_DIR=mac - DW_SRC=dw.m - DW_DEFINE=__MAC__ - LIBS="$LIBS -framework Cocoa -framework WebKit" - build_gtk="no" - fi + DW_DIR=mac + DW_SRC=dw.m + DW_DEFINE=__MAC__ + LIBS="$LIBS -framework Cocoa -framework WebKit" + build_gtk="no" ;; *) ;; @@ -219,60 +185,49 @@ AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config) if test x"$PKG_CFG" != x; then GTK_LIBS="" - if test $with_gtk3 = "yes"; then - GTK_PACKAGES="gtk+-3.0" + if test $with_gtk2 = "yes"; then + GTK_PACKAGES="gtk+-2.0 gthread-2.0" GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` fi - WEBKIT_PKG="webkit-1.1" + WEBKIT_PKG="webkitgtk-3.0" if test x"$GTK_LIBS" = x; then - GTK_PACKAGES="gtk+-2.0 gthread-2.0" + GTK_PACKAGES="gtk+-3.0" GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` else - DW_DIR=gtk3 - WEBKIT_PKG="webkitgtk-3.0" + DW_DIR=gtk + WEBKIT_PKG="webkit-1.1" fi - if test $with_gtkmozembed = yes; then - MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed` - MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags firefox-gtkmozembed` - RPATH=`$PKG_CFG --silence-errors --libs-only-L firefox-gtkmozembed | cut -b 3-` - if test x"$MOZEMBED_LIBS" = x; then - MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs mozilla-gtkmozembed` - MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags mozilla-gtkmozembed` - RPATH=`$PKG_CFG --silence-errors --libs-only-L mozilla-gtkmozembed | cut -b 3-` - fi - elif test $with_gtkhtml = yes; then - MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs libgtkhtml-2.0` - MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags libgtkhtml-2.0` - RPATH=`$PKG_CFG --silence-errors --libs-only-L libgtkhtml-2.0 | cut -b 3-` - else - # test for webkit-1.1 or webkitgtk-3.0 packages - MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` + # test for webkit2gtk or webkitgtk packages + WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` + RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` + if test x"$WEBKIT_CFLAGS" = x; then + # no webkit-1.1 or webkitgtk-3.0, look for webkit-1.0 + WEBKIT_PKG="webkit-1.0" + WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` - if test x"$MOZEMBED_CFLAGS" = x; then - # no webkit-1.1 or webkitgtk-3.0, look for webkit-1.0 - WEBKIT_PKG="webkit-1.0" - MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` + if test x"$WEBKIT_CFLAGS" = x; then + WEBKIT_PKG="WebKitGtk" + WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` + WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` - if test x"$MOZEMBED_CFLAGS" = x; then - WEBKIT_PKG="WebKitGtk" - MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` - MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` - RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` - else - AC_DEFINE(USE_WEBKIT10) - WEBKIT_LIB=$WEBKIT_PKG - MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` - RESULT=`echo $MOZEMBED_LIBS | grep lwebkitgtk-1.0` - if test x"$RESULT" != x; then - WEBKIT_LIB=webkitgtk-1.0 - fi + else + AC_DEFINE(USE_WEBKIT10) + WEBKIT_LIB=$WEBKIT_PKG + WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` + RESULT=`echo $WEBKIT_LIBS | grep lwebkitgtk-1.0` + if test x"$RESULT" != x; then + WEBKIT_LIB=webkitgtk-1.0 fi - else + fi + else + if test $with_gtk2 = "yes"; then AC_DEFINE(USE_WEBKIT11) - WEBKIT_LIB=$WEBKIT_PKG + else + AC_DEFINE(USE_WEBKIT2) fi - AC_DEFINE_UNQUOTED(WEBKIT_LIB, "$WEBKIT_LIB") + WEBKIT_LIB=$WEBKIT_PKG fi + AC_DEFINE_UNQUOTED(WEBKIT_LIB, "$WEBKIT_LIB") if test x"$RPATH" != x; then RPATH="-Wl,-R$RPATH" fi @@ -309,28 +264,19 @@ ) fi -CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS $MOZEMBED_CFLAGS" +CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS $WEBKIT_CFLAGS" if test $with_deprecated = yes; then CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED" fi -BROWSER_OBJECT="" -if test x"$MOZEMBED_CFLAGS" != x; then +if test x"$WEBKIT_CFLAGS" != x; then SAVE_LIBS="$LIBS" - LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $MOZEMBED_LIBS" - BROWSER_OBJECT="browser.o" - if test $with_gtkmozembed = yes; then - AC_CHECK_LIB(gtkembedmoz,gtk_moz_embed_new,AC_DEFINE(USE_GTKMOZEMBED),BROWSER_OBJECT="") - elif test $with_gtkhtml = yes; then - AC_CHECK_LIB(gtkhtml-2,html_document_new,AC_DEFINE(USE_LIBGTKHTML2),BROWSER_OBJECT="") - else - AC_CHECK_LIB($WEBKIT_LIB,webkit_web_view_new,AC_DEFINE(USE_WEBKIT),BROWSER_OBJECT="") - BROWSER_OBJECT="" - fi + LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $WEBKIT_LIBS" + AC_CHECK_LIB($WEBKIT_LIB,webkit_web_view_new,AC_DEFINE(USE_WEBKIT),) LIBS="$SAVE_LIBS" fi -LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $MOZEMBED_LIBS $PLATLIBS" +LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $WEBKIT_LIBS $PLATLIBS" AC_CHECK_FUNCS(ubuntu_overlay_scrollbar_set_enabled, AC_DEFINE(HAVE_OVERLAY_SCROLLBARS,1,Define if we have Ubuntu overlay scrollbars)) AC_CHECK_FUNCS(ubuntu_gtk_set_use_overlay_scrollbar, AC_DEFINE(HAVE_OVERLAY_SCROLLBARS2,1,Define if we have Ubuntu overlay scrollbars)) diff -r a2931caa3422 -r dee122916f3c gtk/browser.cpp --- a/gtk/browser.cpp Mon Nov 04 01:15:03 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -#ifdef HAVE_CONFIG_H -# include -#endif - -#define MOZILLA_INTERNAL_API - -#include -#include -#include -#include "nsIDOMMouseEvent.h" - -/** - * Takes a pointer to a mouse event and returns the mouse - * button number or -1 on error. - */ -extern "C" gint mozilla_get_mouse_event_button(gpointer event) -{ - gint button = 0; - glong x,y; - - g_return_val_if_fail (event, -1); - - /* the following lines were found in the Galeon source */ - nsIDOMMouseEvent *aMouseEvent = (nsIDOMMouseEvent *) event; - aMouseEvent->GetButton ((PRUint16 *) &button); - aMouseEvent->GetClientX ((PRInt32 *) &x); - aMouseEvent->GetClientY ((PRInt32 *) &y); - - - /* for some reason we get different numbers on PPC, this fixes - * that up... -- MattA */ - if (button == 65536) - { - button = 1; - } - else if (button == 131072) - { - button = 2; - } - - return button; -} -extern "C" gint mozilla_get_mouse_location( gpointer event, glong *x, glong *y) -{ - g_return_val_if_fail (event, -1); - - /* the following lines were found in the Galeon source */ - nsIDOMMouseEvent *aMouseEvent = (nsIDOMMouseEvent *) event; - aMouseEvent->GetClientX ((PRInt32 *) x); - aMouseEvent->GetClientY ((PRInt32 *) y); - return 0; -}