GNOME.org
 

ooo-build r12579 - in trunk: . patches/dev300

Author: szalaik
Date: Sun May 18 04:57:29 2008
New Revision: 12579
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12579&view=rev

Log:
2008-05-18  Kalman Szalai - KAMI <kamihir freemail hu>

	* configure.in: Updated OOOP packages to
	OOOP-samples-pack-2.4.0.4.zip, OOOP-gallery-pack-2.4.0.4.zip,
	OOOP-fonts-pack-2.4.0.4.zip and OOOP-templates-pack-2.4.0.4.zip.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/extensions_configure.diff
   trunk/patches/dev300/scp2_build_extensions.diff

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun May 18 04:57:29 2008
@@ -660,10 +660,10 @@
 OOOP_TEMPLATES_PACK=
 if test "z$with_distro" = "zOxygenOfficeLinux" -o \
         "z$with_distro" = "zOxygenOfficeWindows" ; then
-    OOOP_FONTS_PACK="OOOP-fonts-pack-2.4.0.0.zip"
-    OOOP_GALLERY_PACK="OOOP-gallery-pack-2.4.0.0.zip"
-    OOOP_SAMPLES_PACK="OOOP-samples-pack-2.4.0.1.zip"
-    OOOP_TEMPLATES_PACK="OOOP-templates-pack-2.4.0.1.zip"
+    OOOP_FONTS_PACK="OOOP-fonts-pack-2.4.0.4.zip"
+    OOOP_GALLERY_PACK="OOOP-gallery-pack-2.4.0.4.zip"
+    OOOP_SAMPLES_PACK="OOOP-samples-pack-2.4.0.4.zip"
+    OOOP_TEMPLATES_PACK="OOOP-templates-pack-2.4.0.4.zip"
 fi
 AC_SUBST(OOOP_FONTS_PACK)
 AC_SUBST(OOOP_GALLERY_PACK)

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sun May 18 04:57:29 2008
@@ -2140,13 +2140,13 @@
 linkwarn-svx-warning-dlg.diff, n#348149, thorsten
 
 [ IntegrateExtensions ]
-scp2_build_extensions.diff
-scp2_makefile_extensions.diff
-scp2_extensions.diff
-extensions_configure.diff
-extensions_packinfo.diff
-extensions_shellscripts.diff
-extensions_deliver.diff
+;scp2_build_extensions.diff
+;scp2_makefile_extensions.diff
+;scp2_extensions.diff
+;extensions_configure.diff
+;extensions_packinfo.diff
+;extensions_shellscripts.diff
+;extensions_deliver.diff
  
 [ OxygenOfficeDefaultSettings ]
 # Always enable extended tips

Modified: trunk/patches/dev300/extensions_configure.diff
==============================================================================
--- trunk/patches/dev300/extensions_configure.diff	(original)
+++ trunk/patches/dev300/extensions_configure.diff	Sun May 18 04:57:29 2008
@@ -1,20 +1,13 @@
 --- config_office/configure.in.original	2008-03-19 07:37:01.000000000 +0100
 +++ config_office/configure.in	2008-03-19 08:20:11.000000000 +0100
-@@ -5377,10 +5377,14 @@
- AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
- if test -n "$enable_sdext" -a "$enable_sdext" != "no"; then
-    AC_MSG_RESULT([yes])
-+   WITH_EXTENSION_SDEXT=YES
-    BUILD_TYPE="$BUILD_TYPE SDEXT"
+@@ -5377,10 +5377,11 @@
  else
     AC_MSG_RESULT([no])
-+   WITH_EXTENSION_SDEXT=NO
+    ENABLE_MINIMIZER=NO
 +   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SDEXT"
  fi
-+AC_SUBST(WITH_EXTENSION_SDEXT)
+ AC_SUBST(ENABLE_MINIMIZER)
  
- AC_MSG_CHECKING([whether to build the Report Builder extension])
- if test -z "$enable_reportdesign" -o "$enable_reportdesign" != "no" && test "$WITH_JAVA" != "no"; then
 @@ -5458,6 +5458,7 @@
  else
    AC_MSG_RESULT([no])

Modified: trunk/patches/dev300/scp2_build_extensions.diff
==============================================================================
--- trunk/patches/dev300/scp2_build_extensions.diff	(original)
+++ trunk/patches/dev300/scp2_build_extensions.diff	Sun May 18 04:57:29 2008
@@ -1,16 +1,17 @@
 --- scp2/prj/build.lst.orig	2008-03-19 07:36:56.000000000 +0100
 +++ scp2/prj/build.lst		2008-03-19 10:16:16.000000000 +0100
 @@ -6,6 +6,7 @@
- cp    scp2\source\canvas          nmake    -    all    cp_canvas cp_langmacros NULL
- cp    scp2\source\crashrep        nmake    -    all    cp_crashrep cp_langmacros NULL
- cp    scp2\source\draw            nmake    -    all    cp_draw cp_langmacros NULL
+ cp    scp2\source\canvas          nmake    -    all    cp_canvas cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\crashrep        nmake    -    all    cp_crashrep cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\draw            nmake    -    all    cp_draw cp_langmacros cp_langtemplates NULL
 +cp    scp2\source\extensions      nmake    -    all    cp_extensions cp_langmacros NULL
- cp    scp2\source\gnome           nmake    -    all    cp_gnome cp_langmacros NULL
- cp    scp2\source\graphicfilter   nmake    -    all    cp_graphicfilter cp_langmacros NULL
- cp    scp2\source\impress         nmake    -    all    cp_impress cp_langmacros NULL
+ cp    scp2\source\gnome           nmake    -    all    cp_gnome cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\graphicfilter   nmake    -    all    cp_graphicfilter cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\impress         nmake    -    all    cp_impress cp_langmacros cp_langtemplates NULL
 @@ -26,4 +27,4 @@
- cp    scp2\source\ure             nmake    -    all    cp_ure cp_langmacros NULL
- cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros NULL
- cp    scp2\source\ooo_wo_ure      nmake    -    all    cp_ooo_wo_ure cp_langmacros NULL
--cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure NULL
-+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure NULL
+ cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
+-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
++cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]