[ooo-build-commit] configure.in patches/dev300

[Petr Mladek]

 configure.in         |    8 +++++++-
 patches/dev300/apply |    3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit f64e78c4ba5e715b05e32815e4b132e809182d4d
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Jun 24 18:44:53 2009 +0200

    download/unpack OXYGEN_IMAGES_TAR only for OxygenOffice build
    
    * configure.in: defined OXYGEN_IMAGES_TAR only for OxygenOffice distro

diff --git a/configure.in b/configure.in
index f91c6c6..413f54e 100644
--- a/configure.in
+++ b/configure.in
@@ -754,8 +754,13 @@ if test "$enable_kde" != "no"; then
 else
    OOO_WIDGET_FLAGS="--disable-kde"
 fi
+
+OXYGEN_IMAGES_TAR=
 if test "$enable_kde4" != "no"; then
-   OXYGEN_IMAGES_TAR=ooo_oxygen_images-2009-06-17.tar.gz
+   if test "z$with_distro" = "zOxygenOfficeLinux" -o \
+           "z$with_distro" = "zOxygenOfficeWindows" ; then
+      OXYGEN_IMAGES_TAR=ooo_oxygen_images-2009-06-17.tar.gz
+   fi
    if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin"; then
       OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --enable-kde4"
       widget_sets="$widget_sets kde4"
@@ -764,6 +769,7 @@ else
    OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --disable-kde4"
 fi
 AC_SUBST(OXYGEN_IMAGES_TAR)
+
 if test "$enable_gtk" != "no"; then
    if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin"; then
       OOO_WIDGET_FLAGS="--enable-gtk $OOO_WIDGET_FLAGS"
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 87bf343..365f9df 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3106,11 +3106,12 @@ svx-visibility.diff, fridrich
 
 # the smart art import work
 unoxml-fast-sax-serializable.diff, thorsten
+# FIXME: similar fix already in dev300_m50
 # partial support for two template types
 # it is needed to process the new XFastSAXSerializable.idl
 # the patch fixes the semantic analyze but not the output
 # the output of template types seems to be incomplete anyway
-autodoc-two-template-types.diff, pmladek
+autodoc-two-template-types.diff, i#103005, pmladek
 # this here depends on oox changes in OOXMLExport
 oox-smartart-import.diff, thorsten