IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

GnuCash on Windows is built with webkit, no need to install gtkhtml

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19526 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2010-08-31 19:57:33 +00:00
parent 65c5cd6b09
commit 6440e20aca
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packaging/win32/defaults.sh
View File

@ -255,8 +255,9 @@ set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.z
set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip" 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_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 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" # GnuCash on Windows is built with webkit, no need to install gtkhtml
set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml-dev_3.24.2-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"
set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2" 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_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" set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"

3
packaging/win32/dist-impl.sh
View File

@ -111,7 +111,8 @@ function dist_gnome() {
wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $PIXMAN_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 wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gtk2-themes-* assert_one_dir $TMP_UDIR/gtk2-themes-*

18
packaging/win32/install-impl.sh
View File

@ -518,7 +518,9 @@ function inst_gnome() {
add_to_env pkg-config PKG_CONFIG add_to_env pkg-config PKG_CONFIG
fi fi
if quiet gconftool-2 --version && 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 quiet intltoolize --version
then then
echo "gnome packages installed. skipping." echo "gnome packages installed. skipping."
@ -582,8 +584,9 @@ function inst_gnome() {
wget_unpacked $LIBGNOMEUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR wget_unpacked $LIBGNOMEUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $GNOME_DIR wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR # GnuCash on Windows is built with webkit, no need to install gtkhtml
wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR # 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 wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gtk2-themes-* assert_one_dir $TMP_UDIR/gtk2-themes-*
cp -a $TMP_UDIR/gtk2-themes-*/lib $_GNOME_UDIR/ cp -a $TMP_UDIR/gtk2-themes-*/lib $_GNOME_UDIR/
@ -619,8 +622,9 @@ fi
\${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res \${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res
EOF EOF
chmod +x bin/pkg-config{.exe,-msys.sh} chmod +x bin/pkg-config{.exe,-msys.sh}
sed '/Requires/s,\(.*\) enchant\(.*\) iso-codes\(.*\),\1\2\3,' lib/pkgconfig/libgtkhtml-3.14.pc > tmp # GnuCash on Windows is built with webkit, no need to install gtkhtml
mv tmp lib/pkgconfig/libgtkhtml-3.14.pc # 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-* rm -rf $TMP_UDIR/gtk-doc-*
qpopd qpopd
@ -642,7 +646,9 @@ EOF
rm -rf $TMP_UDIR/pixman-* rm -rf $TMP_UDIR/pixman-*
${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly" ${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
quiet gconftool-2 --version && 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" quiet intltoolize --version || die "gnome not installed correctly"
fi fi
[ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS [ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS