mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Install.sh: Some package updates, including GtkHTML 3.14.0.
Update glib, cairo, pango, gtk+ and gtkhtml. Drop libgnomeprintui, but keep libgnomeprint because goffice depends on it. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15750 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
@@ -101,14 +101,14 @@ LIBXML2_DIR=$GLOBAL_DIR\\gnome #avoid XML_FLAGS
|
||||
GETTEXT_URL="$GNOME_WIN32_DEPS_URL/gettext-0.14.5.zip"
|
||||
GETTEXT_DEV_URL="$GNOME_WIN32_DEPS_URL/gettext-dev-0.14.5.zip"
|
||||
LIBICONV_URL="$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
|
||||
GLIB_URL="$GNOME_WIN32_URL/glib/2.12/glib-2.12.9.zip"
|
||||
GLIB_DEV_URL="$GNOME_WIN32_URL/glib/2.12/glib-dev-2.12.9.zip"
|
||||
GLIB_URL="$GNOME_WIN32_URL/glib/2.12/glib-2.12.11.zip"
|
||||
GLIB_DEV_URL="$GNOME_WIN32_URL/glib/2.12/glib-dev-2.12.11.zip"
|
||||
LIBJPEG_URL="$GNOME_WIN32_DEPS_URL/libjpeg-6b-4.zip"
|
||||
LIBPNG_URL="$GTK_MIRROR/gtk/v2.10/win32/dependencies/libpng-1.2.8-bin.zip"
|
||||
ZLIB_URL="$GTK_MIRROR/gtk/v2.10/win32/dependencies/zlib123-dll.zip"
|
||||
PKG_CONFIG_URL="$GNOME_WIN32_DEPS_URL/pkg-config-0.20.zip"
|
||||
CAIRO_URL="$GNOME_WIN32_DEPS_URL/cairo-1.4.0.zip"
|
||||
CAIRO_DEV_URL="$GNOME_WIN32_DEPS_URL/cairo-dev-1.4.0.zip"
|
||||
CAIRO_URL="$GNOME_WIN32_DEPS_URL/cairo-1.4.2.zip"
|
||||
CAIRO_DEV_URL="$GNOME_WIN32_DEPS_URL/cairo-dev-1.4.2.zip"
|
||||
EXPAT_URL="$GNOME_WIN32_DEPS_URL/expat-2.0.0.zip"
|
||||
FONTCONFIG_URL="$GNOME_WIN32_DEPS_URL/fontconfig-2.3.2-tml-20060825.zip"
|
||||
FONTCONFIG_DEV_URL="$GNOME_WIN32_DEPS_URL/fontconfig-dev-2.3.2-tml-20060825.zip"
|
||||
@@ -116,12 +116,12 @@ FREETYPE_URL="$GNOME_WIN32_DEPS_URL/freetype-2.2.1.zip"
|
||||
FREETYPE_DEV_URL="$GNOME_WIN32_DEPS_URL/freetype-dev-2.2.1.zip"
|
||||
ATK_URL="$GNOME_WIN32_URL/atk/1.12/atk-1.12.3.zip"
|
||||
ATK_DEV_URL="$GNOME_WIN32_URL/atk/1.12/atk-dev-1.12.3.zip"
|
||||
PANGO_URL="$GNOME_WIN32_URL/pango/1.14/pango-1.14.10.zip"
|
||||
PANGO_DEV_URL="$GNOME_WIN32_URL/pango/1.14/pango-dev-1.14.10.zip"
|
||||
PANGO_URL="$GNOME_WIN32_URL/pango/1.16/pango-1.16.1.zip"
|
||||
PANGO_DEV_URL="$GNOME_WIN32_URL/pango/1.16/pango-dev-1.16.1.zip"
|
||||
LIBART_LGPL_URL="$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.17.zip"
|
||||
LIBART_LGPL_DEV_URL="$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.17.zip"
|
||||
GTK_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-2.10.9.zip"
|
||||
GTK_DEV_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-dev-2.10.9.zip"
|
||||
GTK_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-2.10.11.zip"
|
||||
GTK_DEV_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-dev-2.10.11.zip"
|
||||
INTLTOOL_URL="$GNOME_WIN32_URL/intltool/0.35/intltool-0.35.5.zip"
|
||||
ORBIT2_URL="$GNOME_WIN32_URL/ORBit2/2.13/ORBit2-2.13.3.zip"
|
||||
ORBIT2_DEV_URL="$GNOME_WIN32_URL/ORBit2/2.13/ORBit2-dev-2.13.3.zip"
|
||||
@@ -147,10 +147,8 @@ 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"
|
||||
LIBGNOMEPRINTUI_URL="$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-2.12.1.zip"
|
||||
LIBGNOMEPRINTUI_DEV_URL="$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-dev-2.12.1.zip"
|
||||
GTKHTML_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.2.zip"
|
||||
GTKHTML_DEV_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.2.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"
|
||||
GNOME_DIR=$GLOBAL_DIR\\gnome
|
||||
|
||||
SWIG_URL="$SF_MIRROR/swig/swigwin-1.3.31.zip"
|
||||
|
||||
@@ -408,7 +408,7 @@ 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 libgnomeprintui-2.2 libgtkhtml-3.8 &&
|
||||
${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgtkhtml-3.14 &&
|
||||
quiet intltoolize --version
|
||||
then
|
||||
echo "gnome packages installed. skipping."
|
||||
@@ -463,8 +463,6 @@ 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
|
||||
wget_unpacked $LIBGNOMEPRINTUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
|
||||
wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR
|
||||
wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
|
||||
qpushd $GNOME_DIR
|
||||
@@ -479,6 +477,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
|
||||
# work around a bug in msys bash, adding 0x01 smilies
|
||||
cat > bin/pkg-config-msys.sh <<EOF
|
||||
#!/bin/sh
|
||||
@@ -504,7 +504,7 @@ EOF
|
||||
#qpopd
|
||||
fi
|
||||
quiet gconftool-2 --version &&
|
||||
${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 &&
|
||||
${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgtkhtml-3.14 &&
|
||||
quiet intltoolize --version || die "gnome not installed correctly"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user