gnucash-on-windows master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sat Nov 1 15:06:20 EDT 2014
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/8fd80893 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/d5ec7463 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/177cb4c4 (commit)
commit 8fd8089355ea852314be3c2b41ee87a5f01c71e2
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Nov 1 12:05:44 2014 -0700
Install GnuTLS from prebuilt tarballs, optionally build from source.
NB: Building from source requires manual intervention as libgpg-error's
ro.po requires conversion from ISO8859-2 to UTF8, which causes a hang.
diff --git a/defaults.sh b/defaults.sh
index 7dbb2fb..b8f090d 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -206,7 +206,10 @@ set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
GNUTLS_VERSION="3.2.19"
-set_default GNUTLS_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip"
+set_default BUILD_GNUTLS_FROM_SOURCE "no"
+set_default GNUTLS_URL "$GC_DEPS_URL/gnutls-3.2.19-minGW.tgz"
+set_default GNUTLS_DEV_URL "$GC_DEPS_URL/gnutls-3.2.19-dev-minGW.tgz"
+set_default GNUTLS_SRC_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip"
GCRYPT_VERSION="1.6.2"
set_default GCRYPT_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgcrypt/libgcrypt-${GCRYPT_VERSION}.tar.bz2"
GPG_ERROR_VERSION="1.17"
diff --git a/install-impl.sh b/install-impl.sh
index 0b9676b..426286f 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -458,28 +458,34 @@ function inst_gnutls() {
then
echo "GNUTLS already installed in $_GNUTLS_UDIR. skipping."
else
- wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
- wget_unpacked $GCRYPT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- wget_unpacked $GPG_ERROR_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- mydir=`pwd`
- assert_one_dir $TMP_UDIR/libgcrypt-*
- assert_one_dir $TMP_UDIR/libgpg-error-*
- qpushd $TMP_UDIR/libgpg-error-*
- ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR --disable-nls \
- --disable-languages \
- CPPFLAGS="${GNOME_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS}"
- make
- make install
- qpopd
- qpushd $TMP_UDIR/libgcrypt-*
- ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR \
- CPPFLAGS="${GNOME_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS}"
- make
- make install
- qpopd
- rm -f $_GNUTLS_UDIR/lib/*.la
+ if [ "$BUILD_GNUTLS_FROM_SOURCE" = "yes" ]; then
+ wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
+ wget_unpacked $GCRYPT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ wget_unpacked $GPG_ERROR_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ mydir=`pwd`
+ assert_one_dir $TMP_UDIR/libgcrypt-*
+ assert_one_dir $TMP_UDIR/libgpg-error-*
+ qpushd $TMP_UDIR/libgpg-error-*
+ ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR --disable-nls \
+ --disable-languages \
+ CPPFLAGS="${GNOME_CPPFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS}"
+ make
+ make install
+ qpopd
+ qpushd $TMP_UDIR/libgcrypt-*
+ ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR \
+ CPPFLAGS="${GNOME_CPPFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS}"
+ make
+ make install
+ qpopd
+ rm -f $_GNUTLS_UDIR/lib/*.la
+ else
+ mkdir -p $_GNUTLS_UDIR
+ wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
+ wget_unpacked $GNUTLS_DEV_URL $DOWNLOAD_DIR $GNUTLS_DIR
+ fi
quiet ${PKG_CONFIG} --exists gnutls || die "GNUTLS not installed correctly"
fi
[ ! -d $_GNUTLS_UDIR/share/aclocal ] || add_to_env "-I $_GNUTLS_UDIR/share/aclocal" ACLOCAL_FLAGS
@@ -876,20 +882,20 @@ function inst_libsoup() {
echo "libsoup already installed in $_LIBSOUP_UDIR. skipping."
else
if [ "$BUILD_LIBSOUP_FROM_SOURCE" = "yes" ]; then
- wget_unpacked $LIBSOUP_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libsoup-*
- qpushd $TMP_UDIR/libsoup-*
- patch -p1 < $LIBSOUP_BAD_SYMBOL_PATCH
+ wget_unpacked $LIBSOUP_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libsoup-*
+ qpushd $TMP_UDIR/libsoup-*
+ patch -p1 < $LIBSOUP_BAD_SYMBOL_PATCH
patch -p1 < $LIBSOUP_RESERVED_WORD_PATCH
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_LIBSOUP_UDIR} \
- --disable-gtk-doc \
- --without-gnome \
- CPPFLAGS=-I${_GNOME_UDIR}/include \
- LDFLAGS="-L${_GNOME_UDIR}/lib -Wl,-s -lz"
- make
- make install
- qpopd
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=${_LIBSOUP_UDIR} \
+ --disable-gtk-doc \
+ --without-gnome \
+ CPPFLAGS=-I${_GNOME_UDIR}/include \
+ LDFLAGS="-L${_GNOME_UDIR}/lib -Wl,-s -lz"
+ make
+ make install
+ qpopd
else
mkdir -p $_LIBSOUP_UDIR
wget_unpacked $LIBSOUP_URL $DOWNLOAD_DIR $LIBSOUP_DIR
commit d5ec7463af40ce393e1fab36da70c826c67e27a3
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Oct 29 22:55:00 2014 -0700
Update LibSoup version for new WebKit and fix build.
Includes:
* Providing for downloading prebuilt Libsoup instead of building
* Patches for Libsoup bugs
* adjusting the SQLITE_CFLAGS and SQLITE_LIBS to match what LibSoup's
configure looks for.
* Second WebKit patch and some comments about what's needed to build it.
diff --git a/0002-webkit-second-MinGW.patch b/0002-webkit-second-MinGW.patch
new file mode 100644
index 0000000..9a4df0f
--- /dev/null
+++ b/0002-webkit-second-MinGW.patch
@@ -0,0 +1,77 @@
+From 71465d31b0531f79c74964b47521adeb25f9b462 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Sat, 1 Nov 2014 11:59:24 -0700
+Subject: [PATCH 2/2] webkit second MinGW
+
+Adds some minor fixes that escaped the first patch
+---
+ .../platform/image-decoders/jpeg/JPEGImageDecoder.cpp | 3 +++
+ .../WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp | 2 +-
+ Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp | 16 ++++++++--------
+ 3 files changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+index f0fbe44..7eddeaf 100644
+--- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
++++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+@@ -56,6 +56,9 @@
+ #endif
+
+ extern "C" {
++#ifdef __MINGW32__
++#define HAVE_BOOLEAN
++#endif
+ #include "jpeglib.h"
+ #if USE(ICCJPEG)
+ #include "iccjpeg.h"
+diff --git a/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp
+index 6dbb48f..cecb20e 100644
+--- a/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp
++++ b/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp
+@@ -56,7 +56,7 @@ void TextCheckerClientGtk::learnWord(const String& text)
+
+ void TextCheckerClientGtk::checkSpellingOfString(const UChar* text, int length, int* misspellingLocation, int* misspellingLength)
+ {
+- GOwnPtr<gchar> utf8Text(g_utf16_to_utf8(const_cast<gunichar2*>(text), length, 0, 0, 0));
++ GOwnPtr<gchar> utf8Text(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(text), length, 0, 0, 0));
+ webkit_spell_checker_check_spelling_of_string(m_spellChecker.get(), utf8Text.get(), misspellingLocation, misspellingLength);
+ }
+
+diff --git a/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp b/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
+index 6a08c44..5488bb5 100644
+--- a/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
++++ b/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
+@@ -41,7 +41,7 @@ struct _WebKitSpellCheckerEnchantPrivate {
+ GSList* enchantDicts;
+ };
+
+-static void webkit_spell_checker_enchant_spell_checker_interface_init(WebKitSpellCheckerInterface* interface);
++static void webkit_spell_checker_enchant_spell_checker_interface_init(WebKitSpellCheckerInterface* iface);
+
+ G_DEFINE_TYPE_WITH_CODE(WebKitSpellCheckerEnchant, webkit_spell_checker_enchant, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE(WEBKIT_TYPE_SPELL_CHECKER,
+@@ -259,14 +259,14 @@ static void ignoreWord(WebKitSpellChecker* checker, const char* word)
+ }
+ }
+
+-static void webkit_spell_checker_enchant_spell_checker_interface_init(WebKitSpellCheckerInterface* interface)
++static void webkit_spell_checker_enchant_spell_checker_interface_init(WebKitSpellCheckerInterface* iface)
+ {
+- interface->check_spelling_of_string = checkSpellingOfString;
+- interface->get_guesses_for_word = getGuessesForWord;
+- interface->update_spell_checking_languages = updateSpellCheckingLanguages;
+- interface->get_autocorrect_suggestions_for_misspelled_word = getAutocorrectSuggestionsForMisspelledWord;
+- interface->learn_word = learnWord;
+- interface->ignore_word = ignoreWord;
++ iface->check_spelling_of_string = checkSpellingOfString;
++ iface->get_guesses_for_word = getGuessesForWord;
++ iface->update_spell_checking_languages = updateSpellCheckingLanguages;
++ iface->get_autocorrect_suggestions_for_misspelled_word = getAutocorrectSuggestionsForMisspelledWord;
++ iface->learn_word = learnWord;
++ iface->ignore_word = ignoreWord;
+ }
+
+ #endif /* ENABLE(SPELLCHECK) */
+--
+1.9.4.msysgit.0
+
diff --git a/defaults.sh b/defaults.sh
index 6022607..7dbb2fb 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -305,16 +305,20 @@ set_default WEBKIT_DEV_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-dev-minG
set_default WEBKIT_DIR $GLOBAL_DIR\\webkit
#NB: The Fedora project maintains a source version that has been patched for building in a Fedora-MinGW cross-compiler. This isn't quite good enough to build in MinGW itself, but it's a lot closer and less work than starting with a tarball direct from the WebKitGtk project.
set_default WEBKIT_SRC_URL "https://pkgs.fedoraproject.org/repo/pkgs/mingw-webkitgtk/webkit-1.8.3.tar.xz/dcbf9d5e2e6391f857c29a57528b32a6/webkit-1.8.3.tar.xz"
-set_default WEBKIT_MINGW_PATCH=`pwd`/0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch
+set_default WEBKIT_MINGW_PATCH_1=`pwd`/0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch
+set_default WEBKIT_MINGW_PATCH_2=`pwd`/0002-webkit-second-minGW.patch
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
-set_default LIBSOUP_VERSION "2.34.3"
-set_default LIBSOUP_URL "$GNOME_WIN32_URL/libsoup/2.34/libsoup-${LIBSOUP_VERSION}-1_win32.zip"
-set_default LIBSOUP_DEV_URL "$GNOME_WIN32_URL/libsoup/2.34/libsoup-dev-${LIBSOUP_VERSION}-1_win32.zip"
+set_default BUILD_LIBSOUP_FROM_SOURCE no
+set_default LIBSOUP_VERSION "2.48.0"
+set_default LIBSOUP_URL "$SF_MIRROR/gnucash/libsoup-${LIBSOUP_VERSION}-minGW.tgz"
+set_default LIBSOUP_DEV_URL "$SF_MIRROR/gnucash/libsoup-${LIBSOUP_VERSION}-dev-minGW.tgz"
set_default LIBSOUP_DIR $GLOBAL_DIR\\libsoup
-set_default LIBSOUP_SRC_URL "$GNOME_MIRROR/sources/libsoup/2.34/libsoup-${LIBSOUP_VERSION}.tar.bz2"
+set_default LIBSOUP_SRC_URL "$GNOME_MIRROR/sources/libsoup/2.48/libsoup-${LIBSOUP_VERSION}.tar.xz"
+set_default LIBSOUP_BAD_SYMBOL_PATCH `pwd`/libsoup-2.48.0-bad-symbol.patch
+set_default LIBSOUP_RESERVED_WORD_PATCH `pwd`/libsoup-2.48.0-soup-server-reserved-word.patch
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
diff --git a/install-impl.sh b/install-impl.sh
index 1a9c210..0b9676b 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -692,8 +692,8 @@ function inst_libdbi() {
_LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
add_to_env -I$_LIBDBI_UDIR/include LIBDBI_CPPFLAGS
add_to_env -L$_LIBDBI_UDIR/lib LIBDBI_LDFLAGS
- add_to_env -I${_SQLITE3_UDIR}/include SQLITE3_CFLAGS
- add_to_env -L${_SQLITE3_UDIR}/lib SQLITE3_LDFLAGS
+ add_to_env -I${_SQLITE3_UDIR}/include SQLITE_CFLAGS
+ add_to_env "-L${_SQLITE3_UDIR}/lib -lsqlite3" SQLITE_LIBS
if test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll
then
echo "SQLite3 already installed in $_SQLITE3_UDIR. skipping."
@@ -866,6 +866,7 @@ function inst_libofx() {
fi
}
+#Building LibSoup requires python. Setting $PYTHON isn't sufficient, it must be on the path.
function inst_libsoup() {
setup libsoup
_LIBSOUP_UDIR=`unix_path $LIBSOUP_DIR`
@@ -874,19 +875,26 @@ function inst_libsoup() {
then
echo "libsoup already installed in $_LIBSOUP_UDIR. skipping."
else
+ if [ "$BUILD_LIBSOUP_FROM_SOURCE" = "yes" ]; then
wget_unpacked $LIBSOUP_SRC_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libsoup-*
qpushd $TMP_UDIR/libsoup-*
+ patch -p1 < $LIBSOUP_BAD_SYMBOL_PATCH
+ patch -p1 < $LIBSOUP_RESERVED_WORD_PATCH
./configure ${HOST_XCOMPILE} \
--prefix=${_LIBSOUP_UDIR} \
--disable-gtk-doc \
--without-gnome \
- --disable-ssl \
CPPFLAGS=-I${_GNOME_UDIR}/include \
LDFLAGS="-L${_GNOME_UDIR}/lib -Wl,-s -lz"
make
make install
qpopd
+ else
+ mkdir -p $_LIBSOUP_UDIR
+ wget_unpacked $LIBSOUP_URL $DOWNLOAD_DIR $LIBSOUP_DIR
+ wget_unpacked $LIBSOUP_DEV_URL $DOWNLOAD_DIR $LIBSOUP_DIR
+ fi
quiet ${PKG_CONFIG} --exists libsoup-2.4 || die "libsoup not installed correctly"
rm -rf ${TMP_UDIR}/libsoup-*
fi
@@ -1068,7 +1076,15 @@ function inst_regex() {
#can most easily get it from
#http://gnuwin32.sourceforge.net/packages.html; install it in
#c:\Programs\GnuWin32.
-#You also need python and ICU.
+#You also need python 2.6+ and ICU 50+
+#Setting $PYTHON isn't sufficient, it must be on the path.
+#Build ICU and install it in /c/gcdev/webkit. Symlink icu*.dll to libicu*.dll.
+#
+#After building and before installing, make the following changes to
+#$(top_builddir)/Source/WebKit/gtk/webkit-1.0.pc:
+#${prefix}/lib -> ${prefix}/bin
+#Libs: ${libdir} -lwebkitgtk-1.0 -> Libs: ${libdir} -lwebkitgtk-1.0-0
+#
function inst_webkit() {
setup WebKit
_WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
@@ -1087,16 +1103,18 @@ function inst_webkit() {
add_to_env ${_ACTIVE_PERL_BASE_DIR}/bin PATH
export PERL5LIB=${_ACTIVE_PERL_BASE_DIR}/lib
- patch -p1 -u < $WEBKIT_MINGW_PATCH
+ patch -p1 -u < $WEBKIT_MINGW_PATCH_1
+ patch -p1 -u < $WEBKIT_MINGW_PATCH_2
autoreconf -fis -ISource/autotools -I$GNOME_DIR/share/aclocal
./configure \
--prefix=${_WEBKIT_UDIR} \
--with-target=win32 \
- --with-unicode-backend=glib \
+ --with-gtk=2.0 \
+ --disable-geolocation \
--enable-web-sockets \
--disable-video \
- CPPFLAGS="${GNOME_CPPFLAGS} ${SQLITE3_CFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS} ${SQLITE3_LDFLAGS} -lsqlite3" \
+ CPPFLAGS="${GNOME_CPPFLAGS} ${SQLITE_CFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS} ${SQLITE_LIBS}" \
PERL="${_ACTIVE_PERL_BASE_DIR}/bin/perl"
cp $WEBKIT_WEBKITENUMTYPES_CPP DerivedSources
cp $WEBKIT_WEBKITENUMTYPES_H Webkit/gtk/webkit
diff --git a/install.sh b/install.sh
index 97e0cfe..8aff08b 100644
--- a/install.sh
+++ b/install.sh
@@ -53,8 +53,8 @@ register_env_var READLINE_CPPFLAGS " "
register_env_var READLINE_LDFLAGS " "
register_env_var REGEX_CPPFLAGS " "
register_env_var REGEX_LDFLAGS " "
-register_env_var SQLITE3_CFLAGS " "
-register_env_var SQLITE3_LDFLAGS " "
+register_env_var SQLITE_CFLAGS " "
+register_env_var SQLITE_LIBS " "
# steps
# There is no reason to ever need to comment these out!
diff --git a/libsoup-2.48.0-bad-symbol.patch b/libsoup-2.48.0-bad-symbol.patch
new file mode 100644
index 0000000..052b8de
--- /dev/null
+++ b/libsoup-2.48.0-bad-symbol.patch
@@ -0,0 +1,10 @@
+--- a/libsoup/libsoup-2.4.sym 2014-10-29 22:37:54 -0700
++++ b/libsoup/libsoup-2.4.sym 2014-06-18 07:42:51 -0700
+@@ -348,7 +348,6 @@
+ soup_server_get_async_context
+ soup_server_get_listener
+ soup_server_get_listeners
+-soup_server_get_gsocket
+ soup_server_get_port
+ soup_server_get_type
+ soup_server_get_uris
diff --git a/libsoup-2.48.0-bad-symbol.patch~ b/libsoup-2.48.0-bad-symbol.patch~
new file mode 100644
index 0000000..ab18c51
--- /dev/null
+++ b/libsoup-2.48.0-bad-symbol.patch~
@@ -0,0 +1,10 @@
+--- libsoup/libsoup-2.4.sym 2014-10-29 22:37:54 -0700
++++ libsoup/libsoup-2.4.sym~ 2014-06-18 07:42:51 -0700
+@@ -348,6 +348,7 @@
+ soup_server_get_async_context
+ soup_server_get_listener
+ soup_server_get_listeners
++soup_server_get_gsocket
+ soup_server_get_port
+ soup_server_get_type
+ soup_server_get_uris
diff --git a/libsoup-2.48.0-soup-server-reserved-word.patch b/libsoup-2.48.0-soup-server-reserved-word.patch
new file mode 100644
index 0000000..c7c0adc
--- /dev/null
+++ b/libsoup-2.48.0-soup-server-reserved-word.patch
@@ -0,0 +1,11 @@
+--- a/libsoup/soup-server.h 2014-10-29 22:51:10 -0700
++++ b/libsoup/soup-server.h 2014-10-30 12:27:08 -0700
+@@ -80,7 +80,7 @@
+
+ SOUP_AVAILABLE_IN_2_48
+ gboolean soup_server_listen (SoupServer *server,
+- GSocketAddress *interface,
++ GSocketAddress *iface,
+ SoupServerListenOptions options,
+ GError **error);
+ SOUP_AVAILABLE_IN_2_48
diff --git a/libsoup-2.48.0-soup-server-reserved-word.patch~ b/libsoup-2.48.0-soup-server-reserved-word.patch~
new file mode 100644
index 0000000..c0afe73
--- /dev/null
+++ b/libsoup-2.48.0-soup-server-reserved-word.patch~
@@ -0,0 +1,11 @@
+--- libsoup/include/libsoup-2.4/libsoup/soup-server.h~ 2014-10-29 22:51:10 -0700
++++ libsoup/include/libsoup-2.4/libsoup/soup-server.h 2014-10-30 12:27:08 -0700
+@@ -80,7 +80,7 @@
+
+ SOUP_AVAILABLE_IN_2_48
+ gboolean soup_server_listen (SoupServer *server,
+- GSocketAddress *interface,
++ GSocketAddress *iface,
+ SoupServerListenOptions options,
+ GError **error);
+ SOUP_AVAILABLE_IN_2_48
Summary of changes:
0002-webkit-second-MinGW.patch | 77 +++++++++++++++++
defaults.sh | 19 +++--
install-impl.sh | 108 +++++++++++++++---------
install.sh | 4 +-
libsoup-2.48.0-bad-symbol.patch | 10 +++
libsoup-2.48.0-bad-symbol.patch~ | 10 +++
libsoup-2.48.0-soup-server-reserved-word.patch | 11 +++
libsoup-2.48.0-soup-server-reserved-word.patch~ | 11 +++
8 files changed, 200 insertions(+), 50 deletions(-)
create mode 100644 0002-webkit-second-MinGW.patch
create mode 100644 libsoup-2.48.0-bad-symbol.patch
create mode 100644 libsoup-2.48.0-bad-symbol.patch~
create mode 100644 libsoup-2.48.0-soup-server-reserved-word.patch
create mode 100644 libsoup-2.48.0-soup-server-reserved-word.patch~
More information about the gnucash-changes
mailing list