mirror of https://github.com/Gnucash/gnucash
* MinGW tools
* Autotools (ac 2.60, am 1.10.2, lt 2.2.6a)
- libtool feels faster, needs confirmation
- compiling ac needs a newer m4 version, add that
* Gnome
- intltool needs a newer perl, so upgrade to activeperl 5.10
- new libpng, separated into libpng and libpng-dev
- newly packaged zlib (zlib-dev as well), no dlltool'ing anymore
- remove libgnomeprint (cf. goffice), gtkprint finally seems to work
-> goodbye mirrored printouts
* libxslt
- not the newest because that will be moved to oldreleases/ soon
* openssl
- watch for libeay32.dll in your Windows folder, it might be too old,
better you remove it completely
* gmp
- untested, no BP needed (yet)
* gnutls
- untested, no BP needed (yet)
* swig
* pcre
* libgsf, goffice
- goffice does not use libgnomeprint anymore, new patch necessary,
grab gtk-doc.m4 from gtk-doc tarball instead of patching goffice
- install htmlhelp earlier and add flags to link to it
* svn
- includes an own libeay32.dll, may conflict with openssl/bin/libeay32.dll
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17806 57a11ea4-9604-0410-9ed3-97b8803252fd
2.4
Andreas Köhler
18 years ago
parent
fccd8b189f
commit
43b5ae90f1
@ -1,69 +0,0 @@
|
||||
diff -Nur goffice-0.4.3-old/goffice/Makefile.am goffice-0.4.3/goffice/Makefile.am
|
||||
--- goffice-0.4.3-old/goffice/Makefile.am Sat Jul 7 00:44:32 2007
|
||||
+++ goffice-0.4.3/goffice/Makefile.am Sat Jul 21 23:24:22 2007
|
||||
@@ -24,7 +24,7 @@
|
||||
libgoffice_0_la_DEPENDENCIES = goffice.def
|
||||
libgoffice_0_la_LDFLAGS += -no-undefined -export-symbols goffice.def
|
||||
if WITH_NATIVE_WIN32
|
||||
-libgoffice_0_la_LIBADD += -luuid -lhtmlhelp -lurlmon
|
||||
+libgoffice_0_la_LIBADD += -luuid
|
||||
endif
|
||||
endif
|
||||
|
||||
diff -Nur goffice-0.4.3-old/gtk-doc.m4 goffice-0.4.3/gtk-doc.m4
|
||||
--- goffice-0.4.3-old/gtk-doc.m4 Thu Jan 1 00:00:00 1970
|
||||
+++ goffice-0.4.3/gtk-doc.m4 Sat Jul 21 23:25:04 2007
|
||||
@@ -0,0 +1,53 @@
|
||||
+dnl -*- mode: autoconf -*-
|
||||
+
|
||||
+# serial 1
|
||||
+
|
||||
+dnl Usage:
|
||||
+dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
|
||||
+AC_DEFUN([GTK_DOC_CHECK],
|
||||
+[
|
||||
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
|
||||
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
|
||||
+ dnl for overriding the documentation installation directory
|
||||
+ AC_ARG_WITH(html-dir,
|
||||
+ AC_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,
|
||||
+ AC_HELP_STRING([--enable-gtk-doc],
|
||||
+ [use gtk-doc to build documentation [default=no]]),,
|
||||
+ enable_gtk_doc=no)
|
||||
+
|
||||
+ have_gtk_doc=no
|
||||
+ if test x$enable_gtk_doc = xyes; then
|
||||
+ if test -z "$PKG_CONFIG"; then
|
||||
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
+ fi
|
||||
+ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
|
||||
+ have_gtk_doc=yes
|
||||
+ fi
|
||||
+
|
||||
+ dnl do we want to do a version check?
|
||||
+ifelse([$1],[],,
|
||||
+ [gtk_doc_min_version=$1
|
||||
+ if test "$have_gtk_doc" = yes; then
|
||||
+ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
|
||||
+ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
|
||||
+ AC_MSG_RESULT(yes)
|
||||
+ else
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ have_gtk_doc=no
|
||||
+ fi
|
||||
+ fi
|
||||
+])
|
||||
+ if test "$have_gtk_doc" != yes; then
|
||||
+ enable_gtk_doc=no
|
||||
+ fi
|
||||
+ fi
|
||||
+
|
||||
+ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
|
||||
+ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
|
||||
+])
|
||||
@ -0,0 +1,86 @@
|
||||
--- goffice-0.7.2-old/goffice/Makefile.am Fri Dec 28 22:55:15 2007
|
||||
+++ goffice-0.7.2/goffice/Makefile.am Sat Jan 10 21:50:04 2009
|
||||
@@ -27,7 +27,6 @@
|
||||
if WITH_NATIVE_WIN32
|
||||
# libtool thinks there are undefined refs in libhtmlhelp, by pass libtool
|
||||
libgoffice_@GOFFICE_API_VER@_la_LDFLAGS += -Wl,-lhtmlhelp
|
||||
-libgoffice_@GOFFICE_API_VER@_la_LIBADD += -lurlmon
|
||||
endif
|
||||
endif
|
||||
|
||||
--- goffice-0.7.2-old/goffice/utils/go-file.c Tue Oct 14 10:52:48 2008
|
||||
+++ goffice-0.7.2/goffice/utils/go-file.c Sat Jan 10 20:33:58 2009
|
||||
@@ -31,11 +31,11 @@
|
||||
#include <glib/gi18n-lib.h>
|
||||
#include <gsf/gsf-input-gio.h>
|
||||
#include <gsf/gsf-output-gio.h>
|
||||
-#ifdef GOFFICE_WITH_GNOME
|
||||
+#ifdef G_OS_WIN32
|
||||
+#include <windows.h>
|
||||
+/*#include <io.h>*/
|
||||
+#elif defined GOFFICE_WITH_GNOME
|
||||
#include <libgnome/gnome-url.h>
|
||||
-#elif defined G_OS_WIN32
|
||||
-#include <urlmon.h>
|
||||
-#include <io.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
@@ -1065,6 +1065,7 @@
|
||||
go_get_mime_type (gchar const *uri)
|
||||
{
|
||||
#if defined(G_OS_WIN32)
|
||||
+#if defined(FindMimeFromData)
|
||||
/* Do we really need that? */
|
||||
LPWSTR wuri, mime_type;
|
||||
|
||||
@@ -1079,6 +1080,7 @@
|
||||
}
|
||||
|
||||
g_free (wuri);
|
||||
+#endif
|
||||
|
||||
/* We try to determine mime using FindMimeFromData().
|
||||
* However, we are not sure whether the functions will know about
|
||||
@@ -1117,6 +1119,7 @@
|
||||
go_get_mime_type_for_data (gconstpointer data, int data_size)
|
||||
{
|
||||
#if defined(G_OS_WIN32)
|
||||
+#if defined(FindMimeFromData)
|
||||
/* Do we really need that? */
|
||||
LPWSTR mime_type;
|
||||
|
||||
@@ -1126,6 +1129,7 @@
|
||||
{
|
||||
return g_utf16_to_utf8 (mime_type, -1, NULL, NULL, NULL);
|
||||
}
|
||||
+#endif
|
||||
|
||||
/* We try to determine mime using FindMimeFromData().
|
||||
* However, we are not sure whether the functions will know about
|
||||
--- goffice-0.7.2-old/goffice/gtk/goffice-gtk.c Sun Sep 14 11:15:14 2008
|
||||
+++ goffice-0.7.2/goffice/gtk/goffice-gtk.c Sat Jan 10 20:59:39 2009
|
||||
@@ -779,11 +779,11 @@
|
||||
char const *link;
|
||||
} CBHelpPaths;
|
||||
|
||||
-#ifdef GOFFICE_WITH_GNOME
|
||||
-#include <libgnome/gnome-help.h>
|
||||
-#elif defined(G_OS_WIN32)
|
||||
+#ifdef G_OS_WIN32
|
||||
#include <windows.h>
|
||||
#include <htmlhelp.h>
|
||||
+#elif defined(GOFFICE_WITH_GNOME)
|
||||
+#include <libgnome/gnome-help.h>
|
||||
#endif
|
||||
static void
|
||||
go_help_display (CBHelpPaths const *paths)
|
||||
@@ -837,7 +837,7 @@
|
||||
gchar *path = g_build_filename (paths->data_dir, "doc", "C", chmfile, NULL);
|
||||
|
||||
g_free (chmfile);
|
||||
- if (!HtmlHelp (GetDesktopWindow (), path, HH_HELP_CONTEXT, id))
|
||||
+ if (!HtmlHelpW (GetDesktopWindow (), path, HH_HELP_CONTEXT, id))
|
||||
go_gtk_notice_dialog (NULL, GTK_MESSAGE_ERROR, "Failed to spawn HtmlHelp");
|
||||
g_free (path);
|
||||
}
|
||||
Loading…
Reference in new issue