IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update win32 components:

Browse Source 
Gtk to 2.24
Webkit to 1.2.7
Others to latest version

install-impl.sh now has option to build webkit if BUILD_WEBKIT_FROM_SOURCE is defined as "yes".


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20560 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Phil Longstaff
2011-04-12 23:52:51 +00:00
parent b47790dbe5
commit 13923b5f27
13 changed files with 2457 additions and 1067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
packaging/win32/defaults.sh
View File

@@ -204,77 +204,86 @@ set_default EXETYPE_SCRIPT `pwd`/exetype.pl
set_default EXETYPE_DIR $TOOLS_DIR
XMLSOFT_URL="http://xmlsoft.org/sources/win32"
set_default LIBXSLT_URL "${XMLSOFT_URL}/libxslt-1.1.26.win32.zip"
set_default LIBXSLT_LIBXML2_URL "${XMLSOFT_URL}/libxml2-2.7.6.win32.zip"
XSLT_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxslt/1.1"
XML2_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxml2/2.6"
LIBXSLT_VERSION=1.1.22
#LIBXSLT_VERSION=1.1.26
set_default LIBXSLT_SRC_URL "${XSLT_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.bz2"
set_default LIBXSLT_MAKEFILE_PATCH "`pwd`/libxslt-1.1.22.Makefile.in.patch"
set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-2.6.27.tar.bz2"
set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
set_default LIBXSLT_SRC_URL "http://xmlsoft.org/sources/libxslt-1.1.26.tar.gz" # needed for webkit build
set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.4-1_win32.zip"
set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.4-1_win32.zip"
set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-0.17-1.zip"
set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev-0.17-1.zip"
set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-0.17.zip"
set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.22/glib_2.22.4-1_win32.zip"
set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.22/glib-dev_2.22.4-1_win32.zip"
set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip"
set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_7-1_win32.zip"
set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.0-1_win32.zip"
set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.0-1_win32.zip"
set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.1-1_win32.zip"
set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.1-1_win32.zip"
set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib-1.2.3.zip"
set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev-1.2.3.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.23-3_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.23-3_win32.zip"
CAIRO_VERSION="1.8.8"
set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_${CAIRO_VERSION}-4_win32.zip"
set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_${CAIRO_VERSION}-4_win32.zip"
set_default PIXMAN_URL "http://cairographics.org/releases/pixman-0.17.6.tar.gz"
set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat_2.0.1-1_win32.zip"
set_default EXPAT_DEV_URL "$GNOME_WIN32_DEPS_URL/expat-dev_2.0.1-1_win32.zip"
set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig_2.8.0-2_win32.zip"
set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev_2.8.0-2_win32.zip"
set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.3.11-2_win32.zip"
set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.3.11-2_win32.zip"
set_default ATK_URL "$GNOME_WIN32_URL/atk/1.28/atk_1.28.0-1_win32.zip"
set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.28/atk-dev_1.28.0-1_win32.zip"
set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.26/pango_1.26.2-1_win32.zip"
set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.26/pango-dev_1.26.2-1_win32.zip"
set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.20.zip"
set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.20.zip"
GTK_VERSION="2.16.6"
set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+_${GTK_VERSION}-2_win32.zip"
set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+-dev_${GTK_VERSION}-2_win32.zip"
set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.13.zip"
set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.13.zip"
set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
set_default POPT_DEV_URL "$GNOME_WIN32_DEPS_URL/popt-dev-1.10.2-tml-20050828.zip"
set_default ATK_URL "$GNOME_WIN32_URL/atk/1.32/atk_1.32.0-1_win32.zip"
set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.32/atk-dev_1.32.0-1_win32.zip"
CAIRO_VERSION="1.10.2"
set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_${CAIRO_VERSION}-1_win32.zip"
set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_${CAIRO_VERSION}-1_win32.zip"
set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat_2.0.1-1_win32.zip"
set_default EXPAT_DEV_URL "$GNOME_WIN32_DEPS_URL/expat-dev_2.0.1-1_win32.zip"
set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig_2.8.0-2_win32.zip"
set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev_2.8.0-2_win32.zip"
set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.4.4-1_win32.zip"
set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.4.4-1_win32.zip"
set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
GCONF_VERSION="2.22.0"
set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_${GCONF_VERSION}-3_win32.zip"
set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_${GCONF_VERSION}-3_win32.zip"
set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo_2.24.0-1_win32.zip"
set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.24.0-1_win32.zip"
set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.1-1_win32.zip"
set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.1-1_win32.zip"
set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32.zip"
set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-2.20.1.zip"
set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-dev-2.20.1.zip"
set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.zip"
set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.4-1_win32.zip"
set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.4-1_win32.zip"
set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip"
set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"
set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_${GCONF_VERSION}-3_win32.zip"
set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_${GCONF_VERSION}-3_win32.zip"
GDK_PIXBUF_VERSION=2.22.1
set_default GDK_PIXBUF_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.22/gdk-pixbuf_${GCONF_VERSION}-1_win32.zip"
set_default GDK_PIXBUF_DEV_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.22/gdk-pixbuf-dev_${GCONF_VERSION}-1_win32.zip"
set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime_0.18.1.1-2_win32.zip"
set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev_0.18.1.1-2_win32.zip"
set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-dev_0.18.1.1-2_win32.zip"
set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.28/glib_2.28.1-1_win32.zip"
set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.28/glib-dev_2.28.1-1_win32.zip"
set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.1-1_win32.zip"
set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.1-1_win32.zip"
GTK_VERSION="2.24.0"
set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.24/gtk+_${GTK_VERSION}-1_win32.zip"
set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.24/gtk+-dev_${GTK_VERSION}-1_win32.zip"
set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"
set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip"
set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl_2.3.21-1_win32.zip"
set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl-dev_2.3.21-1_win32.zip"
set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo_2.24.0-1_win32.zip"
set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.24.0-1_win32.zip"
set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.4-1_win32.zip"
set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.4-1_win32.zip"
set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32.zip"
set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas_2.30.1-1_win32.zip"
set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas-dev_2.30.1-1_win32.zip"
set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.zip"
set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip"
set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_7-1_win32.zip"
set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.3-1_win32.zip"
set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.3-1_win32.zip"
set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.2-1_win32.zip"
set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.2-1_win32.zip"
set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.7-1_win32.zip"
set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.7-1_win32.zip"
set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2_2.14.16-1_win32.zip"
set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev_2.14.16-1_win32.zip"
set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.28/pango_1.28.3-1_win32.zip"
set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.28/pango-dev_1.28.3-1_win32.zip"
set_default PIXMAN_DEV_URL "$GNOME_WIN32_DEPS_URL/pixman-dev_0.20.0-1_win32.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
set_default POPT_DEV_URL "$GNOME_WIN32_DEPS_URL/popt-dev-1.10.2-tml-20050828.zip"
set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zip"
set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
set_default PIXMAN_URL "http://cairographics.org/releases/pixman-0.17.6.tar.gz"
set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui_2.24.0-1_win32.zip"
set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui-dev_2.24.0-1_win32.zip"
set_default LIBBONOBOUI_SRC_URL "$GNOME_MIRROR/sources/libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2"
@@ -292,8 +301,8 @@ LIBGSF_VERSION="1.14.17"
set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.bz2"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
GOFFICE_VERSION="0.7.18"
set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.7/goffice-${GOFFICE_VERSION}.tar.bz2"
GOFFICE_VERSION="0.8.13"
set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.8/goffice-${GOFFICE_VERSION}.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
#set_default GOFFICE_PATCH `pwd`/goffice-0.7.2-patch.diff
@@ -306,17 +315,30 @@ set_default INNO_DIR $GLOBAL_DIR\\inno
set_default HH_URL "http://download.microsoft.com/download/0/a/9/0a939ef6-e31c-430f-a3df-dfae7960d564/htmlhelp.exe"
set_default HH_DIR $GLOBAL_DIR\\hh
set_default WEBKIT_VERSION "1.1.90"
set_default BUILD_WEBKIT_FROM_SOURCE no
set_default WEBKIT_VERSION "1.2.7"
set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-win32.zip"
set_default WEBKIT_DIR $GLOBAL_DIR\\webkit-${WEBKIT_VERSION}
set_default WEBKIT_SRC_URL "http://www.webkitgtk.org/webkit-1.2.7.tar.gz"
set_default WEBKIT_PATCH `pwd`/webkit-1.2.7-time.patch
set_default WEBKIT_PATCH2 `pwd`/webkit-1.2.7-vasprintf.patch
set_default ENCHANT_URL "$GNOME_WIN32_URL/dependencies/enchant_1.5.0-2_win32.zip"
set_default ENCHANT_DEV_URL "$GNOME_WIN32_URL/dependencies/enchant-dev_1.5.0-2_win32.zip"
#set_default LIBSOUP_URL "$GNOME_WIN32_URL/libsoup/2.4/libsoup-2.4.0.zip"
#set_default LIBSOUP_DEV_URL "$GNOME_WIN32_URL/libsoup/2.4/libsoup-dev-2.4.0.zip"
set_default LIBSOUP_SRC_URL "$GNOME_MIRROR/sources/libsoup/2.30/libsoup-2.30.1.tar.bz2"
set_default WEBKIT_CONFIGURE_PATCH `pwd`/webkit-1.2.7-configure.patch
set_default WEBKIT_DATADIR_PATCH `pwd`/webkit-1.2.7-datadir.patch
set_default WEBKIT_GCCPATH_PATCH `pwd`/webkit-1.2.7-gccpath.patch
set_default WEBKIT_MAKEFILE_PATCH `pwd`/webkit-1.2.7-makefile.patch
set_default WEBKIT_MINGW32_PATCH `pwd`/webkit-1.2.7-mingw32.patch
set_default WEBKIT_NOSVG_PATCH `pwd`/webkit-1.2.7-nosvg.patch
set_default WEBKIT_WEBKITENUMTYPES_CPP `pwd`/webkitenumtypes.cpp
set_default WEBKIT_WEBKITENUMTYPES_H `pwd`/webkitenumtypes.h
set_default ENCHANT_VERSION "1.5.0"
set_default ENCHANT_URL "$GNOME_WIN32_URL/dependencies/enchant_${ENCHANT_VERSION}-2_win32.zip"
set_default ENCHANT_DEV_URL "$GNOME_WIN32_URL/dependencies/enchant-dev_${ENCHANT_VERSION}-2_win32.zip"
set_default ENCHANT_DIR $GLOBAL_DIR\\enchant-${ENCHANT_VERSION}
set_default LIBSOUP_VERSION "2.28.2"
set_default LIBSOUP_URL "$GNOME_WIN32_URL/libsoup/2.26/libsoup-${LIBSOUP_VERSION}-1_win32.zip"
set_default LIBSOUP_DEV_URL "$GNOME_WIN32_URL/libsoup/2.26/libsoup-dev-${LIBSOUP_VERSION}-1_win32.zip"
set_default LIBSOUP_DIR $GLOBAL_DIR\\libsoup-${LIBSOUP_VERSION}
set_default LIBSOUP_SRC_URL "$GNOME_MIRROR/sources/libsoup/2.28/libsoup-${LIBSOUP_VERSION}.tar.bz2"
set_default ICU4C_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-Win32-msvc9.zip"
set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-src.tgz"
set_default ICU4C_DIR $GLOBAL_DIR\\icu-mingw32

