AUDIT: r16646 - gnucash/trunk/packaging/win32 - Win32: Update package versions.
Andreas Köhler
andi5 at cvs.gnucash.org
Sat Dec 15 12:34:27 EST 2007
Author: andi5
Date: 2007-12-15 12:34:26 -0500 (Sat, 15 Dec 2007)
New Revision: 16646
Trac: http://svn.gnucash.org/trac/changeset/16646
Added:
gnucash/trunk/packaging/win32/goffice-0.4.3-patch.diff
Removed:
gnucash/trunk/packaging/win32/goffice-0.4.1-patch.diff
Modified:
gnucash/trunk/packaging/win32/defaults.sh
gnucash/trunk/packaging/win32/dist.sh
gnucash/trunk/packaging/win32/gnucash.iss.in
gnucash/trunk/packaging/win32/install.sh
Log:
Win32: Update package versions.
Update to gettext 0.17, glib 2.14.4, cairo 1.4.10, fontconfig
2.4.2-tml-20071015, atk 1.20.0, pango 1.18.3, gtk+ 2.12.3, orbit2
2.14.10, gail 1.20.1, libbonobo 2.20.1, gnome-vfs 2.18.0.1, libgnome
2.20.1, libgnomecanvas 2.20.1, libbonoboui 2.20.0, libglade 2.6.2 and
goffice 0.4.3.
Gettext installs translations to $prefix\lib\locale now, but not all
gnome packages have been rebuilt yet.
BP
Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh 2007-12-14 21:58:45 UTC (rev 16645)
+++ gnucash/trunk/packaging/win32/defaults.sh 2007-12-15 17:34:26 UTC (rev 16646)
@@ -150,53 +150,54 @@
set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2-2.6.27.zip"
set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev-2.6.27.zip"
-set_default GETTEXT_URL "$GNOME_WIN32_DEPS_URL/gettext-0.14.5.zip"
-set_default GETTEXT_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-dev-0.14.5.zip"
+set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-0.17.zip"
+set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev-0.17.zip"
+set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-0.17.zip"
set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
-set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.12/glib-2.12.12.zip"
-set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.12/glib-dev-2.12.12.zip"
+set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.14/glib-2.14.4.zip"
+set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.14/glib-dev-2.14.4.zip"
set_default LIBJPEG_URL "$GNOME_WIN32_DEPS_URL/libjpeg-6b-4.zip"
set_default LIBPNG_URL "$GTK_MIRROR/gtk/v2.10/win32/dependencies/libpng-1.2.8-bin.zip"
set_default ZLIB_URL "$GTK_MIRROR/gtk/v2.10/win32/dependencies/zlib123-dll.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config-0.20.zip"
-set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo-1.4.8.zip"
-set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev-1.4.8.zip"
+set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo-1.4.10.zip"
+set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev-1.4.10.zip"
set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat-2.0.0.zip"
-set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig-2.4.2-tml-20070301.zip"
-set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev-2.4.2-tml-20070301.zip"
+set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig-2.4.2-tml-20071015.zip"
+set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev-2.4.2-tml-20071015.zip"
set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype-2.3.5.zip"
set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev-2.3.5.zip"
-set_default ATK_URL "$GNOME_WIN32_URL/atk/1.18/atk-1.18.0.zip"
-set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.18/atk-dev-1.18.0.zip"
-set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.16/pango-1.16.4.zip"
-set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.16/pango-dev-1.16.4.zip"
+set_default ATK_URL "$GNOME_WIN32_URL/atk/1.20/atk-1.20.0.zip"
+set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.20/atk-dev-1.20.0.zip"
+set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.18/pango-1.18.3.zip"
+set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.18/pango-dev-1.18.3.zip"
set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.19.zip"
set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.19.zip"
-set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.10/gtk+-2.10.13.zip"
-set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.10/gtk+-dev-2.10.13.zip"
+set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.12/gtk+-2.12.3.zip"
+set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.12/gtk+-dev-2.12.3.zip"
set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.35/intltool-0.35.5.zip"
-set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.7.zip"
-set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.7.zip"
-set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.18/gail-1.18.0.zip"
-set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.18/gail-dev-1.18.0.zip"
+set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.10.zip"
+set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.10.zip"
+set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.20/gail-1.20.1.zip"
+set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.20/gail-dev-1.20.1.zip"
set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
set_default POPT_DEV_URL "$GNOME_WIN32_DEPS_URL/popt-dev-1.10.2-tml-20050828.zip"
set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.18/GConf-2.18.0.1.zip"
set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.18/GConf-dev-2.18.0.1.zip"
-set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.18/libbonobo-2.18.0.zip"
-set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.18/libbonobo-dev-2.18.0.zip"
-set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-2.14.2-no-openssl.zip"
-set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-dev-2.14.2-no-openssl.zip"
-set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.18/libgnome-2.18.0.zip"
-set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.18/libgnome-dev-2.18.0.zip"
-set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.14/libgnomecanvas-2.14.0.zip"
-set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.14/libgnomecanvas-dev-2.14.0.zip"
-set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.18/libbonoboui-2.18.0.zip"
-set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.18/libbonoboui-dev-2.18.0.zip"
+set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.20/libbonobo-2.20.1.zip"
+set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.20/libbonobo-dev-2.20.1.zip"
+set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.18/gnome-vfs-2.18.0.1.zip"
+set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.18/gnome-vfs-dev-2.18.0.1.zip"
+set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.20/libgnome-2.20.1.zip"
+set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.20/libgnome-dev-2.20.1.zip"
+set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-2.20.1.zip"
+set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-dev-2.20.1.zip"
+set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.20/libbonoboui-2.20.0.zip"
+set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.20/libbonoboui-dev-2.20.0.zip"
set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.16/libgnomeui-2.16.0.zip"
set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.16/libgnomeui-dev-2.16.0.zip"
-set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-2.6.0.zip"
-set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev-2.6.0.zip"
+set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-2.6.2.zip"
+set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev-2.6.2.zip"
set_default LIBGNOMEPRINT_URL "$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-2.12.1.zip"
set_default LIBGNOMEPRINT_DEV_URL "$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-dev-2.12.1.zip"
set_default LIBGNOMEPRINTUI_URL "$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-2.12.1.zip" # gnomeprint
@@ -217,9 +218,9 @@
set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.5.tar.bz2"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
-set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.4/goffice-0.4.1.tar.bz2"
+set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.4/goffice-0.4.3.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
-set_default GOFFICE_PATCH `pwd`/goffice-0.4.1-patch.diff
+set_default GOFFICE_PATCH `pwd`/goffice-0.4.3-patch.diff
set_default GLADE_URL "$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
set_default GLADE_DIR $GLOBAL_DIR\\glade
Modified: gnucash/trunk/packaging/win32/dist.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist.sh 2007-12-14 21:58:45 UTC (rev 16645)
+++ gnucash/trunk/packaging/win32/dist.sh 2007-12-15 17:34:26 UTC (rev 16646)
@@ -76,7 +76,7 @@
function dist_gnome() {
setup Gnome platform
wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GETTEXT_URL $DOWNLOAD_DIR $DIST_DIR
+ wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
smart_wget $LIBICONV_URL $DOWNLOAD_DIR
unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
@@ -109,6 +109,8 @@
wget_unpacked $LIBGNOMEPRINTUI_URL $DOWNLOAD_DIR $DIST_DIR # gnomeprint
wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $DIST_DIR
rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
+ cp -a $DIST_UDIR/lib/locale $DIST_UDIR/share
+ rm -rf $DIST_UDIR/lib/locale
}
function dist_pcre() {
@@ -121,8 +123,8 @@
setup libGSF
mkdir -p $DIST_UDIR/bin
cp -a $_LIBGSF_UDIR/bin/libgsf*.dll $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/lib
- cp -a $_LIBGSF_UDIR/lib/locale $DIST_UDIR/lib
+ mkdir -p $DIST_UDIR/share
+ cp -a $_LIBGSF_UDIR/share/locale $DIST_UDIR/lib
}
function dist_goffice() {
@@ -130,9 +132,9 @@
mkdir -p $DIST_UDIR/bin
cp -a $_GOFFICE_UDIR/bin/libgoffice*.dll $DIST_UDIR/bin
mkdir -p $DIST_UDIR/lib
- cp -a $_GOFFICE_UDIR/lib/{goffice,locale} $DIST_UDIR/lib
+ cp -a $_GOFFICE_UDIR/lib/goffice $DIST_UDIR/lib
mkdir -p $DIST_UDIR/share
- cp -a $_GOFFICE_UDIR/share/{goffice,pixmaps} $DIST_UDIR/share
+ cp -a $_GOFFICE_UDIR/share/{goffice,locale,pixmaps} $DIST_UDIR/share
}
function dist_libofx() {
@@ -175,13 +177,12 @@
mkdir -p $DIST_UDIR/etc/gconf/schemas
cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas
mkdir -p $DIST_UDIR/lib
- cp -a $_INSTALL_UDIR/lib/locale $DIST_UDIR/lib
cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/lib
mkdir -p $DIST_UDIR/lib/gnucash
cp -a $_INSTALL_UDIR/lib/gnucash/lib*.dll $DIST_UDIR/lib/gnucash
cp -a $_INSTALL_UDIR/libexec $DIST_UDIR
mkdir -p $DIST_UDIR/share
- cp -a $_INSTALL_UDIR/share/{gnucash,pixmaps,xml} $DIST_UDIR/share
+ cp -a $_INSTALL_UDIR/share/{gnucash,locale,pixmaps,xml} $DIST_UDIR/share
cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.bat $DIST_UDIR/bin
_QTDIR_WIN=`echo $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' `
Modified: gnucash/trunk/packaging/win32/gnucash.iss.in
===================================================================
--- gnucash/trunk/packaging/win32/gnucash.iss.in 2007-12-14 21:58:45 UTC (rev 16645)
+++ gnucash/trunk/packaging/win32/gnucash.iss.in 2007-12-15 17:34:26 UTC (rev 16646)
@@ -88,8 +88,8 @@
Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;; The translations (no idea why mingw installs them in prefix/lib/locale)
-;Source: "@prefix@\..\dist\lib\locale\*"; DestDir: "{app}\lib\locale"; Flags: recursesubdirs; Components: translations
+;; The translations
+;Source: "@prefix@\..\dist\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
;
;; The account templates
;Source: "@prefix@\..\dist\share\gnucash\accounts\*"; DestDir: "{app}\share\gnucash\accounts"; Flags: recursesubdirs; Components: templates
@@ -135,7 +135,7 @@
Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "wizarddir"; ValueData: "{app}\lib\aqbanking\plugins\16\wizards"; Flags: uninsdeletevalue
Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "pkgdatadir"; ValueData: "{app}\share\aqbanking"; Flags: uninsdeletevalue
Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\lib\locale"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "xmldatadir"; ValueData: "{app}\share\aqhbci\xml"; Flags: uninsdeletevalue
Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "cfgmoduledir"; ValueData: "{app}\lib\aqbanking\plugins\16\frontends\qbanking\cfgmodules"; Flags: uninsdeletevalue
Deleted: gnucash/trunk/packaging/win32/goffice-0.4.1-patch.diff
===================================================================
--- gnucash/trunk/packaging/win32/goffice-0.4.1-patch.diff 2007-12-14 21:58:45 UTC (rev 16645)
+++ gnucash/trunk/packaging/win32/goffice-0.4.1-patch.diff 2007-12-15 17:34:26 UTC (rev 16646)
@@ -1,69 +0,0 @@
-diff -Nur goffice-0.4.1-old/goffice/Makefile.am goffice-0.4.1/goffice/Makefile.am
---- goffice-0.4.1-old/goffice/Makefile.am Sat Jul 7 00:44:32 2007
-+++ goffice-0.4.1/goffice/Makefile.am Sat Jul 21 23:24:22 2007
-@@ -24,7 +24,7 @@
- libgoffice_0_la_DEPENDENCIES = goffice.def
- libgoffice_0_la_LDFLAGS += -no-undefined -export-symbols goffice.def
- if WITH_NATIVE_WIN32
--libgoffice_0_la_LIBADD += -luuid -lhtmlhelp -lurlmon
-+libgoffice_0_la_LIBADD += -luuid
- endif
- endif
-
-diff -Nur goffice-0.4.1-old/gtk-doc.m4 goffice-0.4.1/gtk-doc.m4
---- goffice-0.4.1-old/gtk-doc.m4 Thu Jan 1 00:00:00 1970
-+++ goffice-0.4.1/gtk-doc.m4 Sat Jul 21 23:25:04 2007
-@@ -0,0 +1,53 @@
-+dnl -*- mode: autoconf -*-
-+
-+# serial 1
-+
-+dnl Usage:
-+dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
-+AC_DEFUN([GTK_DOC_CHECK],
-+[
-+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+ dnl for overriding the documentation installation directory
-+ AC_ARG_WITH(html-dir,
-+ AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-+ [with_html_dir='${datadir}/gtk-doc/html'])
-+ HTML_DIR="$with_html_dir"
-+ AC_SUBST(HTML_DIR)
-+
-+ dnl enable/disable documentation building
-+ AC_ARG_ENABLE(gtk-doc,
-+ AC_HELP_STRING([--enable-gtk-doc],
-+ [use gtk-doc to build documentation [default=no]]),,
-+ enable_gtk_doc=no)
-+
-+ have_gtk_doc=no
-+ if test x$enable_gtk_doc = xyes; then
-+ if test -z "$PKG_CONFIG"; then
-+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+ fi
-+ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-+ have_gtk_doc=yes
-+ fi
-+
-+ dnl do we want to do a version check?
-+ifelse([$1],[],,
-+ [gtk_doc_min_version=$1
-+ if test "$have_gtk_doc" = yes; then
-+ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-+ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-+ AC_MSG_RESULT(yes)
-+ else
-+ AC_MSG_RESULT(no)
-+ have_gtk_doc=no
-+ fi
-+ fi
-+])
-+ if test "$have_gtk_doc" != yes; then
-+ enable_gtk_doc=no
-+ fi
-+ fi
-+
-+ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-+ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-+])
Copied: gnucash/trunk/packaging/win32/goffice-0.4.3-patch.diff (from rev 16579, gnucash/trunk/packaging/win32/goffice-0.4.1-patch.diff)
===================================================================
--- gnucash/trunk/packaging/win32/goffice-0.4.3-patch.diff (rev 0)
+++ gnucash/trunk/packaging/win32/goffice-0.4.3-patch.diff 2007-12-15 17:34:26 UTC (rev 16646)
@@ -0,0 +1,69 @@
+diff -Nur goffice-0.4.3-old/goffice/Makefile.am goffice-0.4.3/goffice/Makefile.am
+--- goffice-0.4.3-old/goffice/Makefile.am Sat Jul 7 00:44:32 2007
++++ goffice-0.4.3/goffice/Makefile.am Sat Jul 21 23:24:22 2007
+@@ -24,7 +24,7 @@
+ libgoffice_0_la_DEPENDENCIES = goffice.def
+ libgoffice_0_la_LDFLAGS += -no-undefined -export-symbols goffice.def
+ if WITH_NATIVE_WIN32
+-libgoffice_0_la_LIBADD += -luuid -lhtmlhelp -lurlmon
++libgoffice_0_la_LIBADD += -luuid
+ endif
+ endif
+
+diff -Nur goffice-0.4.3-old/gtk-doc.m4 goffice-0.4.3/gtk-doc.m4
+--- goffice-0.4.3-old/gtk-doc.m4 Thu Jan 1 00:00:00 1970
++++ goffice-0.4.3/gtk-doc.m4 Sat Jul 21 23:25:04 2007
+@@ -0,0 +1,53 @@
++dnl -*- mode: autoconf -*-
++
++# serial 1
++
++dnl Usage:
++dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
++AC_DEFUN([GTK_DOC_CHECK],
++[
++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++ dnl for overriding the documentation installation directory
++ AC_ARG_WITH(html-dir,
++ AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
++ [with_html_dir='${datadir}/gtk-doc/html'])
++ HTML_DIR="$with_html_dir"
++ AC_SUBST(HTML_DIR)
++
++ dnl enable/disable documentation building
++ AC_ARG_ENABLE(gtk-doc,
++ AC_HELP_STRING([--enable-gtk-doc],
++ [use gtk-doc to build documentation [default=no]]),,
++ enable_gtk_doc=no)
++
++ have_gtk_doc=no
++ if test x$enable_gtk_doc = xyes; then
++ if test -z "$PKG_CONFIG"; then
++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++ fi
++ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
++ have_gtk_doc=yes
++ fi
++
++ dnl do we want to do a version check?
++ifelse([$1],[],,
++ [gtk_doc_min_version=$1
++ if test "$have_gtk_doc" = yes; then
++ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
++ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
++ AC_MSG_RESULT(yes)
++ else
++ AC_MSG_RESULT(no)
++ have_gtk_doc=no
++ fi
++ fi
++])
++ if test "$have_gtk_doc" != yes; then
++ enable_gtk_doc=no
++ fi
++ fi
++
++ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
++ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
++])
Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh 2007-12-14 21:58:45 UTC (rev 16645)
+++ gnucash/trunk/packaging/win32/install.sh 2007-12-15 17:34:26 UTC (rev 16646)
@@ -472,8 +472,9 @@
mkdir -p $_GNOME_UDIR
wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBXML2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GETTEXT_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GETTEXT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GETTEXT_RUNTIME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GETTEXT_TOOLS_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -1012,6 +1013,10 @@
for A in *.la; do
sed '/dependency_libs/d' $A > tmp ; mv tmp $A
done
+
+ # gettext 0.17 installs translations to \share\locale, but not all
+ # gnome packages have been recompiled against it
+ cp -a locale ../share && rm -rf locale
qpopd
qpushd $_INSTALL_UDIR/etc/gconf/schemas
More information about the gnucash-changes
mailing list