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

Win32 build: Revert r20614 libxml2 version update because the win build seems to stop due to bad linker flags in libxml-2.0.pc.

Browse Source 
Also, fix the pkgconfig files unconditionally.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20615 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2011-05-10 11:05:18 +00:00
parent 5069a48be5
commit 4878672655
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/win32/defaults.sh
View File

@ -215,7 +215,7 @@ LIBXSLT_VERSION="1.1.22"
#LIBXSLT_VERSION=1.1.26 #LIBXSLT_VERSION=1.1.26
set_default LIBXSLT_SRC_URL "${XSLT_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.bz2" 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" 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 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_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip" set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"

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

@ -485,7 +485,7 @@ function inst_gnome() {
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-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=${CAIRO_VERSION} cairo &&
quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 && 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 quiet intltoolize --version
then then
echo "gnome packages installed in $_GNOME_UDIR. skipping." echo "gnome packages installed in $_GNOME_UDIR. skipping."
@ -590,14 +590,6 @@ EOF
rm -rf $TMP_UDIR/gtk-doc-* rm -rf $TMP_UDIR/gtk-doc-*
qpopd 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 if quiet ${PKG_CONFIG} --exact-version=${PIXMAN_VERSION} pixman-1 ; then
echo "Pixman already compiled+installed" echo "Pixman already compiled+installed"
else else
@ -634,13 +626,18 @@ EOF
rm -rf ${TMP_UDIR}/libxml2-* rm -rf ${TMP_UDIR}/libxml2-*
fi 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 gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 && 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=${GCONF_VERSION} gconf-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-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=${CAIRO_VERSION} cairo &&
quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 && 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" 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