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

[tml svn gnome org]

Author: tml
Date: Mon Oct 27 16:46:40 2008
New Revision: 14413
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14413&view=rev

Log:
2008-10-27  Tor Lillqvist  <tml novell com>

	* patches/dev300/extensions_configure.diff
	* patches/dev300/scp2_extensions.diff
	* patches/dev300/extensions_packinfo.diff: Copy from
	ooo-build-3-0. Fixes build breakage for NovellWin32 at least, when
	building just for en-US.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/extensions_configure.diff
   trunk/patches/dev300/extensions_packinfo.diff
   trunk/patches/dev300/scp2_extensions.diff

Modified: trunk/patches/dev300/extensions_configure.diff
==============================================================================
--- trunk/patches/dev300/extensions_configure.diff	(original)
+++ trunk/patches/dev300/extensions_configure.diff	Mon Oct 27 16:46:40 2008
@@ -65,7 +65,7 @@
  dnl ===================================================================
 +dnl Test whether to integrate extensions into the product's installer
 +dnl ===================================================================
-+AC_MSG_CHECKING([for Sun Professinal Template Pack intergration (only supported languages displayed)])
++AC_MSG_CHECKING([for Sun Extension intergration])
 +if test "z$with_extension_integration" = "z" -o "z$ith_extension_integration" = "zno" ; then
 +  WITH_EXTENSION_INTEGRATION=NO
 +  AC_MSG_RESULT([no integration])
@@ -102,7 +102,7 @@
 +	if test -n "`echo $with_lang | grep "$lang"`" ; then
 +		SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
 +		fixed_lang=`echo $lang | sed -e s/-/_/g`
-+       SCPDEFS="$SCPDEFS -DWITH_WITH_EXTENSION_SUN_TEMPLATE_PACK_$fixed_lang"
++       SCPDEFS="$SCPDEFS -DWITH_EXTENSION_SUN_TEMPLATE_PACK_$fixed_lang"
 +	fi
 +    done
 +    AC_MSG_RESULT([$SUNTEMPLATES_LANG])

Modified: trunk/patches/dev300/extensions_packinfo.diff
==============================================================================
--- trunk/patches/dev300/extensions_packinfo.diff	(original)
+++ trunk/patches/dev300/extensions_packinfo.diff	Mon Oct 27 16:46:40 2008
@@ -1,9 +1,25 @@
---- setup_native/source/packinfo/packinfo_office.txt.orig	2008-01-14 20:09:47.000000000 +0100
-+++ setup_native/source/packinfo/packinfo_office.txt	2008-03-29 11:00:24.000000000 +0100
-@@ -63,6 +63,166 @@
- End
- 
- Start
+--- setup_native/source/packinfo/packinfo_extensions.txt.orig	2008-01-14 20:09:47.000000000 +0100
++++ setup_native/source/packinfo/packinfo_extensions.txt	2008-03-29 11:00:24.000000000 +0100
+@@ -0,0 +1,179 @@
++# Format:
++
++# Start
++# scpModule
++# shellscript file (optional)
++# solarispackagename
++# solarisrequires (optional)
++# solarisprovides (optional)
++# packagename
++# linuxreplaces (optional)
++# requires (optional)
++# provides (optional)
++# copyright
++# vendor
++# description
++# destpath
++# End
++
++Start
 +module = "gid_Module_Optional_Extensions_MINIMIZER"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-presentation-minimizer"
@@ -163,7 +179,4 @@
 +packageversion = "%PACKAGEVERSION"
 +End
 +
-+Start
- module = "gid_Module_Prg_Wrt_Bin"
- script = "shellscripts_module.txt"
- solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
++

Modified: trunk/patches/dev300/scp2_extensions.diff
==============================================================================
--- trunk/patches/dev300/scp2_extensions.diff	(original)
+++ trunk/patches/dev300/scp2_extensions.diff	Mon Oct 27 16:46:40 2008
@@ -108,7 +108,7 @@
 +
 +/* ** Sun Template Pack (en-US) ** */
 +
-+#ifndef WITHOUT_EXTENSION_SUN_TEMPLATE_PACK_en_US
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_en_US
 +
 +File gid_File_Optional_Extensions_Sun_Template_Pack_en-US
 +    TXT_FILE_BODY;
@@ -121,7 +121,7 @@
 +
 +/* ** Sun Template Pack (de) ** */
 +
-+#ifndef WITHOUT_EXTENSION_SUN_TEMPLATE_PACK_de
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_de
 +
 +File gid_File_Optional_Extensions_Sun_Template_Pack_de
 +    TXT_FILE_BODY;
@@ -134,7 +134,7 @@
 +
 +/* ** Sun Template Pack (it) ** */
 +
-+#ifndef WITHOUT_EXTENSION_SUN_TEMPLATE_PACK_it
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_it
 +
 +File gid_File_Optional_Extensions_Sun_Template_Pack_it
 +    TXT_FILE_BODY;
@@ -147,7 +147,7 @@
 +
 +/* ** Sun Template Pack (fr) ** */
 +
-+#ifndef WITHOUT_EXTENSION_SUN_TEMPLATE_PACK_fr
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_fr
 +
 +File gid_File_Optional_Extensions_Sun_Template_Pack_fr
 +    TXT_FILE_BODY;
@@ -160,7 +160,7 @@
 +
 +/* ** Sun Template Pack (es) ** */
 +
-+#ifndef WITHOUT_EXTENSION_SUN_TEMPLATE_PACK_es
++#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_es
 +
 +File gid_File_Optional_Extensions_Sun_Template_Pack_es
 +    TXT_FILE_BODY;
@@ -287,7 +287,7 @@
 +#ifndef WITHOUT_EXTENSION_MINIMIZER
 +#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_MINIMIZER
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MINIMIZER);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -304,7 +304,7 @@
 +#ifndef WITHOUT_EXTENSION_REPORTDESIGN
 +#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_REPORTDESIGN
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -321,7 +321,7 @@
 +#ifndef WITHOUT_EXTENSION_MEDIAWIKI
 +#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_MEDIAWIKI
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -338,7 +338,7 @@
 +#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
 +#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_PRESENTER_SCREEN
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -355,7 +355,7 @@
 +#ifndef WITHOUT_EXTENSION_PDFIMPORT
 +#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_PDFIMPORT
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -371,7 +371,7 @@
 +
 +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_en_US
 +Module gid_Module_Optional_Extensions_Sun_Template_Pack_en-US
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_en-US);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -386,7 +386,7 @@
 +
 +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_de
 +Module gid_Module_Optional_Extensions_Sun_Template_Pack_de
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_de);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -401,7 +401,7 @@
 +
 +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_it
 +Module gid_Module_Optional_Extensions_Sun_Template_Pack_it
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_it);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -416,7 +416,7 @@
 +
 +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_fr
 +Module gid_Module_Optional_Extensions_Sun_Template_Pack_fr
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_fr);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
@@ -431,7 +431,7 @@
 +
 +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_es
 +Module gid_Module_Optional_Extensions_Sun_Template_Pack_es
-+    PackageInfo = "packinfo_office.txt";
++    PackageInfo = "packinfo_extensions.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_es);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (