r19526 - gnucash/trunk/packaging/win32 - GnuCash on Windows is built with webkit, no need to install gtkhtml
Geert Janssens
gjanssens at code.gnucash.org
Tue Aug 31 15:57:34 EDT 2010
Author: gjanssens
Date: 2010-08-31 15:57:33 -0400 (Tue, 31 Aug 2010)
New Revision: 19526
Trac: http://svn.gnucash.org/trac/changeset/19526
Modified:
gnucash/trunk/packaging/win32/defaults.sh
gnucash/trunk/packaging/win32/dist-impl.sh
gnucash/trunk/packaging/win32/install-impl.sh
Log:
GnuCash on Windows is built with webkit, no need to install gtkhtml
Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh 2010-08-31 19:55:34 UTC (rev 19525)
+++ gnucash/trunk/packaging/win32/defaults.sh 2010-08-31 19:57:33 UTC (rev 19526)
@@ -255,8 +255,9 @@
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 GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml_3.24.2-1_win32.zip"
-set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml-dev_3.24.2-1_win32.zip"
+# GnuCash on Windows is built with webkit, no need to install gtkhtml
+#set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml_3.24.2-1_win32.zip"
+#set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml-dev_3.24.2-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"
Modified: gnucash/trunk/packaging/win32/dist-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist-impl.sh 2010-08-31 19:55:34 UTC (rev 19525)
+++ gnucash/trunk/packaging/win32/dist-impl.sh 2010-08-31 19:57:33 UTC (rev 19526)
@@ -111,7 +111,8 @@
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 $GTKHTML_URL $DOWNLOAD_DIR $DIST_DIR
+# GnuCash on Windows is built with webkit, no need to install gtkhtml
+# wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gtk2-themes-*
Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh 2010-08-31 19:55:34 UTC (rev 19525)
+++ gnucash/trunk/packaging/win32/install-impl.sh 2010-08-31 19:57:33 UTC (rev 19526)
@@ -518,7 +518,9 @@
add_to_env pkg-config PKG_CONFIG
fi
if quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&
+# GnuCash on Windows is built with webkit, no need to install gtkhtml
+# quiet ${PKG_CONFIG} --exists libgtkhtml-3.14 &&
+ quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
quiet intltoolize --version
then
echo "gnome packages installed. skipping."
@@ -582,8 +584,9 @@
wget_unpacked $LIBGNOMEUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+# GnuCash on Windows is built with webkit, no need to install gtkhtml
+# wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR
+# wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gtk2-themes-*
cp -a $TMP_UDIR/gtk2-themes-*/lib $_GNOME_UDIR/
@@ -619,8 +622,9 @@
\${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res
EOF
chmod +x bin/pkg-config{.exe,-msys.sh}
- sed '/Requires/s,\(.*\) enchant\(.*\) iso-codes\(.*\),\1\2\3,' lib/pkgconfig/libgtkhtml-3.14.pc > tmp
- mv tmp lib/pkgconfig/libgtkhtml-3.14.pc
+# GnuCash on Windows is built with webkit, no need to install gtkhtml
+# sed '/Requires/s,\(.*\) enchant\(.*\) iso-codes\(.*\),\1\2\3,' lib/pkgconfig/libgtkhtml-3.14.pc > tmp
+# mv tmp lib/pkgconfig/libgtkhtml-3.14.pc
rm -rf $TMP_UDIR/gtk-doc-*
qpopd
@@ -642,7 +646,9 @@
rm -rf $TMP_UDIR/pixman-*
${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&
+# GnuCash on Windows is built with webkit, no need to install gtkhtml
+# quiet ${PKG_CONFIG} --exists libgtkhtml-3.14 &&
+ quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
quiet intltoolize --version || die "gnome not installed correctly"
fi
[ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
More information about the gnucash-changes
mailing list