188
packaging/win32/dist-impl.sh
View File

@@ -26,10 +26,13 @@ Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
_GNOME_UDIR=`unix_path $GNOME_DIR`
_PCRE_UDIR=`unix_path $PCRE_DIR`
_LIBBONOBOUI_UDIR=`unix_path $LIBBONOBOUI_DIR`
_LIBSOUP_UDIR=`unix_path $LIBSOUP_DIR`
_ENCHANT_UDIR=`unix_path $ENCHANT_DIR`
_LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
_OPENSP_UDIR=`unix_path $OPENSP_DIR`
_LIBOFX_UDIR=`unix_path $LIBOFX_DIR`
_LIBXSLT_UDIR=`unix_path $LIBXSLT_DIR`
_GMP_UDIR=`unix_path $GMP_DIR`
_GNUTLS_UDIR=`unix_path $GNUTLS_DIR`
_GWENHYWFAR_UDIR=`unix_path $GWENHYWFAR_DIR`
@@ -43,6 +46,7 @@ Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
_REPOS_UDIR=`unix_path $REPOS_DIR`
_BUILD_UDIR=`unix_path $BUILD_DIR`
_MINGW_UDIR=`unix_path $MINGW_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
_INNO_UDIR=`unix_path $INNO_DIR`
_WEBKIT_UDIR=`unix_path $WEBKIT_DIR`
@@ -56,10 +60,13 @@ Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
configure_msys "$PID" "$_MINGW_WFSDIR"
}
function dist_regex() {
setup RegEx
smart_wget $REGEX_URL $DOWNLOAD_DIR
unzip -q $LAST_FILE bin/libgnurx-0.dll -d $DIST_DIR
function dist_aqbanking() {
setup aqbanking
cp -a ${_AQBANKING_UDIR}/bin/*.exe ${DIST_UDIR}/bin
cp -a ${_AQBANKING_UDIR}/bin/*.dll ${DIST_UDIR}/bin
cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${DIST_UDIR}/lib
cp -a ${_AQBANKING_UDIR}/share/aqbanking ${DIST_UDIR}/share
cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/share
}
function dist_autotools() {
@@ -68,56 +75,45 @@ function dist_autotools() {
cp -a $_AUTOTOOLS_UDIR/bin/*.dll $DIST_UDIR/bin
}
function dist_guile() {
setup Guile
mkdir -p $DIST_UDIR/bin
cp -a $_GUILE_UDIR/bin/libguile{.,-srfi}*dll $DIST_UDIR/bin
cp -a $_GUILE_UDIR/bin/guile.exe $DIST_UDIR/bin
mkdir -p $DIST_UDIR/share
cp -a $_GUILE_UDIR/share/guile $DIST_UDIR/share
}
function dist_openssl() {
setup OpenSSL
_OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
mkdir -p $DIST_UDIR/bin
cp -a $_OPENSSL_UDIR/bin/*.dll $DIST_UDIR/bin
function dist_gmp() {
setup gmp
cp -a ${_GMP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
}
function dist_gnome() {
setup Gnome platform
wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
smart_wget $LIBICONV_URL $DOWNLOAD_DIR
unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $ATK_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $ATK_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $PANGO_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $DIST_DIR
echo 'gtk-theme-name = "MS-Windows"' > $DIST_DIR/etc/gtk-2.0/gtkrc
wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GAIL_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $POPT_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GCONF_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GDK_PIXBUF_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GNOME_VFS_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
smart_wget $LIBICONV_URL $DOWNLOAD_DIR
unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $DIST_DIR
#wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $PANGO_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $POPT_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $DIST_DIR
echo 'gtk-theme-name = "MS-Windows"' > $DIST_DIR/etc/gtk-2.0/gtkrc
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gtk2-themes-*
cp -a $TMP_UDIR/gtk2-themes-*/lib $DIST_DIR/
cp -a $TMP_UDIR/gtk2-themes-*/share $DIST_DIR/
@@ -128,6 +124,10 @@ function dist_gnome() {
mv $TMP_UDIR/gtk2_prefs-*/gtk2_prefs.exe $DIST_DIR/bin
rm -rf $TMP_UDIR/gtk2_prefs-*
wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $DIST_DIR
cp -a $_GNOME_UDIR/bin/libxml*.dll $DIST_DIR/bin
rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
if [ -d $DIST_UDIR/lib/locale ] ; then
# Huh, is this removed in newer gtk?
@@ -136,30 +136,10 @@ function dist_gnome() {
fi
}
function dist_isocodes() {
setup isocodes
mkdir -p $DIST_UDIR/share
cp -a $_ISOCODES_UDIR/share/{locale,xml} $DIST_UDIR/share
}
function dist_pcre() {
setup pcre
mkdir -p $DIST_UDIR/bin
cp -a $_PCRE_UDIR/bin/pcre3.dll $DIST_UDIR/bin
}
function dist_libbonoboui() {
setup libbonoboui
mkdir -p $DIST_UDIR/bin
cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $DIST_UDIR/bin
}
function dist_libgsf() {
setup libGSF
mkdir -p $DIST_UDIR/bin
cp -a $_LIBGSF_UDIR/bin/libgsf*.dll $DIST_UDIR/bin
mkdir -p $DIST_UDIR/share
cp -a $_LIBGSF_UDIR/share/locale $DIST_UDIR/share
function dist_gnutls() {
setup gnutls
cp -a ${_GNUTLS_UDIR}/bin/*.dll ${DIST_UDIR}/bin
cp -a ${_GNUTLS_UDIR}/bin/*.exe ${DIST_UDIR}/bin
}
function dist_goffice() {
@@ -172,24 +152,13 @@ function dist_goffice() {
cp -a $_GOFFICE_UDIR/share/{goffice,locale,pixmaps} $DIST_UDIR/share
}
function dist_libofx() {
setup OpenSP and LibOFX
cp -a ${_OPENSP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
cp -a ${_OPENSP_UDIR}/share/OpenSP ${DIST_UDIR}/share
cp -a ${_LIBOFX_UDIR}/bin/*.dll ${DIST_UDIR}/bin
cp -a ${_LIBOFX_UDIR}/bin/*.exe ${DIST_UDIR}/bin
cp -a ${_LIBOFX_UDIR}/share/libofx ${DIST_UDIR}/share
}
function dist_gnutls() {
setup gnutls
cp -a ${_GNUTLS_UDIR}/bin/*.dll ${DIST_UDIR}/bin
cp -a ${_GNUTLS_UDIR}/bin/*.exe ${DIST_UDIR}/bin
}
function dist_gmp() {
setup gmp
cp -a ${_GMP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
function dist_guile() {
setup Guile
mkdir -p $DIST_UDIR/bin
cp -a $_GUILE_UDIR/bin/libguile{.,-srfi}*dll $DIST_UDIR/bin
cp -a $_GUILE_UDIR/bin/guile.exe $DIST_UDIR/bin
mkdir -p $DIST_UDIR/share
cp -a $_GUILE_UDIR/share/guile $DIST_UDIR/share
}
function dist_gwenhywfar() {
@@ -201,19 +170,22 @@ function dist_gwenhywfar() {
cp -a ${_GWENHYWFAR_UDIR}/share/gwenhywfar/ca-bundle.crt ${DIST_UDIR}/share/gwenhywfar
}
function dist_isocodes() {
setup isocodes
mkdir -p $DIST_UDIR/share
cp -a $_ISOCODES_UDIR/share/{locale,xml} $DIST_UDIR/share
}
function dist_ktoblzcheck() {
setup ktoblzcheck
# dll is already copied in dist_gwenhywfar
cp -a ${_GWENHYWFAR_UDIR}/share/ktoblzcheck ${DIST_UDIR}/share
}
function dist_aqbanking() {
setup aqbanking
cp -a ${_AQBANKING_UDIR}/bin/*.exe ${DIST_UDIR}/bin
cp -a ${_AQBANKING_UDIR}/bin/*.dll ${DIST_UDIR}/bin
cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${DIST_UDIR}/lib
cp -a ${_AQBANKING_UDIR}/share/aqbanking ${DIST_UDIR}/share
cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/share
function dist_libbonoboui() {
setup libbonoboui
mkdir -p $DIST_UDIR/bin
cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $DIST_UDIR/bin
}
function dist_libdbi() {
@@ -228,14 +200,54 @@ function dist_libdbi() {
cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/*.dll ${DIST_UDIR}/lib/dbd
}
function dist_libgsf() {
setup libGSF
mkdir -p $DIST_UDIR/bin
cp -a $_LIBGSF_UDIR/bin/libgsf*.dll $DIST_UDIR/bin
mkdir -p $DIST_UDIR/share
cp -a $_LIBGSF_UDIR/share/locale $DIST_UDIR/share
}
function dist_libofx() {
setup OpenSP and LibOFX
cp -a ${_OPENSP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
cp -a ${_OPENSP_UDIR}/share/OpenSP ${DIST_UDIR}/share
cp -a ${_LIBOFX_UDIR}/bin/*.dll ${DIST_UDIR}/bin
cp -a ${_LIBOFX_UDIR}/bin/*.exe ${DIST_UDIR}/bin
cp -a ${_LIBOFX_UDIR}/share/libofx ${DIST_UDIR}/share
}
function dist_openssl() {
setup OpenSSL
_OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
mkdir -p $DIST_UDIR/bin
cp -a $_OPENSSL_UDIR/bin/*.dll $DIST_UDIR/bin
}
function dist_pcre() {
setup pcre
mkdir -p $DIST_UDIR/bin
cp -a $_PCRE_UDIR/bin/pcre3.dll $DIST_UDIR/bin
}
function dist_regex() {
setup RegEx
smart_wget $REGEX_URL $DOWNLOAD_DIR
unzip -q $LAST_FILE bin/libgnurx-0.dll -d $DIST_DIR
}
function dist_webkit() {
setup WebKit
cp -a ${_LIBSOUP_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_LIBXSLT_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_ENCHANT_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_WEBKIT_UDIR}/bin/* ${DIST_UDIR}/bin
}
function dist_gnucash() {
setup GnuCash
mkdir -p $DIST_UDIR/bin
cp $_MINGW_UDIR/bin/pthreadGC2.dll $DIST_UDIR/bin
cp -a $_INSTALL_UDIR/bin/* $DIST_UDIR/bin
mkdir -p $DIST_UDIR/etc/gconf/schemas
cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas

1913
packaging/win32/install-impl.sh
View File

File diff suppressed because it is too large Load Diff

9
packaging/win32/install.sh
View File

@@ -51,8 +51,8 @@ register_env_var READLINE_CPPFLAGS " "
register_env_var READLINE_LDFLAGS " "
register_env_var REGEX_CPPFLAGS " "
register_env_var REGEX_LDFLAGS " "
register_env_var WEBKIT_CFLAGS " "
register_env_var WEBKIT_LIBS " "
register_env_var SQLITE3_CFLAGS " "
register_env_var SQLITE3_LIBS " "
# steps
# There is no reason to ever need to comment these out!
@@ -97,7 +97,12 @@ add_step inst_gwenhywfar
add_step inst_ktoblzcheck
add_step inst_aqbanking
add_step inst_libdbi
# libsoup and enchant needed by webkit
add_step inst_libsoup
add_step inst_enchant
add_step inst_webkit
##
if [ "$UPDATE_SOURCES" = "yes" ]; then
add_step svn_up

26
packaging/win32/libxslt-1.1.22.Makefile.in.patch Executable file
View File

@@ -0,0 +1,26 @@
--- libxslt/Makefile.in.orig 2007-08-23 11:22:57 -0400
+++ libxslt/Makefile.in 2011-04-05 17:11:09 -0400
@@ -293,8 +293,8 @@
xsltwin32config.h.in \
libxslt.h
-libxslt_la_LIBADD = $(EXTRA_LIBS)
-libxslt_la_LDFLAGS = -version-info @LIBXSLT_VERSION_INFO@
+libxslt_la_LIBADD = $(EXTRA_LIBS) $(WIN32_EXTRA_LIBADD)
+libxslt_la_LDFLAGS = -version-info @LIBXSLT_VERSION_INFO@ $(WIN32_EXTRA_LDFLAGS)
man_MANS = libxslt.3
EXTRA_DIST = $(man_MANS) trio.h triodef.h
all: all-am
--- libexslt/Makefile.in.orig 2007-08-23 11:22:57 -0400
+++ libexslt/Makefile.in 2011-04-05 17:11:44 -0400
@@ -269,8 +269,8 @@
libexslt.h \
dynamic.c
-libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
-libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ $(LIBGCRYPT_LIBS)
+libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) $(WIN32_EXTRA_LIBADD)
+libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ $(LIBGCRYPT_LIBS) $(WIN32_EXTRA_LDFLAGS)
man_MANS = libexslt.3
EXTRA_DIST = $(man_MANS)
all: all-am

23
packaging/win32/webkit-1.2.7-configure.patch Executable file
View File

@@ -0,0 +1,23 @@
--- configure Tue Oct 05 06:02:37 2010
+++ configure Tue Jan 11 07:28:51 2011
@@ -1077,6 +1077,7 @@
enable_icon_database
enable_datalist
enable_ruby
+enable_sandbox
enable_video
enable_xhtmlmp
enable_xpath
@@ -19020,9 +19021,9 @@
# check whether to enable HTML5 sandbox iframe support
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable HTML5 sandboxed iframe support" >&5
$as_echo_n "checking whether to enable HTML5 sandboxed iframe support... " >&6; }
-# Check whether --enable-ruby was given.
-if test "${enable_ruby+set}" = set; then :
- enableval=$enable_ruby;
+# Check whether --enable-sandbox was given.
+if test "${enable_sandbox+set}" = set; then :
+ enableval=$enable_sandbox;
else
enable_sandbox="yes"
fi

143
packaging/win32/webkit-1.2.7-datadir.patch Executable file
View File

@@ -0,0 +1,143 @@
--- WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp Fri Sep 10 20:20:33 2010
+++ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp Tue Jan 11 12:47:14 2011
@@ -71,6 +71,30 @@
#include <glib/gi18n-lib.h>
#include <stdio.h>
+#ifdef _WIN32
+/* search for data relative to where we are installed */
+#include <shlobj.h>
+#include <assert.h>
+
+static HMODULE GetThisDllHandle()
+{
+ MEMORY_BASIC_INFORMATION info;
+ size_t len = VirtualQueryEx(GetCurrentProcess(), (void*)GetThisDllHandle, &info, sizeof(info));
+ assert(len == sizeof(info));
+ return len ? (HMODULE)info.AllocationBase : NULL;
+}
+
+const gchar *
+get_webkit_datadir(void)
+{
+ gchar *retval;
+ retval = g_build_filename (g_win32_get_package_installation_directory_of_module (GetThisDllHandle()), "/share", NULL);
+ return retval;
+}
+#undef DATA_DIR
+#define DATA_DIR get_webkit_datadir ()
+#endif
+
using namespace WebCore;
namespace WebKit {
@@ -989,7 +1013,13 @@
String content;
gchar* fileContent = 0;
+#ifdef _WIN32
+ gchar* errorPath = g_build_filename (DATA_DIR, "/webkit-1.0/resources/error.html", NULL);
+ gchar* errorURI = g_filename_to_uri(errorPath, NULL, NULL);
+ g_free(errorPath);
+#else
gchar* errorURI = g_filename_to_uri(DATA_DIR"/webkit-1.0/resources/error.html", NULL, NULL);
+#endif
GFile* errorFile = g_file_new_for_uri(errorURI);
g_free(errorURI);
--- WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp Fri Sep 10 20:20:33 2010
+++ WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp Mon Jan 17 07:42:35 2011
@@ -27,6 +27,31 @@
#include "NotImplemented.h"
#include "PlatformString.h"
+#ifdef _WIN32
+/* search for data relative to where we are installed */
+# include <shlobj.h>
+# include <assert.h>
+
+static HMODULE GetThisDllHandle()
+{
+ MEMORY_BASIC_INFORMATION info;
+ size_t len = VirtualQueryEx(GetCurrentProcess(), (void*)GetThisDllHandle, &info, sizeof(info));
+ assert(len == sizeof(info));
+ return len ? (HMODULE)info.AllocationBase : NULL;
+}
+
+const gchar *
+get_webkit_path(void)
+{
+ gchar *retval;
+ retval = g_build_filename (g_win32_get_package_installation_directory_of_module (GetThisDllHandle()), "/share", NULL);
+ return retval;
+}
+#undef DATA_DIR
+#define DATA_DIR get_webkit_path ()
+#endif
+
+
using namespace WebCore;
namespace WebKit {
@@ -67,21 +92,30 @@
webkit_web_inspector_set_web_view(webInspector, inspectorWebView);
GOwnPtr<gchar> inspectorURI;
-
+#ifdef _WIN32
+ gchar* inspectorPath = g_build_filename (DATA_DIR, "/webkit-1.0/webinspector/inspector.html", NULL);
+#endif
// Make the Web Inspector work when running tests
if (g_file_test("WebCore/inspector/front-end/inspector.html", G_FILE_TEST_EXISTS)) {
GOwnPtr<gchar> currentDirectory(g_get_current_dir());
GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/inspector/front-end/inspector.html", currentDirectory.get()));
inspectorURI.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
} else
+#ifdef _WIN32
+ inspectorURI.set(g_filename_to_uri(inspectorPath, NULL, NULL));
+#else
inspectorURI.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/inspector.html", NULL, NULL));
-
+#endif
webkit_web_view_load_uri(inspectorWebView, inspectorURI.get());
gtk_widget_show(GTK_WIDGET(inspectorWebView));
Page* inspectorPage = core(inspectorWebView);
inspectorPage->inspectorController()->setInspectorFrontendClient(new InspectorFrontendClient(m_inspectedWebView, inspectorWebView, webInspector, inspectorPage));
+
+#ifdef _WIN32
+ g_free(inspectorPath);
+#endif
}
void InspectorClient::highlight(Node* node)
@@ -145,6 +179,10 @@
String InspectorFrontendClient::localizedStringsURL()
{
GOwnPtr<gchar> URL;
+
+#ifdef _WIN32
+ gchar* localizedPath = g_build_filename (DATA_DIR, "/webkit-1.0/webinspector/localizedStrings.js", NULL);
+#endif
// Make the Web Inspector work when running tests
if (g_file_test("WebCore/English.lproj/localizedStrings.js", G_FILE_TEST_EXISTS)) {
@@ -152,10 +190,16 @@
GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/English.lproj/localizedStrings.js", currentDirectory.get()));
URL.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
} else
+#ifdef _WIN32
+ URL.set(g_filename_to_uri(localizedPath, NULL, NULL));
+#else
URL.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/localizedStrings.js", NULL, NULL));
-
+#endif
// FIXME: support l10n of localizedStrings.js
return String::fromUTF8(URL.get());
+#ifdef _WIN32
+ g_free(localizedPath);
+#endif
}
String InspectorFrontendClient::hiddenPanels()

33
packaging/win32/webkit-1.2.7-gccpath.patch Executable file
View File

@@ -0,0 +1,33 @@
--- WebCore/bindings/scripts/IDLParser.pm Thu Jan 15 16:14:12 1970
+++ WebCore/bindings/scripts/IDLParser.pm Thu Jan 15 16:14:12 1970
@@ -69,7 +69,7 @@
if (($Config::Config{'osname'}) =~ /solaris/i) {
$gccLocation = "/usr/sfw/bin/gcc";
} else {
- $gccLocation = "/usr/bin/gcc";
+ $gccLocation = "gcc";
}
$preprocessor = $gccLocation . " -E -P -x c++";
}
--- WebCore/css/make-css-file-arrays.pl Thu Jan 15 16:14:12 1970
+++ WebCore/css/make-css-file-arrays.pl Thu Jan 15 16:14:12 1970
@@ -33,7 +33,7 @@
if (($Config::Config{'osname'}) =~ /solaris/i) {
$gccLocation = "/usr/sfw/bin/gcc";
} else {
- $gccLocation = "/usr/bin/gcc";
+ $gccLocation = "gcc";
}
$preprocessor = $gccLocation . " -E -P -x c++";
}
--- WebCore/dom/make_names.pl Thu Jan 15 16:14:12 1970
+++ WebCore/dom/make_names.pl Thu Jan 15 16:14:12 1970
@@ -52,7 +52,7 @@
if (($Config::Config{'osname'}) =~ /solaris/i) {
$gccLocation = "/usr/sfw/bin/gcc";
} else {
- $gccLocation = "/usr/bin/gcc";
+ $gccLocation = "gcc";
}
my $preprocessor = $gccLocation . " -E -P -x c++";

81
packaging/win32/webkit-1.2.7-makefile.patch Executable file
View File

@@ -0,0 +1,81 @@
--- GNUmakefile Mon Jan 17 09:32:30 2011
+++ GNUmakefile Mon Jan 17 09:44:19 2011
@@ -6411,3 +6411,4 @@
STRIP = strip
-SYMBOL_VISIBILITY = -fvisibility=hidden
-SYMBOL_VISIBILITY_INLINES = -fvisibility-inlines-hidden
+SYMBOL_VISIBILITY =
+SYMBOL_VISIBILITY_INLINES =
+PTHREAD_LIBS = -lpthread
@@ -8967,7 +8967,7 @@
# It breaks the build on other platforms, so we use it conditionally
no_undefined = -no-undefined
#version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
-version_script = -export-symbols-regex "^(webkit_|JS).*"
+version_script = -export-symbols-regex "^(webkit_|k?JS).*"
# Shared libraries
lib_LTLIBRARIES = \
@@ -8987,7 +8987,7 @@
libJavaScriptCore_la_LIBADD = \
$(UNICODE_LIBS) \
$(GLIB_LIBS) \
- -lpthread
+ $(PTHREAD_LIBS)
libJavaScriptCore_la_CXXFLAGS = \
$(global_cxxflags) \
@@ -9042,7 +9042,6 @@
$(no_undefined)
libwebkit_1_0_la_LIBADD = \
- -lpthread \
libJavaScriptCore.la \
libWebCoreJS.la \
$(webcore_ldflags) \
@@ -9064,7 +9063,8 @@
$(PNG_LIBS) \
$(SQLITE3_LIBS) \
$(UNICODE_LIBS) \
- $(XT_LIBS)
+ $(PTHREAD_LIBS) \
+ $(XT_LIBS) -lwinmm -lshlwapi -lole32
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
@@ -9104,7 +9104,7 @@
Programs_minidom_LDADD = \
libJavaScriptCore.la \
-lm \
- -lstdc++
+ -lstdc++ -lwinmm
Programs_minidom_LDFLAGS = \
-no-install \
@@ -9127,7 +9127,7 @@
$(UNICODE_CFLAGS)
Programs_jsc_LDADD = \
- libJavaScriptCore.la
+ libJavaScriptCore.la -lwinmm
WebCore := $(srcdir)/WebCore
@@ -9263,7 +9263,7 @@
Programs_GtkLauncher_LDADD = \
libwebkit-1.0.la \
$(GTK_LIBS) \
- $(GLIB_LIBS)
+ $(GLIB_LIBS) -lwinmm
Programs_GtkLauncher_LDFLAGS = \
-no-fast-install \
@@ -9326,7 +9326,7 @@
$(GTK_LIBS) \
$(GLIB_LIBS) \
$(LIBSOUP_LIBS) \
- $(FREETYPE_LIBS)
+ $(FREETYPE_LIBS) -lwinmm
Programs_DumpRenderTree_LDFLAGS = \
-no-fast-install \

592
packaging/win32/webkit-1.2.7-mingw32.patch Executable file
View File

@@ -0,0 +1,592 @@
--- JavaScriptCore/jit/ExecutableAllocator.h 2010-05-07 16:09:08.000000000 +0200
+++ JavaScriptCore/jit/ExecutableAllocator.h 2010-05-17 22:33:16.000000000 +0200
@@ -285,7 +285,7 @@
inline ExecutablePool::ExecutablePool(size_t n)
{
size_t allocSize = roundUpAllocationSize(n, JIT_ALLOCATOR_PAGE_SIZE);
- Allocation mem = systemAlloc(allocSize);
+ const Allocation mem = systemAlloc(allocSize);
m_pools.append(mem);
m_freePtr = mem.pages;
if (!m_freePtr)
--- JavaScriptCore/runtime/Collector.cpp (revision 63307)
+++ JavaScriptCore/runtime/Collector.cpp (working copy)
@@ -91,6 +91,13 @@
#define COLLECT_ON_EVERY_ALLOCATION 0
+#if COMPILER(MINGW64)
+extern "C" {
+void * __mingw_aligned_malloc (size_t, size_t);
+void __mingw_aligned_free (void *);
+}
+#endif
+
using std::max;
namespace JSC {
@@ -201,7 +208,7 @@
#elif OS(WINCE)
void* address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
#elif OS(WINDOWS)
-#if COMPILER(MINGW) && !COMPILER(MINGW64)
+#if COMPILER(MINGW)
void* address = __mingw_aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
#else
void* address = _aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
@@ -292,7 +299,7 @@
#elif OS(WINCE)
VirtualFree(block, 0, MEM_RELEASE);
#elif OS(WINDOWS)
-#if COMPILER(MINGW) && !COMPILER(MINGW64)
+#if COMPILER(MINGW)
__mingw_aligned_free(block);
#else
_aligned_free(block);
--- JavaScriptCore/wtf/TCSpinLock.h 2010-03-19 16:20:53.000000000 +0100
+++ JavaScriptCore/wtf/TCSpinLock.h 2010-05-17 22:33:16.000000000 +0200
@@ -37,8 +37,6 @@
#include <time.h> /* For nanosleep() */
-#include <sched.h> /* For sched_yield() */
-
#if HAVE(STDINT_H)
#include <stdint.h>
#elif HAVE(INTTYPES_H)
@@ -134,7 +132,7 @@
#define SPINLOCK_INITIALIZER { 0 }
static void TCMalloc_SlowLock(volatile unsigned int* lockword) {
- sched_yield(); // Yield immediately since fast path failed
+ Sleep(0); // Yield immediately since fast path failed
while (true) {
int r;
#if COMPILER(GCC)
--- JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp 2010-03-19 16:20:53.000000000 +0100
+++ JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp 2010-05-17 22:33:16.000000000 +0200
@@ -49,7 +49,7 @@
GOwnPtr<GError> gerror;
GOwnPtr<char> utf8src;
- utf8src.set(g_utf16_to_utf8(src, srcLength, 0, 0, &gerror.outPtr()));
+ utf8src.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(src), srcLength, 0, 0, &gerror.outPtr()));
if (gerror) {
*error = true;
return -1;
@@ -60,7 +60,7 @@
long utf16resultLength = -1;
GOwnPtr<UChar> utf16result;
- utf16result.set(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr()));
+ utf16result.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr())));
if (gerror) {
*error = true;
return -1;
@@ -81,7 +81,7 @@
GOwnPtr<GError> gerror;
GOwnPtr<char> utf8src;
- utf8src.set(g_utf16_to_utf8(src, srcLength, 0, 0, &gerror.outPtr()));
+ utf8src.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(src), srcLength, 0, 0, &gerror.outPtr()));
if (gerror) {
*error = true;
return -1;
@@ -92,7 +92,7 @@
long utf16resultLength = -1;
GOwnPtr<UChar> utf16result;
- utf16result.set(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr()));
+ utf16result.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr())));
if (gerror) {
*error = true;
return -1;
@@ -113,7 +113,7 @@
GOwnPtr<GError> gerror;
GOwnPtr<char> utf8src;
- utf8src.set(g_utf16_to_utf8(src, srcLength, 0, 0, &gerror.outPtr()));
+ utf8src.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(src), srcLength, 0, 0, &gerror.outPtr()));
if (gerror) {
*error = true;
return -1;
@@ -124,7 +124,7 @@
long utf16resultLength = -1;
GOwnPtr<UChar> utf16result;
- utf16result.set(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr()));
+ utf16result.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr())));
if (gerror) {
*error = true;
return -1;
@@ -189,8 +189,8 @@
GOwnPtr<char> utf8a;
GOwnPtr<char> utf8b;
- utf8a.set(g_utf16_to_utf8(a, len, 0, 0, 0));
- utf8b.set(g_utf16_to_utf8(b, len, 0, 0, 0));
+ utf8a.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(a), len, 0, 0, 0));
+ utf8b.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(b), len, 0, 0, 0));
GOwnPtr<char> foldedA;
GOwnPtr<char> foldedB;
--- JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h 2010-03-19 16:20:53.000000000 +0100
+++ JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h 2010-05-17 22:33:16.000000000 +0200
@@ -34,7 +34,12 @@
#include <stdlib.h>
#include <string.h>
-typedef uint16_t UChar;
+#if !defined(WIN32) && !defined(_WIN32) && !defined(__WINSCW__) \
+ && !(defined(__CC_ARM) || defined(__ARMCC__)) /* RVCT */
+ typedef unsigned short UChar;
+#else
+ typedef wchar_t UChar;
+#endif
typedef int32_t UChar32;
namespace WTF {
--- WebCore/bindings/js/ScriptObject.cpp 2010-05-07 16:09:09.000000000 +0200
+++ WebCore/bindings/js/ScriptObject.cpp 2010-05-17 22:33:16.000000000 +0200
@@ -136,6 +136,14 @@
return handleException(m_scriptState);
}
+bool ScriptObject::set(const char* name, unsigned long long value)
+{
+ JSLock lock(SilenceAssertionsOnly);
+ PutPropertySlot slot;
+ jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
+ return handleException(m_scriptState);
+}
+
bool ScriptObject::set(const char* name, bool value)
{
JSLock lock(SilenceAssertionsOnly);
--- WebCore/bindings/js/ScriptObject.h 2010-03-19 16:20:54.000000000 +0100
+++ WebCore/bindings/js/ScriptObject.h 2010-05-17 22:33:16.000000000 +0200
@@ -59,6 +59,7 @@
bool set(const char* name, unsigned);
bool set(const char* name, unsigned long);
bool set(const char* name, bool);
+ bool set(const char* name, unsigned long long);
static ScriptObject createNew(ScriptState*);
--- WebCore/dom/XMLTokenizerLibxml2.cpp 2010-05-07 16:09:09.000000000 +0200
+++ WebCore/dom/XMLTokenizerLibxml2.cpp 2010-05-17 22:33:16.000000000 +0200
@@ -908,7 +908,7 @@
if (m_parserStopped)
return;
-#if COMPILER(MSVC) || COMPILER(RVCT)
+#if OS(WINDOWS) || COMPILER(RVCT)
char m[1024];
vsnprintf(m, sizeof(m) - 1, message, args);
#else
@@ -922,7 +922,7 @@
else
handleError(type, m, lineNumber(), columnNumber());
-#if !COMPILER(MSVC) && !COMPILER(RVCT)
+#if !OS(WINDOWS) && !COMPILER(RVCT)
free(m);
#endif
}
--- WebCore/platform/FileSystem.h 2010-05-07 16:09:09.000000000 +0200
+++ WebCore/platform/FileSystem.h 2010-05-17 22:33:16.000000000 +0200
@@ -64,7 +64,7 @@
class CString;
// PlatformModule
-#if OS(WINDOWS)
+#if OS(WINDOWS) && !PLATFORM(GTK)
typedef HMODULE PlatformModule;
#elif PLATFORM(QT)
#if defined(Q_WS_MAC)
@@ -107,7 +107,7 @@
#if PLATFORM(QT)
typedef QFile* PlatformFileHandle;
const PlatformFileHandle invalidPlatformFileHandle = 0;
-#elif OS(WINDOWS)
+#elif OS(WINDOWS) && !PLATFORM(GTK)
typedef HANDLE PlatformFileHandle;
// FIXME: -1 is INVALID_HANDLE_VALUE, defined in <winbase.h>. Chromium tries to
// avoid using Windows headers in headers. We'd rather move this into the .cpp.
@@ -142,7 +142,7 @@
// Methods for dealing with loadable modules
bool unloadModule(PlatformModule);
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) && !PLATFORM(GTK)
String localUserSpecificStorageDirectory();
String roamingUserSpecificStorageDirectory();
--- WebCore/platform/gtk/GeolocationServiceGtk.cpp 2010-05-07 16:09:09.000000000 +0200
+++ WebCore/platform/gtk/GeolocationServiceGtk.cpp 2010-05-17 22:33:16.000000000 +0200
@@ -18,6 +18,11 @@
*/
#include "config.h"
+
+#ifdef interface
+#undef interface
+#endif
+
#include "GeolocationServiceGtk.h"
#include "CString.h"
--- WebCore/platform/gtk/GeolocationServiceGtk.h 2010-03-19 16:20:54.000000000 +0100
+++ WebCore/platform/gtk/GeolocationServiceGtk.h 2010-05-17 22:33:16.000000000 +0200
@@ -25,6 +25,10 @@
#include "PositionError.h"
#include "RefPtr.h"
+#ifdef interface
+#undef interface
+#endif
+
#include <geoclue/geoclue-master.h>
#include <geoclue/geoclue-position.h>
--- WebCore/platform/KURL.cpp 2010-05-07 16:09:09.000000000 +0200
+++ WebCore/platform/KURL.cpp 2010-05-17 22:33:16.000000000 +0200
@@ -1425,7 +1425,7 @@
#elif USE(GLIB_UNICODE)
GOwnPtr<gchar> utf8Hostname;
GOwnPtr<GError> utf8Err;
- utf8Hostname.set(g_utf16_to_utf8(str, strLen, 0, 0, &utf8Err.outPtr()));
+ utf8Hostname.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(str), strLen, 0, 0, &utf8Err.outPtr()));
if (utf8Err)
return;
--- WebCore/platform/network/soup/ResourceHandleSoup.cpp (revision 60658)
+++ WebCore/platform/network/soup/ResourceHandleSoup.cpp (working copy)
@@ -856,7 +856,11 @@
return;
}
+#if OS(WINDOWS)
+ response.setMimeType(g_content_type_get_mime_type(g_file_info_get_content_type(info)));
+#else
response.setMimeType(g_file_info_get_content_type(info));
+#endif
response.setExpectedContentLength(g_file_info_get_size(info));
GTimeVal tv;
--- WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp 2010-03-19 16:20:54.000000000 +0100
+++ WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp 2010-05-17 22:33:16.000000000 +0200
@@ -59,7 +59,7 @@
long utf8len;
GOwnPtr<char> utf8;
- utf8.set(g_utf16_to_utf8(string, length, 0, &utf8len, 0));
+ utf8.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(string), length, 0, &utf8len, 0));
// FIXME: assumes no surrogate pairs
--- WebCore/platform/text/TextEncoding.cpp 2010-05-07 16:09:09.000000000 +0200
+++ WebCore/platform/text/TextEncoding.cpp 2010-05-17 22:33:16.000000000 +0200
@@ -119,14 +119,14 @@
return newTextCodec(*this)->encode(reinterpret_cast<const UChar *>(str.utf16()), str.length(), handling);
#elif USE(GLIB_UNICODE)
GOwnPtr<char> UTF8Source;
- UTF8Source.set(g_utf16_to_utf8(characters, length, 0, 0, 0));
+ UTF8Source.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(characters), length, 0, 0, 0));
GOwnPtr<char> UTF8Normalized;
UTF8Normalized.set(g_utf8_normalize(UTF8Source.get(), -1, G_NORMALIZE_NFC));
long UTF16Length;
GOwnPtr<UChar> UTF16Normalized;
- UTF16Normalized.set(g_utf8_to_utf16(UTF8Normalized.get(), -1, 0, &UTF16Length, 0));
+ UTF16Normalized.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(UTF8Normalized.get(), -1, 0, &UTF16Length, 0)));
return newTextCodec(*this)->encode(UTF16Normalized.get(), UTF16Length, handling);
#elif OS(WINCE)
--- WebCore/plugins/gtk/PluginViewGtk.cpp 2010-05-07 16:09:09.000000000 +0200
+++ WebCore/plugins/gtk/PluginViewGtk.cpp 2010-05-17 22:33:16.000000000 +0200
@@ -45,6 +45,7 @@
#include "Image.h"
#include "KeyboardEvent.h"
#include "MouseEvent.h"
+#include "NotImplemented.h"
#include "Page.h"
#include "PlatformKeyboardEvent.h"
#include "PlatformMouseEvent.h"
@@ -71,7 +72,7 @@
#include <cairo/cairo-xlib.h>
#include <gdk/gdkx.h>
#elif defined(GDK_WINDOWING_WIN32)
-#include "PluginMessageThrottlerWin.h"
+#include "win/PluginMessageThrottlerWin.h"
#include <gdk/gdkwin32.h>
#endif
@@ -706,6 +707,7 @@
gtk_widget_queue_draw(m_parentFrame->view()->hostWindow()->platformPageClient());
}
+#ifndef GDK_WINDOWING_WIN32
static Display* getPluginDisplay()
{
// The plugin toolkit might have a different X connection open. Since we're
@@ -719,6 +721,7 @@
return 0;
#endif
}
+#endif
#if defined(XP_UNIX)
static void getVisualAndColormap(int depth, Visual** visual, Colormap* colormap)
@@ -788,15 +791,16 @@
PluginView::setCurrentPluginView(this);
JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
setCallingPlugin(true);
+#if defined(XP_UNIX)
m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginNeedsXEmbed, &m_needsXEmbed);
+#endif
setCallingPlugin(false);
PluginView::setCurrentPluginView(0);
}
if (m_isWindowed) {
-#if defined(XP_UNIX)
GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
-
+#if defined(XP_UNIX)
if (m_needsXEmbed) {
// If our parent is not anchored the startup process will
// fail miserably for XEmbed plugins a bit later on when
@@ -817,7 +821,9 @@
#endif
} else {
setPlatformWidget(0);
+#if defined(XP_UNIX)
m_pluginDisplay = getPluginDisplay();
+#endif
}
show();
--- WebCore/plugins/PluginView.cpp 2010-05-07 16:09:09.000000000 +0200
+++ WebCore/plugins/PluginView.cpp 2010-05-17 22:33:16.000000000 +0200
@@ -68,7 +68,7 @@
#include <wtf/ASCIICType.h>
#if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
-#include "PluginMessageThrottlerWin.h"
+#include "win/PluginMessageThrottlerWin.h"
#endif
using JSC::ExecState;
@@ -333,7 +333,7 @@
JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
#if ENABLE(NETSCAPE_PLUGIN_API)
-#ifdef XP_WIN
+#if defined(XP_WIN) && !PLATFORM(GTK)
// Unsubclass the window
if (m_isWindowed) {
#if OS(WINCE)
--- WebCore/plugins/PluginView.h 2010-05-07 16:09:09.000000000 +0200
+++ WebCore/plugins/PluginView.h 2010-05-17 22:33:16.000000000 +0200
@@ -313,7 +313,7 @@
bool m_haveInitialized;
bool m_isWaitingToStart;
-#if defined(XP_UNIX)
+#if defined(XP_UNIX) || PLATFORM(GTK)
bool m_needsXEmbed;
#endif
@@ -341,7 +341,7 @@
private:
-#if defined(XP_UNIX) || OS(SYMBIAN)
+#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(GTK)
void setNPWindowIfNeeded();
#elif defined(XP_MACOSX)
NP_CGContext m_npCgContext;
--- WebCore/plugins/win/PluginDatabaseWin.cpp 2010-03-19 16:20:54.000000000 +0100
+++ WebCore/plugins/win/PluginDatabaseWin.cpp 2010-05-17 22:33:16.000000000 +0200
@@ -34,7 +34,7 @@
#include <windows.h>
#include <shlwapi.h>
-#if COMPILER(MINGW)
+#if COMPILER(MINGW) && !COMPILER(MINGW64)
#define _countof(x) (sizeof(x)/sizeof(x[0]))
#endif
@@ -104,7 +104,7 @@
DWORD pathStrSize = sizeof(pathStr);
DWORD type;
- result = SHGetValue(key, name, TEXT("Path"), &type, (LPBYTE)pathStr, &pathStrSize);
+ result = SHGetValueW(key, name, L"Path", &type, (LPBYTE)pathStr, &pathStrSize);
if (result != ERROR_SUCCESS || type != REG_SZ)
continue;
@@ -212,7 +212,7 @@
HKEY key;
LONG result;
- result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Mozilla"), 0, KEY_READ, &key);
+ result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Mozilla", 0, KEY_READ, &key);
if (result == ERROR_SUCCESS) {
WCHAR name[128];
FILETIME lastModified;
@@ -229,7 +229,7 @@
HKEY extensionsKey;
// Try opening the key
- result = RegOpenKeyEx(key, extensionsPath.charactersWithNullTermination(), 0, KEY_READ, &extensionsKey);
+ result = RegOpenKeyExW(key, extensionsPath.charactersWithNullTermination(), 0, KEY_READ, &extensionsKey);
if (result == ERROR_SUCCESS) {
// Now get the plugins directory
@@ -237,7 +237,7 @@
DWORD pluginsDirectorySize = sizeof(pluginsDirectoryStr);
DWORD type;
- result = RegQueryValueEx(extensionsKey, TEXT("Plugins"), 0, &type, (LPBYTE)&pluginsDirectoryStr, &pluginsDirectorySize);
+ result = RegQueryValueExW(extensionsKey, L"Plugins", 0, &type, (LPBYTE)&pluginsDirectoryStr, &pluginsDirectorySize);
if (result == ERROR_SUCCESS && type == REG_SZ)
directories.append(String(pluginsDirectoryStr, pluginsDirectorySize / sizeof(WCHAR) - 1));
@@ -255,7 +255,7 @@
#if !OS(WINCE)
// The new WMP Firefox plugin is installed in \PFiles\Plugins if it can't find any Firefox installs
WCHAR pluginDirectoryStr[_MAX_PATH + 1];
- DWORD pluginDirectorySize = ::ExpandEnvironmentStringsW(TEXT("%SYSTEMDRIVE%\\PFiles\\Plugins"), pluginDirectoryStr, _countof(pluginDirectoryStr));
+ DWORD pluginDirectorySize = ::ExpandEnvironmentStringsW(L"%SYSTEMDRIVE%\\PFiles\\Plugins", pluginDirectoryStr, _countof(pluginDirectoryStr));
if (pluginDirectorySize > 0 && pluginDirectorySize <= _countof(pluginDirectoryStr))
directories.append(String(pluginDirectoryStr, pluginDirectorySize - 1));
@@ -265,7 +265,7 @@
WCHAR installationDirectoryStr[_MAX_PATH];
DWORD installationDirectorySize = sizeof(installationDirectoryStr);
- HRESULT result = SHGetValue(HKEY_LOCAL_MACHINE, TEXT("Software\\Microsoft\\MediaPlayer"), TEXT("Installation Directory"), &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
+ HRESULT result = SHGetValueW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\MediaPlayer", L"Installation Directory", &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
if (result == ERROR_SUCCESS && type == REG_SZ)
directories.append(String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1));
@@ -277,7 +277,7 @@
WCHAR installationDirectoryStr[_MAX_PATH];
DWORD installationDirectorySize = sizeof(installationDirectoryStr);
- HRESULT result = SHGetValue(HKEY_LOCAL_MACHINE, TEXT("Software\\Apple Computer, Inc.\\QuickTime"), TEXT("InstallDir"), &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
+ HRESULT result = SHGetValueW(HKEY_LOCAL_MACHINE, L"Software\\Apple Computer, Inc.\\QuickTime", L"InstallDir", &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
if (result == ERROR_SUCCESS && type == REG_SZ) {
String pluginDir = String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1) + "\\plugins";
@@ -288,7 +288,7 @@
static inline void addAdobeAcrobatPluginDirectory(Vector<String>& directories)
{
HKEY key;
- HRESULT result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Adobe\\Acrobat Reader"), 0, KEY_READ, &key);
+ HRESULT result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Adobe\\Acrobat Reader", 0, KEY_READ, &key);
if (result != ERROR_SUCCESS)
return;
@@ -319,7 +319,7 @@
DWORD acrobatInstallPathSize = sizeof(acrobatInstallPathStr);
String acrobatPluginKeyPath = "Software\\Adobe\\Acrobat Reader\\" + latestAcrobatVersionString + "\\InstallPath";
- result = SHGetValue(HKEY_LOCAL_MACHINE, acrobatPluginKeyPath.charactersWithNullTermination(), 0, &type, (LPBYTE)acrobatInstallPathStr, &acrobatInstallPathSize);
+ result = SHGetValueW(HKEY_LOCAL_MACHINE, acrobatPluginKeyPath.charactersWithNullTermination(), 0, &type, (LPBYTE)acrobatInstallPathStr, &acrobatInstallPathSize);
if (result == ERROR_SUCCESS) {
String acrobatPluginDirectory = String(acrobatInstallPathStr, acrobatInstallPathSize / sizeof(WCHAR) - 1) + "\\browser";
@@ -339,12 +339,12 @@
if (!cachedPluginDirectory) {
cachedPluginDirectory = true;
- int moduleFileNameLen = GetModuleFileName(0, moduleFileNameStr, _MAX_PATH);
+ int moduleFileNameLen = GetModuleFileNameW(0, moduleFileNameStr, _MAX_PATH);
if (!moduleFileNameLen || moduleFileNameLen == _MAX_PATH)
goto exit;
- if (!PathRemoveFileSpec(moduleFileNameStr))
+ if (!PathRemoveFileSpecW(moduleFileNameStr))
goto exit;
pluginsDirectory = String(moduleFileNameStr) + "\\Plugins";
@@ -358,15 +358,15 @@
#if !OS(WINCE)
WCHAR systemDirectoryStr[MAX_PATH];
- if (GetSystemDirectory(systemDirectoryStr, _countof(systemDirectoryStr)) == 0)
+ if (GetSystemDirectoryW(systemDirectoryStr, _countof(systemDirectoryStr)) == 0)
return;
WCHAR macromediaDirectoryStr[MAX_PATH];
- PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Flash"));
+ PathCombineW(macromediaDirectoryStr, systemDirectoryStr, L"macromed\\Flash");
directories.append(macromediaDirectoryStr);
- PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Shockwave 10"));
+ PathCombineW(macromediaDirectoryStr, systemDirectoryStr, L"macromed\\Shockwave 10");
directories.append(macromediaDirectoryStr);
#endif
}
--- WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp 2010-05-07 16:09:09.000000000 +0200
+++ WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp 2010-05-17 22:33:16.000000000 +0200
@@ -660,7 +660,7 @@
if (!dicts)
return;
- gchar* ctext = g_utf16_to_utf8(const_cast<gunichar2*>(text), length, 0, 0, 0);
+ gchar* ctext = g_utf16_to_utf8(const_cast<gunichar2*>(reinterpret_cast<const gunichar2*>(text)), length, 0, 0, 0);
int utflen = g_utf8_strlen(ctext, -1);
PangoLanguage* language = pango_language_get_default();
--- WebCore/platform/Arena.h 2010-05-18 18:02:56.000000000 +0200
+++ WebCore/platform/Arena.h 2010-05-18 18:03:33.000000000 +0200
@@ -44,7 +44,7 @@
namespace WebCore {
-typedef unsigned long uword;
+typedef uintptr_t uword;
struct Arena {
Arena* next; // next arena
--- WebCore/platform/text/TextStream.cpp 2010-05-07 16:09:09.000000000 +0200
+++ WebCore/platform/text/TextStream.cpp 2010-05-18 23:12:39.000000000 +0200
@@ -90,7 +90,7 @@
return *this;
}
-TextStream& TextStream::operator<<(void* p)
+TextStream& TextStream::operator<<(const void* p)
{
char buffer[printBufferSize];
snprintf(buffer, sizeof(buffer) - 1, "%p", p);
@@ -108,7 +108,7 @@
return String::adopt(m_text);
}
-#if OS(WINDOWS) && PLATFORM(X86_64) && COMPILER(MSVC)
+#if OS(WINDOWS) && CPU(X86_64)
TextStream& TextStream::operator<<(__int64 i)
{
char buffer[printBufferSize];
--- WebCore/platform/text/TextStream.h 2010-05-07 16:09:09.000000000 +0200
+++ WebCore/platform/text/TextStream.h 2010-05-18 23:12:39.000000000 +0200
@@ -43,9 +43,9 @@
TextStream& operator<<(float);
TextStream& operator<<(double);
TextStream& operator<<(const char*);
- TextStream& operator<<(void*);
+ TextStream& operator<<(const void*);
TextStream& operator<<(const String&);
-#if OS(WINDOWS) && PLATFORM(X86_64) && COMPILER(MSVC)
+#if OS(WINDOWS) && CPU(X86_64)
TextStream& operator<<(unsigned __int64);
TextStream& operator<<(__int64);
#endif

10
packaging/win32/webkit-1.2.7-nosvg.patch Executable file
View File

@@ -0,0 +1,10 @@
--- WebCore/bindings/js/JSNodeCustom.cpp.ori Sun Jan 23 11:38:08 2011
+++ WebCore/bindings/js/JSNodeCustom.cpp Sun Jan 23 11:37:57 2011
@@ -34,6 +34,7 @@
#include "DocumentType.h"
#include "Entity.h"
#include "EntityReference.h"
+#include "ExceptionCode.h"
#include "HTMLElement.h"
#include "JSAttr.h"
#include "JSCDATASection.h"

248
packaging/win32/webkitenumtypes.cpp Executable file
View File

@@ -0,0 +1,248 @@
/* Generated data (by glib-mkenums) */
#include <config.h>
#include <glib-object.h>
#include "./WebKit/gtk/webkit/webkitenumtypes.h"
extern "C" {
/* enumerations from "./WebKit/gtk/webkit/webkitdownload.h" */
static const GEnumValue _webkit_download_status_values[] = {
{ WEBKIT_DOWNLOAD_STATUS_ERROR, "WEBKIT_DOWNLOAD_STATUS_ERROR", "error" },
{ WEBKIT_DOWNLOAD_STATUS_CREATED, "WEBKIT_DOWNLOAD_STATUS_CREATED", "created" },
{ WEBKIT_DOWNLOAD_STATUS_STARTED, "WEBKIT_DOWNLOAD_STATUS_STARTED", "started" },
{ WEBKIT_DOWNLOAD_STATUS_CANCELLED, "WEBKIT_DOWNLOAD_STATUS_CANCELLED", "cancelled" },
{ WEBKIT_DOWNLOAD_STATUS_FINISHED, "WEBKIT_DOWNLOAD_STATUS_FINISHED", "finished" },
{ 0, NULL, NULL }
};
GType webkit_download_status_get_type(void)
{
static GType type = 0;
if (!type)
type = g_enum_register_static("WebKitDownloadStatus", _webkit_download_status_values);
return type;
}
static const GEnumValue _webkit_download_error_values[] = {
{ WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER, "WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER", "cancelled-by-user" },
{ WEBKIT_DOWNLOAD_ERROR_DESTINATION, "WEBKIT_DOWNLOAD_ERROR_DESTINATION", "destination" },
{ WEBKIT_DOWNLOAD_ERROR_NETWORK, "WEBKIT_DOWNLOAD_ERROR_NETWORK", "network" },
{ 0, NULL, NULL }
};
GType webkit_download_error_get_type(void)
{
static GType type = 0;
if (!type)
type = g_enum_register_static("WebKitDownloadError", _webkit_download_error_values);
return type;
}
/* enumerations from "./WebKit/gtk/webkit/webkiterror.h" */
static const GEnumValue _webkit_network_error_values[] = {
{ WEBKIT_NETWORK_ERROR_FAILED, "WEBKIT_NETWORK_ERROR_FAILED", "failed" },
{ WEBKIT_NETWORK_ERROR_TRANSPORT, "WEBKIT_NETWORK_ERROR_TRANSPORT", "transport" },
{ WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL, "WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL", "unknown-protocol" },
{ WEBKIT_NETWORK_ERROR_CANCELLED, "WEBKIT_NETWORK_ERROR_CANCELLED", "cancelled" },
{ WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST, "WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST", "file-does-not-exist" },
{ 0, NULL, NULL }
};
GType webkit_network_error_get_type(void)
{
static GType type = 0;
if (!type)
type = g_enum_register_static("WebKitNetworkError", _webkit_network_error_values);
return type;
}
static const GEnumValue _webkit_policy_error_values[] = {
{ WEBKIT_POLICY_ERROR_FAILED, "WEBKIT_POLICY_ERROR_FAILED", "failed" },
{ WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE, "WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE", "cannot-show-mime-type" },
{ WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL, "WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL", "cannot-show-url" },
{ WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE, "WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE", "frame-load-interrupted-by-policy-change" },
{ WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT, "WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT", "cannot-use-restricted-port" },
{ 0, NULL, NULL }
};
GType webkit_policy_error_get_type(void)
{
static GType type = 0;
if (!type)
type = g_enum_register_static("WebKitPolicyError", _webkit_policy_error_values);
return type;
}
static const GEnumValue _webkit_plugin_error_values[] = {
{ WEBKIT_PLUGIN_ERROR_FAILED, "WEBKIT_PLUGIN_ERROR_FAILED", "failed" },
{ WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN, "WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN", "cannot-find-plugin" },
{ WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN, "WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN", "cannot-load-plugin" },
{ WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE, "WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE", "java-unavailable" },
{ WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED, "WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED", "connection-cancelled" },
{ WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD, "WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD", "will-handle-load" },
{ 0, NULL, NULL }
};
GType webkit_plugin_error_get_type(void)
{
static GType type = 0;
if (!type)
type = g_enum_register_static("WebKitPluginError", _webkit_plugin_error_values);
return type;
}
/* enumerations from "./WebKit/gtk/webkit/webkithittestresult.h" */
static const GFlagsValue _webkit_hit_test_result_context_values[] = {
{ WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT, "WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT", "document" },
{ WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK, "WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK", "link" },
{ WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE, "WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE", "image" },
{ WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA, "WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA", "media" },
{ WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION, "WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION", "selection" },
{ WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE, "WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE", "editable" },
{ 0, NULL, NULL }
};
GType webkit_hit_test_result_context_get_type(void)
{
static GType type = 0;
if (!type)
type = g_flags_register_static("WebKitHitTestResultContext", _webkit_hit_test_result_context_values);
return type;
}
/* enumerations from "./WebKit/gtk/webkit/webkitwebframe.h" */
static const GEnumValue _webkit_load_status_values[] = {
{ WEBKIT_LOAD_PROVISIONAL, "WEBKIT_LOAD_PROVISIONAL", "provisional" },
{ WEBKIT_LOAD_COMMITTED, "WEBKIT_LOAD_COMMITTED", "committed" },
{ WEBKIT_LOAD_FINISHED, "WEBKIT_LOAD_FINISHED", "finished" },
{ WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT, "WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT", "first-visually-non-empty-layout" },
{ WEBKIT_LOAD_FAILED, "WEBKIT_LOAD_FAILED", "failed" },
{ 0, NULL, NULL }
};
GType webkit_load_status_get_type(void)
{
static GType type = 0;
if (!type)
type = g_enum_register_static("WebKitLoadStatus", _webkit_load_status_values);
return type;
}
/* enumerations from "./WebKit/gtk/webkit/webkitwebnavigationaction.h" */
static const GEnumValue _webkit_web_navigation_reason_values[] = {
{ WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED, "WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED", "link-clicked" },
{ WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED, "WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED", "form-submitted" },
{ WEBKIT_WEB_NAVIGATION_REASON_BACK_FORWARD, "WEBKIT_WEB_NAVIGATION_REASON_BACK_FORWARD", "back-forward" },
{ WEBKIT_WEB_NAVIGATION_REASON_RELOAD, "WEBKIT_WEB_NAVIGATION_REASON_RELOAD", "reload" },
{ WEBKIT_WEB_NAVIGATION_REASON_FORM_RESUBMITTED, "WEBKIT_WEB_NAVIGATION_REASON_FORM_RESUBMITTED", "form-resubmitted" },
{ WEBKIT_WEB_NAVIGATION_REASON_OTHER, "WEBKIT_WEB_NAVIGATION_REASON_OTHER", "other" },
{ 0, NULL, NULL }
};
GType webkit_web_navigation_reason_get_type(void)
{
static GType type = 0;
if (!type)
type = g_enum_register_static("WebKitWebNavigationReason", _webkit_web_navigation_reason_values);
return type;
}
/* enumerations from "./WebKit/gtk/webkit/webkitwebsettings.h" */
static const GEnumValue _webkit_editing_behavior_values[] = {
{ WEBKIT_EDITING_BEHAVIOR_MAC, "WEBKIT_EDITING_BEHAVIOR_MAC", "mac" },
{ WEBKIT_EDITING_BEHAVIOR_WINDOWS, "WEBKIT_EDITING_BEHAVIOR_WINDOWS", "windows" },
{ 0, NULL, NULL }
};
GType webkit_editing_behavior_get_type(void)
{
static GType type = 0;
if (!type)
type = g_enum_register_static("WebKitEditingBehavior", _webkit_editing_behavior_values);
return type;
}
/* enumerations from "./WebKit/gtk/webkit/webkitwebview.h" */
static const GEnumValue _webkit_navigation_response_values[] = {
{ WEBKIT_NAVIGATION_RESPONSE_ACCEPT, "WEBKIT_NAVIGATION_RESPONSE_ACCEPT", "accept" },
{ WEBKIT_NAVIGATION_RESPONSE_IGNORE, "WEBKIT_NAVIGATION_RESPONSE_IGNORE", "ignore" },
{ WEBKIT_NAVIGATION_RESPONSE_DOWNLOAD, "WEBKIT_NAVIGATION_RESPONSE_DOWNLOAD", "download" },
{ 0, NULL, NULL }
};
GType webkit_navigation_response_get_type(void)
{
static GType type = 0;
if (!type)
type = g_enum_register_static("WebKitNavigationResponse", _webkit_navigation_response_values);
return type;
}
static const GEnumValue _webkit_cache_model_values[] = {
{ WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER, "WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER", "document-viewer" },
{ WEBKIT_CACHE_MODEL_WEB_BROWSER, "WEBKIT_CACHE_MODEL_WEB_BROWSER", "web-browser" },
{ 0, NULL, NULL }
};
GType webkit_cache_model_get_type(void)
{
static GType type = 0;
if (!type)
type = g_enum_register_static("WebKitCacheModel", _webkit_cache_model_values);
return type;
}
static const GEnumValue _webkit_web_view_target_info_values[] = {
{ WEBKIT_WEB_VIEW_TARGET_INFO_HTML, "WEBKIT_WEB_VIEW_TARGET_INFO_HTML", "html" },
{ WEBKIT_WEB_VIEW_TARGET_INFO_TEXT, "WEBKIT_WEB_VIEW_TARGET_INFO_TEXT", "text" },
{ WEBKIT_WEB_VIEW_TARGET_INFO_IMAGE, "WEBKIT_WEB_VIEW_TARGET_INFO_IMAGE", "image" },
{ WEBKIT_WEB_VIEW_TARGET_INFO_URI_LIST, "WEBKIT_WEB_VIEW_TARGET_INFO_URI_LIST", "uri-list" },
{ WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL, "WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL", "netscape-url" },
{ 0, NULL, NULL }
};
GType webkit_web_view_target_info_get_type(void)
{
static GType type = 0;
if (!type)
type = g_enum_register_static("WebKitWebViewTargetInfo", _webkit_web_view_target_info_values);
return type;
}
}
/* Generated data ends here */

92
packaging/win32/webkitenumtypes.h Executable file
View File

@@ -0,0 +1,92 @@
/* Generated data (by glib-mkenums) */
#ifndef WEBKIT_ENUM_TYPES_H
#define WEBKIT_ENUM_TYPES_H
#include <glib-object.h>
#include <webkit/webkitdefines.h>
G_BEGIN_DECLS
#include <webkit/webkitdownload.h>
#define WEBKIT_TYPE_DOWNLOAD_STATUS webkit_download_status_get_type()
WEBKIT_API GType
webkit_download_status_get_type(void);
#define WEBKIT_TYPE_DOWNLOAD_ERROR webkit_download_error_get_type()
WEBKIT_API GType
webkit_download_error_get_type(void);
#include <webkit/webkiterror.h>
#define WEBKIT_TYPE_NETWORK_ERROR webkit_network_error_get_type()
WEBKIT_API GType
webkit_network_error_get_type(void);
#define WEBKIT_TYPE_POLICY_ERROR webkit_policy_error_get_type()
WEBKIT_API GType
webkit_policy_error_get_type(void);
#define WEBKIT_TYPE_PLUGIN_ERROR webkit_plugin_error_get_type()
WEBKIT_API GType
webkit_plugin_error_get_type(void);
#include <webkit/webkithittestresult.h>
#define WEBKIT_TYPE_HIT_TEST_RESULT_CONTEXT webkit_hit_test_result_context_get_type()
WEBKIT_API GType
webkit_hit_test_result_context_get_type(void);
#include <webkit/webkitwebframe.h>
#define WEBKIT_TYPE_LOAD_STATUS webkit_load_status_get_type()
WEBKIT_API GType
webkit_load_status_get_type(void);
#include <webkit/webkitwebnavigationaction.h>
#define WEBKIT_TYPE_WEB_NAVIGATION_REASON webkit_web_navigation_reason_get_type()
WEBKIT_API GType
webkit_web_navigation_reason_get_type(void);
#include <webkit/webkitwebsettings.h>
#define WEBKIT_TYPE_EDITING_BEHAVIOR webkit_editing_behavior_get_type()
WEBKIT_API GType
webkit_editing_behavior_get_type(void);
#include <webkit/webkitwebview.h>
#define WEBKIT_TYPE_NAVIGATION_RESPONSE webkit_navigation_response_get_type()
WEBKIT_API GType
webkit_navigation_response_get_type(void);
#define WEBKIT_TYPE_CACHE_MODEL webkit_cache_model_get_type()
WEBKIT_API GType
webkit_cache_model_get_type(void);
#define WEBKIT_TYPE_WEB_VIEW_TARGET_INFO webkit_web_view_target_info_get_type()
WEBKIT_API GType
webkit_web_view_target_info_get_type(void);
G_END_DECLS
#endif
/* Generated data ends here */