From dfcb77f0c9427ec86f7d747975cce89b55a8ae10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6hler?= Date: Sun, 1 Apr 2007 13:23:54 +0000 Subject: [PATCH] On Windows, go back to libgnomeprint. Partly revert r15750/61. GtkPrint/GtkHTML as combination is not yet stable enough to use it by default. It seems however to be the way to go, so all necessary changes are only commented out. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15771 57a11ea4-9604-0410-9ed3-97b8803252fd --- packaging/win32/custom.sh | 8 ++++++-- packaging/win32/dist.sh | 1 + packaging/win32/install.sh | 12 ++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/packaging/win32/custom.sh b/packaging/win32/custom.sh index d23ea04554..c0884f9465 100644 --- a/packaging/win32/custom.sh +++ b/packaging/win32/custom.sh @@ -147,8 +147,12 @@ LIBGLADE_URL="$GNOME_WIN32_URL/libglade/2.6/libglade-2.6.0.zip" LIBGLADE_DEV_URL="$GNOME_WIN32_URL/libglade/2.6/libglade-dev-2.6.0.zip" LIBGNOMEPRINT_URL="$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-2.12.1.zip" LIBGNOMEPRINT_DEV_URL="$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-dev-2.12.1.zip" -GTKHTML_URL="$GNOME_WIN32_URL/gtkhtml/3.14/gtkhtml-3.14.0.zip" -GTKHTML_DEV_URL="$GNOME_WIN32_URL/gtkhtml/3.14/gtkhtml-dev-3.14.0.zip" +LIBGNOMEPRINTUI_URL="$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-2.12.1.zip" # gnomeprint +LIBGNOMEPRINTUI_DEV_URL="$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-dev-2.12.1.zip" # gnomeprint +GTKHTML_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.2.zip" # gnomeprint +GTKHTML_DEV_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.2.zip" # gnomeprint +#GTKHTML_URL="$GNOME_WIN32_URL/gtkhtml/3.14/gtkhtml-3.14.0.zip" # not gnomeprint +#GTKHTML_DEV_URL="$GNOME_WIN32_URL/gtkhtml/3.14/gtkhtml-dev-3.14.0.zip" # not gnomeprint GNOME_DIR=$GLOBAL_DIR\\gnome SWIG_URL="$SF_MIRROR/swig/swigwin-1.3.31.zip" diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh index 7243c7c4be..70b5562940 100644 --- a/packaging/win32/dist.sh +++ b/packaging/win32/dist.sh @@ -110,6 +110,7 @@ function dist_gnome() { wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR wget_unpacked $LIBGNOMEPRINT_URL $DOWNLOAD_DIR $DIST_DIR + wget_unpacked $LIBGNOMEPRINTUI_URL $DOWNLOAD_DIR $DIST_DIR # gnomeprint wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $DIST_DIR rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas} } diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh index c63e6a5b4c..79fd940bc5 100644 --- a/packaging/win32/install.sh +++ b/packaging/win32/install.sh @@ -408,7 +408,8 @@ function inst_gnome() { add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS if quiet gconftool-2 --version && - ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgtkhtml-3.14 && + ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 && # gnomeprint +# ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgtkhtml-3.14 && # not gnomeprint quiet intltoolize --version then echo "gnome packages installed. skipping." @@ -463,6 +464,8 @@ function inst_gnome() { wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR wget_unpacked $LIBGNOMEPRINT_URL $DOWNLOAD_DIR $GNOME_DIR wget_unpacked $LIBGNOMEPRINT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $LIBGNOMEPRINTUI_URL $DOWNLOAD_DIR $GNOME_DIR # gnomeprint + wget_unpacked $LIBGNOMEPRINTUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR # gnomeprint wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR qpushd $GNOME_DIR @@ -477,8 +480,8 @@ function inst_gnome() { cp libexec/gconfd-2.exe libexec/gconfd-2.console.exe exetype libexec/gconfd-2.exe windows fi - sed 's#gtk+-unix-print-2.0 >= [0-9\.]* *##' lib/pkgconfig/libgtkhtml-3.14.pc > tmp - mv tmp lib/pkgconfig/libgtkhtml-3.14.pc +# sed 's#gtk+-unix-print-2.0 >= [0-9\.]* *##' lib/pkgconfig/libgtkhtml-3.14.pc > tmp # not gnomeprint +# mv tmp lib/pkgconfig/libgtkhtml-3.14.pc # not gnomeprint # work around a bug in msys bash, adding 0x01 smilies cat > bin/pkg-config-msys.sh <