Commit 396e5e82 authored by Milan Crha's avatar Milan Crha

Add Win32 build scripts into sources

See win32/readme.txt for more information.
parent 9a860440
/src
/downloads
This diff is collapsed.
#!/bin/bash
HOW=$1
PREFIX=$2
WHAT=$3
PATCHES=$4
CFGPARAMS=$5
VERBOSE=$6
SRCDIR=$7
MKPARAMS=
PATCHAFTERCFG=0
if test "$HOW" = "m" -o "$HOW" = "mmi" ; then
MKPARAMS=$CFGPARAMS
fi
PATCHAFTERCFG=0
if test "${PATCHES:0:1}" = "@" ; then
PATCHAFTERCFG=1
PATCHES=${PATCHES:1}
fi
if test "$SRCDIR" = "" ; then
SRCDIR=src/$WHAT
fi
cd $SRCDIR
if test "$?" != "0" ; then
exit 1
fi
export BINARY_PATH=$PREFIX/bin
export INCLUDE_PATH=$PREFIX/include
export LIBRARY_PATH=$PREFIX/lib
if test "$PATCHAFTERCFG" != "1" ; then
for p in $PATCHES; do patch -p1 -f --fuzz=0 <../../patches/$p; done
fi
if test "${HOW:0:1}" = "r" ; then
echo " * Running autoreconf for '$WHAT'..."
HOW=${HOW:1}
if test "$VERBOSE" != "1" ; then
autoreconf --force --install >/dev/null
else
autoreconf --force --install
fi
if test "$?" != "0" ; then
exit 1
fi
fi
if test "${HOW:0:1}" = "a" ; then
AUTOGENSH=
if test -f "./autogen.sh" ; then
AUTOGENSH="./autogen.sh"
AUTOGENPARAMS="$CFGPARAMS --prefix=$PREFIX"
else
AUTOGENSH="autoreconf -fi"
AUTOGENPARAMS=
fi
echo " * Running $AUTOGENSH for '$WHAT'..."
HOW=${HOW:1}
if test "$CFGPARAMS" != "" -a "${CFGPARAMS%%^}" != "" -a "${CFGPARAMS%%^}" != "$CFGPARAMS" ; then
AUTOGENPARAMS="${CFGPARAMS%%^}"
CFGPARAMS="${CFGPARAMS##*^}"
fi
if test "$VERBOSE" != "1" ; then
$AUTOGENSH $AUTOGENPARAMS >/dev/null
else
$AUTOGENSH $AUTOGENPARAMS
fi
if test "$?" != "0" ; then
exit 1
fi
fi
if test "$HOW" = "cmmi" ; then
echo " * Configuring '$WHAT'..."
make clean &>/dev/null
FIRSTPARAM=${CFGPARAMS%% }
if test "$FIRSTPARAM" != "" -a "${FIRSTPARAM%%/}" != "" -a "${FIRSTPARAM%%/}" != "$FIRSTPARAM" ; then
if test "$VERBOSE" != "1" ; then
$CFGPARAMS --prefix=$PREFIX >/dev/null
else
$CFGPARAMS --prefix=$PREFIX
fi
elif test "$VERBOSE" != "1" ; then
./configure --prefix=$PREFIX $CFGPARAMS >/dev/null
else
./configure --prefix=$PREFIX $CFGPARAMS
fi
if test "$?" != "0" ; then
exit 1
fi
fi
if test "$PATCHAFTERCFG" = "1" ; then
for p in $PATCHES; do patch -p1 -f --fuzz=0 <../../patches/$p; done
fi
if test "$VERBOSE" != "1" ; then
echo " * Building '$WHAT'..." && \
make $MKPARAMS >/dev/null && \
if test "$HOW" != "m" ; then
make install $MKPARAMS >/dev/null
fi
else
echo " * Building '$WHAT'..." && \
make V=1 $MKPARAMS && \
if test "$HOW" != "m" ; then
make install V=1 $MKPARAMS
fi
fi
if test "$?" != "0" ; then
exit 1
fi
#!/bin/bash
OK=0
MKPWD=$PWD
URLLINK=$1
DOWNLOADEDFILE=$2
EXTRACTTO=$4
EXTRACTEDDIR=$5
if test "$DOWNLOADEDFILE" = "0" ; then
DOWNLOADEDFILE=$3 ;
else
URLLINK="$URLLINK/$DOWNLOADEDFILE" ;
fi
if test ! -f "downloads/$DOWNLOADEDFILE" ; then
cd downloads && \
wget --no-check-certificate $URLLINK && \
cd .. && \
OK=1
else
OK=1
fi
if test "$OK" = "0" ; then
exit 1;
fi
case "$DOWNLOADEDFILE" in
*.7z)
if test "$EXTRACTEDDIR" = "" ; then
EXTRACTEDDIR=${DOWNLOADEDFILE%%.7z}
fi
if test ! -d "src/${EXTRACTEDDIR}" ; then
echo " * Unpacking '$DOWNLOADEDFILE'..."
if test "$EXTRACTTO" != "" ; then
cd $EXTRACTTO &&
7za x -y $MKPWD/downloads/$DOWNLOADEDFILE >/dev/null &&
cd $MKPWD
else
cd src && \
7za x -y ../downloads/$DOWNLOADEDFILE >/dev/null && \
cd ..
fi
fi
;;
*.zip)
if test "$EXTRACTEDDIR" = "" ; then
EXTRACTEDDIR=${DOWNLOADEDFILE%%.zip}
fi
if test ! -d "src/${EXTRACTEDDIR}" ; then
echo " * Unpacking '$DOWNLOADEDFILE'..."
if test "$EXTRACTTO" != "" ; then
cd $EXTRACTTO &&
unzip -o $MKPWD/downloads/$DOWNLOADEDFILE >/dev/null &&
cd $MKPWD
else
cd src && \
unzip -o ../downloads/$DOWNLOADEDFILE >/dev/null && \
cd ..
fi
fi
;;
*.tar*|*.tgz)
if test "$EXTRACTEDDIR" = "" ; then
case "$DOWNLOADEDFILE" in
*.tar*) EXTRACTEDDIR=${DOWNLOADEDFILE%%.tar*} ;;
*.tgz) EXTRACTEDDIR=${DOWNLOADEDFILE%%.tgz*} ;;
*) echo "unknown archive type for tar case: '$DOWNLOADEDFILE'"; exit 1; ;;
esac
fi
if test ! -d "src/$EXTRACTEDDIR" ; then
echo " * Unpacking '$DOWNLOADEDFILE'..."
if test "$EXTRACTTO" = "" ; then
EXTRACTTO=src
fi
if test ! -d "$EXTRACTTO" ; then
mkdir -p "$EXTRACTTO";
fi
tar -xf downloads/$DOWNLOADEDFILE --directory=$EXTRACTTO
fi
;;
*) echo "unknown archive type '$DOWNLOADEDFILE'"; exit 1; ;;
esac
diff -upr -x .deps -x .libs -x '*.la' atk-2.10.0.old/atk/atk.symbols atk-2.10.0/atk/atk.symbols
--- atk-2.10.0.old/atk/atk.symbols 2013-09-13 15:00:44 +0000
+++ atk-2.10.0/atk/atk.symbols 2014-05-17 16:34:24 +0000
@@ -107,6 +107,7 @@
atk_object_get_n_accessible_children
atk_object_get_name
atk_object_get_parent
+ atk_object_get_object_locale
atk_object_get_role
atk_object_get_type
atk_object_initialize
diff -upr bison-3.0.2.old/Makefile.am bison-3.0.2/Makefile.am
--- bison-3.0.2.old/Makefile.am 2013-08-02 15:35:13 +0000
+++ bison-3.0.2/Makefile.am 2014-05-08 07:40:11 +0000
@@ -54,12 +54,12 @@ noinst_LIBRARIES =
include build-aux/local.mk
include data/local.mk
include djgpp/local.mk
-include doc/local.mk
+#include doc/local.mk
include etc/local.mk
include examples/local.mk
include lib/local.mk
include src/local.mk
-include tests/local.mk
+#include tests/local.mk
# See comments in build-aux/git-version-gen. However, we make .version depend
# on configure so that .version and VERSION/PACKAGE_VERSION stay in sync in the
diff -upr -x .deps -x .libs -x '*.la' dbus-1.8.0.old/dbus/Makefile.am dbus-1.8.0/dbus/Makefile.am
--- dbus-1.8.0.old/dbus/Makefile.am 2014-01-20 13:40:21 +0000
+++ dbus-1.8.0/dbus/Makefile.am 2014-08-09 12:50:47 +0000
@@ -304,8 +304,8 @@ if DBUS_WIN
# this code is used, we don't actually need libstdc++.
noinst_LTLIBRARIES += libdbus-init-win.la
libdbus_init_win_la_SOURCES = dbus-init-win.cpp
-libdbus_1_la_LIBADD += libdbus-init-win.la
-libdbus_internal_la_LIBADD += libdbus-init-win.la
+libdbus_1_la_LIBADD += libdbus-init-win.la -lole32
+libdbus_internal_la_LIBADD += libdbus-init-win.la -lole32
endif
noinst_PROGRAMS =
diff -upr -x .deps -x .libs -x '*.la' dbus-1.8.0.old/dbus/dbus-sysdeps-win.c dbus-1.8.0/dbus/dbus-sysdeps-win.c
--- dbus-1.8.0.old/dbus/dbus-sysdeps-win.c 2014-01-07 11:32:53 +0000
+++ dbus-1.8.0/dbus/dbus-sysdeps-win.c 2014-08-09 13:35:34 +0000
@@ -55,6 +55,7 @@
#include <ws2tcpip.h>
#include <wincrypt.h>
#include <iphlpapi.h>
+#include <shlobj.h>
/* Declarations missing in mingw's and windows sdk 7.0 headers */
extern BOOL WINAPI ConvertStringSidToSidA (LPCSTR StringSid, PSID *Sid);
@@ -3379,6 +3380,139 @@ _dbus_lookup_session_address (dbus_bool_
return TRUE;
}
+static char *
+get_special_folder (int csidl)
+{
+ char path[MAX_PATH+1];
+ HRESULT hr;
+ LPITEMIDLIST pidl = NULL;
+ BOOL b;
+ char *retval = NULL;
+
+ hr = SHGetSpecialFolderLocation (NULL, csidl, &pidl);
+ if (hr == S_OK)
+ {
+ b = SHGetPathFromIDListA (pidl, path);
+ if (b)
+ retval = strdup (path);
+ CoTaskMemFree (pidl);
+ }
+ return retval;
+}
+
+static char *
+get_windows_directory_root (void)
+{
+ char windowsdir[MAX_PATH];
+
+ if (GetWindowsDirectory (windowsdir, MAX_PATH))
+ {
+ /* Usually X:\Windows, but in terminal server environments
+ * might be an UNC path, AFAIK.
+ */
+ int len;
+
+ if (!*windowsdir)
+ return strdup("C:\\");
+
+ len = strlen(windowsdir);
+ if (len < MAX_PATH - 1 && windowsdir[len - 1] != '\\' && windowsdir[len - 1] != '/') {
+ char sep[2] = {0, 0}, *p;
+
+ for (p = windowsdir; *p && !*sep; p++) {
+ if (*p == '/' || *p == '\\') {
+ sep[0] = *p;
+ break;
+ }
+ }
+
+ strcat(windowsdir, sep);
+ }
+ return strdup(windowsdir);
+ }
+ else
+ return strdup("C:\\");
+}
+
+static dbus_bool_t
+_dbus_set_user_home (DBusString *homedir)
+{
+ const char *env;
+ char *tmp = NULL;
+
+ env = _dbus_getenv("HOME");
+
+ /* Only believe HOME if it is an absolute path and exists.
+ *
+ * We only do this check on Windows for a couple of reasons.
+ * Historically, we only did it there because we used to ignore $HOME
+ * on UNIX. There are concerns about enabling it now on UNIX because
+ * of things like autofs. In short, if the user has a bogus value in
+ * $HOME then they get what they pay for...
+ */
+ if (env)
+ {
+ /* In case HOME is Unix-style (it happens), convert it to
+ * Windows style.
+ */
+ char *p;
+ tmp = strdup(env);
+ while ((p = strchr(tmp, '/')) != NULL) {
+ *p = '\\';
+ }
+
+ if (!((tmp[0] == '\\' || (((tmp[0] >= 'a' && tmp[0] <= 'z') || (tmp[0] >= 'A' && tmp[0] <= 'Z')) && tmp[1] == ':')) &&
+ GetFileAttributesA (tmp) != INVALID_FILE_ATTRIBUTES &&
+ (GetFileAttributesA (tmp) & FILE_ATTRIBUTE_DIRECTORY) != 0))
+ {
+ env = NULL;
+ free(tmp);
+ tmp = NULL;
+ }
+ }
+
+ if (!tmp)
+ {
+ /* USERPROFILE is probably the closest equivalent to $HOME? */
+ env = _dbus_getenv("USERPROFILE");
+ if (env != NULL)
+ tmp = strdup(env);
+ }
+
+ if (!tmp)
+ tmp = get_special_folder(CSIDL_PROFILE);
+
+ if (!tmp)
+ tmp = get_windows_directory_root();
+
+ if (tmp) {
+ _dbus_string_append (homedir, tmp);
+ free(tmp);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+_dbus_set_homedir_from_drive_and_path_env(DBusString *homedir)
+{
+ const char *homepath;
+ const char *homedrive;
+
+ homedrive = _dbus_getenv("HOMEDRIVE");
+ if (homedrive != NULL && *homedrive != '\0')
+ {
+ _dbus_string_append(homedir,homedrive);
+ }
+
+ homepath = _dbus_getenv("HOMEPATH");
+ if (homepath != NULL && *homepath != '\0')
+ {
+ _dbus_string_append(homedir,homepath);
+ }
+}
+
/**
* Appends the directory in which a keyring for the given credentials
* should be stored. The credentials should have either a Windows or
@@ -3398,8 +3532,6 @@ _dbus_append_keyring_directory_for_crede
{
DBusString homedir;
DBusString dotdir;
- const char *homepath;
- const char *homedrive;
_dbus_assert (credentials != NULL);
_dbus_assert (!_dbus_credentials_are_anonymous (credentials));
@@ -3407,18 +3539,16 @@ _dbus_append_keyring_directory_for_crede
if (!_dbus_string_init (&homedir))
return FALSE;
- homedrive = _dbus_getenv("HOMEDRIVE");
- if (homedrive != NULL && *homedrive != '\0')
- {
- _dbus_string_append(&homedir,homedrive);
- }
+ _dbus_set_homedir_from_drive_and_path_env(&homedir);
+ /* It's a default folder, like X:\, try to use a better one, in user's home directory */
+ if (_dbus_string_get_length(&homedir) <= 3) {
+ _dbus_string_set_length(&homedir, 0);
+ if (!_dbus_set_user_home(&homedir)) {
+ _dbus_string_set_length(&homedir, 0);
+ _dbus_set_homedir_from_drive_and_path_env(&homedir);
+ }
+ }
- homepath = _dbus_getenv("HOMEPATH");
- if (homepath != NULL && *homepath != '\0')
- {
- _dbus_string_append(&homedir,homepath);
- }
-
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
{
const char *override;
diff -upr fontconfig-2.11.0/src/fcatomic.h fontconfig-2.11.0.new/src/fcatomic.h
--- fontconfig-2.11.0/src/fcatomic.h 2013-10-11 03:10:18 +0000
+++ fontconfig-2.11.0.new/src/fcatomic.h 2014-01-10 21:56:13 +0000
@@ -51,6 +51,7 @@
/* mingw32 does not have MemoryBarrier.
* MemoryBarrier may be defined as a macro or a function.
* Just make a failsafe version for ourselves. */
+#undef MemoryBarrier
#ifdef MemoryBarrier
#define HBMemoryBarrier MemoryBarrier
#else
diff -upr fontconfig-2.11.0/test/Makefile fontconfig-2.11.0.new/test/Makefile
--- fontconfig-2.11.0/test/Makefile 2014-01-10 22:09:27 +0000
+++ fontconfig-2.11.0.new/test/Makefile 2014-01-10 22:00:23 +0000
@@ -78,7 +78,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = i686-pc-mingw32
host_triplet = i686-pc-mingw32
-check_PROGRAMS = test-migration$(EXEEXT) $(am__EXEEXT_1)
+check_PROGRAMS =
#am__append_1 = test-pthread
subdir = test
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
diff -upr fontconfig-2.11.0/test/Makefile.in fontconfig-2.11.0.new/test/Makefile.in
--- fontconfig-2.11.0/test/Makefile.in 2013-10-11 04:28:47 +0000
+++ fontconfig-2.11.0.new/test/Makefile.in 2014-01-10 21:59:55 +0000
@@ -78,7 +78,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-check_PROGRAMS = test-migration$(EXEEXT) $(am__EXEEXT_1)
+check_PROGRAMS =
@HAVE_PTHREAD_TRUE@am__append_1 = test-pthread
subdir = test
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
diff -upr freetype-2.5.2/src/gzip/ftgzip.c freetype-2.5.2.new/src/gzip/ftgzip.c
--- freetype-2.5.2/src/gzip/ftgzip.c 2013-08-29 15:53:13 +0000
+++ freetype-2.5.2.new/src/gzip/ftgzip.c 2014-01-10 20:14:37 +0000
@@ -45,6 +44,14 @@
#error "gzip code does not support PIC yet"
#endif
+#ifndef __int64
+# define __int64 long long
+#endif
+typedef long _off_t;
+typedef _off_t off_t;
+typedef __int64 _off64_t;
+typedef __int64 off64_t;
+
#ifdef FT_CONFIG_OPTION_SYSTEM_ZLIB
#include <zlib.h>
This diff is collapsed.
diff -upr gettext-0.18.3.1.old/gettext-tools/gnulib-lib/Makefile gettext-0.18.3.1/gettext-tools/gnulib-lib/Makefile
--- gettext-0.18.3.1.old/gettext-tools/gnulib-lib/Makefile 2014-05-08 15:10:25 +0000
+++ gettext-0.18.3.1/gettext-tools/gnulib-lib/Makefile 2014-05-07 19:38:11 +0000
@@ -129,7 +129,7 @@ am__append_12 = $(LTLIBCROCO) $(LTLIBGLI
#am__append_17 = libxml_rpl.la
#am__append_18 = libxml_rpl.la
#am__append_19 = term-styled-ostream.c
-am__append_20 = ../woe32dll/c++term-styled-ostream.cc
+#am__append_20 = ../woe32dll/c++term-styled-ostream.cc
am__append_21 = uniconv/u8-conv-from-enc.c
am__append_22 = unilbrk/u8-possible-linebreaks.c
am__append_23 = unilbrk/u8-width-linebreaks.c
@@ -475,7 +475,7 @@ am__libgettextlib_la_SOURCES_DIST = copy
findprog.h findprog.c fstrcmp.h fstrcmp.c full-write.h \
full-write.c fwriteerror.h fwriteerror.c gcd.h gcd.c gettext.h \
../woe32dll/gettextlib-exports.c hash.h hash.c html-ostream.c \
- html-styled-ostream.c ../woe32dll/c++html-styled-ostream.cc \
+ \
javacomp.h javacomp.c javaexec.h javaexec.c javaversion.h \
javaversion.c gl_linkedhash_list.h gl_linkedhash_list.c \
gl_anyhash_list1.h gl_anyhash_list2.h gl_anylinked_list1.h \
@@ -490,8 +490,8 @@ am__libgettextlib_la_SOURCES_DIST = copy
sig-handler.c size_max.h spawn-pipe.h spawn-pipe.c striconv.h \
striconv.c striconveh.h striconveh.c striconveha.h \
striconveha.c strnlen1.h strnlen1.c styled-ostream.c \
- tempname.c term-ostream.c term-styled-ostream.c \
- ../woe32dll/c++term-styled-ostream.cc glthread/threadlib.c \
+ tempname.c term-ostream.c \
+ glthread/threadlib.c \
glthread/tls.h glthread/tls.c tmpdir.h tmpdir.c trim.c \
uniconv/u8-conv-from-enc.c unilbrk/lbrktables.c \
unilbrk/u8-possible-linebreaks.c unilbrk/u8-width-linebreaks.c \
@@ -509,9 +509,9 @@ am__libgettextlib_la_SOURCES_DIST = copy
xvasprintf.c xasprintf.c
am__objects_1 = ../woe32dll/gettextlib-exports.lo
#am__objects_2 = html-styled-ostream.lo
-am__objects_3 = ../woe32dll/c++html-styled-ostream.lo
+#am__objects_3 = ../woe32dll/c++html-styled-ostream.lo
#am__objects_4 = term-styled-ostream.lo
-am__objects_5 = ../woe32dll/c++term-styled-ostream.lo
+#am__objects_5 = ../woe32dll/c++term-styled-ostream.lo
am__objects_6 = uniconv/u8-conv-from-enc.lo
am__objects_7 = unilbrk/u8-possible-linebreaks.lo
am__objects_8 = unilbrk/u8-width-linebreaks.lo
@@ -545,7 +545,7 @@ am_libgettextlib_la_OBJECTS = copy-acl.l
fd-hook.lo fd-ostream.lo fd-safer-flag.lo dup-safer-flag.lo \
file-ostream.lo findprog.lo fstrcmp.lo full-write.lo \
fwriteerror.lo gcd.lo $(am__objects_1) hash.lo html-ostream.lo \
- $(am__objects_2) $(am__objects_3) javacomp.lo javaexec.lo \
+ $(am__objects_2) javacomp.lo javaexec.lo \
javaversion.lo gl_linkedhash_list.lo gl_list.lo \
localcharset.lo localename.lo glthread/lock.lo malloca.lo \
mbchar.lo mbiter.lo mbslen.lo mbsstr.lo mbswidth.lo mbuiter.lo \
@@ -555,7 +555,7 @@ am_libgettextlib_la_OBJECTS = copy-acl.l
safe-read.lo safe-write.lo sh-quote.lo sig-handler.lo \
spawn-pipe.lo striconv.lo striconveh.lo striconveha.lo \
strnlen1.lo styled-ostream.lo tempname.lo term-ostream.lo \
- $(am__objects_4) $(am__objects_5) glthread/threadlib.lo \
+ $(am__objects_4) glthread/threadlib.lo \
glthread/tls.lo tmpdir.lo trim.lo $(am__objects_6) \
unilbrk/lbrktables.lo $(am__objects_7) $(am__objects_8) \
unilbrk/ulc-common.lo $(am__objects_9) $(am__objects_10) \
diff -upr gettext-0.18.3.1.old/gettext-tools/src/write-catalog.c gettext-0.18.3.1/gettext-tools/src/write-catalog.c
--- gettext-0.18.3.1.old/gettext-tools/src/write-catalog.c 2012-12-10 01:59:06 +0000
+++ gettext-0.18.3.1/gettext-tools/src/write-catalog.c 2014-05-07 19:41:40 +0000
@@ -240,7 +240,7 @@ message catalog has plural form translat
}
style_file_prepare ();
- stream = term_styled_ostream_create (fd, filename, style_file_name);
+ stream = NULL; /*term_styled_ostream_create (fd, filename, style_file_name);*/
if (stream == NULL)
stream = fd_ostream_create (fd, filename, true);
output_syntax->print (mdlp, stream, page_width, debug);
@@ -286,11 +286,11 @@ message catalog has plural form translat
stream = file_ostream_create (fp);
#if ENABLE_COLOR
- if (output_syntax->supports_color && color_mode == color_html)
+ /*if (output_syntax->supports_color && color_mode == color_html)
{
html_styled_ostream_t html_stream;
- /* Convert mdlp to UTF-8 encoding. */
+ /* Convert mdlp to UTF-8 encoding. * /
if (mdlp->encoding != po_charset_utf8)
{
mdlp = msgdomain_list_copy (mdlp, 0);
@@ -302,7 +302,7 @@ message catalog has plural form translat
output_syntax->print (mdlp, html_stream, page_width, debug);
ostream_free (html_stream);
}
- else
+ else*/
#endif
{
output_syntax->print (mdlp, stream, page_width, debug);
diff -upr gnutls-3.2.12.old/lib/libgnutls.map gnutls-3.2.12/lib/libgnutls.map
--- gnutls-3.2.12.old/lib/libgnutls.map 2014-03-24 22:56:11 +0000
+++ gnutls-3.2.12/lib/libgnutls.map 2014-03-23 20:24:12 +0000
@@ -936,6 +936,7 @@ GNUTLS_PRIVATE {
_gnutls_read_uint24;
_gnutls_get_cred;
_gnutls_recv_int;
+ _gnutls_vasprintf;
# Internal symbols needed by libgnutls-openssl:
_gnutls_pkix1_asn;
_gnutls_x509_parse_dn_oid;
diff -upr gnutls-3.2.12.old/lib/vasprintf.c gnutls-3.2.12/lib/vasprintf.c
--- gnutls-3.2.12.old/lib/vasprintf.c 2014-03-24 22:56:11 +0000
+++ gnutls-3.2.12/lib/vasprintf.c 2014-03-23 20:24:12 +0000
@@ -1,5 +1,6 @@
#include <config.h>
#include <stdio.h>
+#include <stdlib.h>
#include "vasprintf.h"
#ifndef HAVE_VASPRINTF
dnl -*- mode: autoconf -*-
# serial 2
dnl Usage:
dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
AC_DEFUN([GTK_DOC_CHECK],
[
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
AC_MSG_CHECKING([for gtk-doc])
PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
AC_MSG_RESULT($have_gtk_doc)
if test "$have_gtk_doc" = "no"; then
AC_MSG_WARN([
You will not be able to create source packages with 'make dist'
because $gtk_doc_requires is not found.])
fi
dnl check for tools we added during development
dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
dnl may not be writable by the user. Currently, automake requires that the
dnl test name must end in '.test'.
dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
dnl for overriding the documentation installation directory
AC_ARG_WITH([html-dir],
AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
[with_html_dir='${datadir}/gtk-doc/html'])
HTML_DIR="$with_html_dir"
AC_SUBST([HTML_DIR])
dnl enable/disable documentation building
AC_ARG_ENABLE([gtk-doc],
AS_HELP_STRING([--enable-gtk-doc],
[use gtk-doc to build documentation [[default=no]]]),,
[enable_gtk_doc=no])
AC_MSG_CHECKING([whether to build gtk-doc documentation])
AC_MSG_RESULT($enable_gtk_doc)
if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
AC_MSG_ERROR([
You must have $gtk_doc_requires installed to build documentation for
$PACKAGE_NAME. Please install gtk-doc or disable building the
documentation by adding '--disable-gtk-doc' to '[$]0'.])
fi
dnl don't check for glib if we build glib
if test "x$PACKAGE_NAME" != "xglib"; then
dnl don't fail if someone does not have glib
PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:])
fi
dnl enable/disable output formats
AC_ARG_ENABLE([gtk-doc-html],
AS_HELP_STRING([--enable-gtk-doc-html],
[build documentation in html format [[default=yes]]]),,
[enable_gtk_doc_html=yes])
AC_ARG_ENABLE([gtk-doc-pdf],
AS_HELP_STRING([--enable-gtk-doc-pdf],
[build documentation in pdf format [[default=no]]]),,
[enable_gtk_doc_pdf=no])
if test -z "$GTKDOC_MKPDF"; then
enable_gtk_doc_pdf=no
fi
if test -z "$AM_DEFAULT_VERBOSITY"; then
AM_DEFAULT_VERBOSITY=1
fi
AC_SUBST([AM_DEFAULT_VERBOSITY])
AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes])
AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
])
# -*- mode: makefile -*-
####################################
# Everything below here is generic #
####################################
if GTK_DOC_USE_LIBTOOL
GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
GTKDOC_RUN = $(LIBTOOL) --mode=execute
else
GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
GTKDOC_RUN =
endif
# We set GPATH here; this gives us semantics for GNU make
# which are more like other make's VPATH, when it comes to
# whether a source that is a target of one rule is then
# searched for in VPATH/GPATH.
#
GPATH = $(srcdir)
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
SETUP_FILES = \
$(content_files) \
$(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt
EXTRA_DIST = \
$(HTML_IMAGES) \