diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh index f5bc8d6927..cfbd7ba426 100644 --- a/packaging/win32/defaults.sh +++ b/packaging/win32/defaults.sh @@ -215,7 +215,7 @@ LIBXSLT_VERSION="1.1.22" #LIBXSLT_VERSION=1.1.26 set_default LIBXSLT_SRC_URL "${XSLT_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.bz2" set_default LIBXSLT_MAKEFILE_PATCH "`pwd`/libxslt-1.1.22.Makefile.in.patch" -LIBXML2_VERSION="2.6.30" +LIBXML2_VERSION="2.6.27" set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-${LIBXML2_VERSION}.tar.bz2" set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip" set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip" diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh index 6cc6b307cc..1a69cd9d0c 100755 --- a/packaging/win32/install-impl.sh +++ b/packaging/win32/install-impl.sh @@ -485,7 +485,7 @@ function inst_gnome() { quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 && quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo && quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 && - quiet ${PKG_CONFIG} --atleast-version=${LIBXML2_VERSION} libxml-2.0 && + quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 && quiet intltoolize --version then echo "gnome packages installed in $_GNOME_UDIR. skipping." @@ -590,14 +590,6 @@ EOF rm -rf $TMP_UDIR/gtk-doc-* qpopd - if [ "$CROSS_COMPILE" = "yes" ]; then - qpushd $_GNOME_UDIR/lib/pkgconfig - perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc - #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc - qpopd - fi - - if quiet ${PKG_CONFIG} --exact-version=${PIXMAN_VERSION} pixman-1 ; then echo "Pixman already compiled+installed" else @@ -634,13 +626,18 @@ EOF rm -rf ${TMP_UDIR}/libxml2-* fi + qpushd $_GNOME_UDIR/lib/pkgconfig + perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc + #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc + qpopd + quiet gconftool-2 --version && quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 && quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 && quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 && quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo && quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 && - quiet ${PKG_CONFIG} --atleast-version=${LIBXML2_VERSION} libxml-2.0 && + quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-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