GNOME.org
 

ooo-build r12050 - in trunk: . patches/src680 scratch/scp2/source/extensions

Author: szalaik
Date: Sat Mar 29 13:01:53 2008
New Revision: 12050
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12050&view=rev

Log:
2008-03-29  Kalman Szalai - KAMI <kamihir freemail hu>

	* download.in: Fixation, now works with non Windows platforms

	* patches/src680/extensions_configure.diff
	* patches/src680/extensions_packinfo.diff
	* patches/src680/premium-splitted-packages.diff
	* patches/src680/scp2_extensions.diff
	* scratch/scp2/source/extensions/file_extensions.scp
	* scratch/scp2/source/extensions/module_extensions.scp
	* scratch/scp2/source/extensions/module_extensions.ulf: Now we
	create packages from Report designer too. These patches applied
	only with OxygenOffice.

	* patches/src680/liberation_font_for_all.diff: We want to pack
	Liberation fonts for all platform. OxygenOffice only patch.

	* patches/src680/apply



Added:
   trunk/patches/src680/liberation_font_for_all.diff
Modified:
   trunk/ChangeLog
   trunk/download.in
   trunk/patches/src680/apply
   trunk/patches/src680/extensions_configure.diff
   trunk/patches/src680/extensions_packinfo.diff
   trunk/patches/src680/premium-splitted-packages.diff
   trunk/patches/src680/scp2_extensions.diff
   trunk/scratch/scp2/source/extensions/file_extensions.scp
   trunk/scratch/scp2/source/extensions/module_extensions.scp
   trunk/scratch/scp2/source/extensions/module_extensions.ulf

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Sat Mar 29 13:01:53 2008
@@ -202,9 +202,6 @@
     push @files, ( 'wintools.zip' );
     # Icons
     push @files, ( 'ooo-windows-icons-0.1.tar.bz2' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
-    # Prebuilt dictionaries
-    push @files, ( 'writingaids- PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32|OxygenOfficeLinux|OxygenOfficeWindows/;
-    push @files, ( 'writingaids-doc- PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32|OxygenOfficeLinux|OxygenOfficeWindows/;
 }
 else
 {
@@ -213,6 +210,11 @@
 	push @files, ( 'cli_types_bridgetest.dll' );
     }
 }
+
+# Prebuilt dictionaries
+push @files, ( 'writingaids- PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32|OxygenOfficeLinux|OxygenOfficeWindows/;
+push @files, ( 'writingaids-doc- PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32|OxygenOfficeLinux|OxygenOfficeWindows/;
+
 if ('@CAIRO_ENABLED@' eq 'TRUE' && '@SYSTEM_CAIRO@' ne 'TRUE') {
     push @files, ( 'cairo- CAIRO_VER@.tar.gz' );
 }

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Sat Mar 29 13:01:53 2008
@@ -2107,6 +2107,8 @@
 ooop-win32-installer-branding.diff
 #Update URL added to the OxygenOffice
 ooop-update-URL.diff
+#Enable liberation fonts for all
+liberation_font_for_all.diff
 
 [ OxygenOfficeExtras ]
 # Adding new items to extras module

Modified: trunk/patches/src680/extensions_configure.diff
==============================================================================
--- trunk/patches/src680/extensions_configure.diff	(original)
+++ trunk/patches/src680/extensions_configure.diff	Sat Mar 29 13:01:53 2008
@@ -15,3 +15,12 @@
  
  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])
+   ENABLE_REPORTDESIGN=NO
++  SCPDEFS="$SCPDEFS -DDISABLE_REPORTDESIGN"
+   SYSTEM_JFREEREPORT=NO
+ fi
+ AC_SUBST(ENABLE_REPORTDESIGN)
+

Modified: trunk/patches/src680/extensions_packinfo.diff
==============================================================================
--- trunk/patches/src680/extensions_packinfo.diff	(original)
+++ trunk/patches/src680/extensions_packinfo.diff	Sat Mar 29 13:01:53 2008
@@ -1,6 +1,6 @@
 --- 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-19 10:07:04.000000000 +0100
-@@ -322,6 +322,22 @@
++++ setup_native/source/packinfo/packinfo_office.txt	2008-03-29 11:00:24.000000000 +0100
+@@ -63,6 +63,38 @@
  End
  
  Start
@@ -18,8 +18,24 @@
 +description = "Presentation Minimizer extension for %PRODUCTNAME %PRODUCTVERSION"
 +destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
 +End
-+			
++
 +Start
- module = "gid_Module_Root_Files_2"
++module = "gid_Module_Optional_Extensions_REPORTDESIGN"
++script = "shellscripts_extensions.txt"
++solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-extension-report-builder"
++solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core08 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
++packagename = "%UNIXPRODUCTNAME-extension-report-builder"
++linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-extension-report-builder"
++requires = "%UNIXPRODUCTNAME-core01,%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core03u,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core04u,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core05u,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++freebsdrequires = "%UNIXPRODUCTNAME-core01,%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core03u,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core04u,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core05u,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++copyright = "1999-2008 by OpenOffice.org"
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "Report Builder extension for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
++End
++
++Start
+ module = "gid_Module_Prg_Wrt"
  script = "shellscripts_module.txt"
- solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-core02"
+ solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-writer"

Added: trunk/patches/src680/liberation_font_for_all.diff
==============================================================================

Modified: trunk/patches/src680/premium-splitted-packages.diff
==============================================================================
--- trunk/patches/src680/premium-splitted-packages.diff	(original)
+++ trunk/patches/src680/premium-splitted-packages.diff	Sat Mar 29 13:01:53 2008
@@ -1,28 +1,5 @@
 --- setup_native/source/packinfo/packinfo_office.txt.orig	2008-03-25 00:12:39.000000000 +0100
 +++ setup_native/source/packinfo/packinfo_office.txt	2008-03-23 15:00:51.000000000 +0100
-@@ -322,6 +322,22 @@
- End
- 
- Start
-+module = "gid_Module_Optional_Extensions_SDEXT"
-+script = "shellscripts_extensions.txt"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-extension-presentation-minimizer"
-+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %WITHOUTDOTUNIXPRODUCTNAME-core08 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%UNIXPRODUCTNAME-extension-presentation-minimizer"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-extension-presentation-minimizer"
-+requires = "%UNIXPRODUCTNAME-core01,%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core03u,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core04u,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core05u,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
-+freebsdrequires = "%UNIXPRODUCTNAME-core01,%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core03u,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core04u,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core05u,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
-+copyright = "1999-2008 by OpenOffice.org"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "OpenOffice.org"
-+description = "Presentation Minimizer extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
-+End
-+			
-+Start
- module = "gid_Module_Root_Files_2"
- script = "shellscripts_module.txt"
- solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-core02"
 @@ -457,3 +473,42 @@
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
  destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"

Modified: trunk/patches/src680/scp2_extensions.diff
==============================================================================
--- trunk/patches/src680/scp2_extensions.diff	(original)
+++ trunk/patches/src680/scp2_extensions.diff	Sat Mar 29 13:01:53 2008
@@ -1,7 +1,7 @@
 diff -Naur scp2/source/extensions/file_extensions.scp scp2/source/extensions/file_extensions.scp
 --- scp2/source/extensions/file_extensions.scp	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/extensions/file_extensions.scp	2008-03-22 10:57:33.000000000 +0100
-@@ -0,0 +1,51 @@
++++ scp2/source/extensions/file_extensions.scp	2008-03-29 07:50:21.000000000 +0100
+@@ -0,0 +1,65 @@
 +/*************************************************************************
 +*
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -52,7 +52,21 @@
 +    Name = "/minimizer/sun-presentation-minimizer.oxt";
 +End
 +
-+#endif 
++#endif
++
++/* ** SUN Report Builder ** */
++
++#ifndef DISABLE_REPORTDESIGN
++
++File gid_File_Oxt_Sun_Report_Builder
++    TXT_FILE_BODY;
++    Styles = (PACKED);
++    Dir = gid_Dir_Share_Extension_Install;
++    Name = "sun-report-builder.oxt";
++End
++
++#endif
++
 diff -Naur scp2/source/extensions/makefile.mk scp2/source/extensions/makefile.mk
 --- scp2/source/extensions/makefile.mk	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/makefile.mk	2008-03-22 10:57:33.000000000 +0100
@@ -116,8 +130,8 @@
 +.INCLUDE :  target.mk
 diff -Naur scp2/source/extensions/module_extensions.scp scp2/source/extensions/module_extensions.scp
 --- scp2/source/extensions/module_extensions.scp	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/extensions/module_extensions.scp	2008-03-23 12:54:42.000000000 +0100
-@@ -0,0 +1,61 @@
++++ scp2/source/extensions/module_extensions.scp	2008-03-29 07:50:23.000000000 +0100
+@@ -0,0 +1,76 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -178,11 +192,26 @@
 +    Styles = ( );
 +End
 +#endif
++
++/* ** SUN Report Builder ** */
++
++#ifndef DISABLE_REPORTDESIGN
++Module gid_Module_Optional_Extensions_REPORTDESIGN
++    PackageInfo = "packinfo_office.txt";
++    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN);
++    ParentID = gid_Module_Optional_Extensions;
++    Files = (
++        gid_File_Oxt_Sun_Report_Builder );
++    Minimal = NO;
++    Default = YES;
++    Styles = ( );
++End
++#endif
 +					
 diff -Naur scp2/source/extensions/module_extensions.ulf scp2/source/extensions/module_extensions.ulf
 --- scp2/source/extensions/module_extensions.ulf	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/extensions/module_extensions.ulf	2008-03-22 10:57:33.000000000 +0100
-@@ -0,0 +1,43 @@
++++ scp2/source/extensions/module_extensions.ulf	2008-03-29 07:50:27.000000000 +0100
+@@ -0,0 +1,53 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -224,6 +253,15 @@
 +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS]
 +en-US = "Useful %PRODUCTNAME extensions."
 +
++[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SDEXT]
++en-US = "SUN Presentation Minimizer"
++
 +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SDEXT]
 +en-US = "SUN Presentation Minimizer"
-
++
++[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
++en-US = "SUN Report Builder"
++
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
++en-US = "SUN Report Builder"
++

Modified: trunk/scratch/scp2/source/extensions/file_extensions.scp
==============================================================================
--- trunk/scratch/scp2/source/extensions/file_extensions.scp	(original)
+++ trunk/scratch/scp2/source/extensions/file_extensions.scp	Sat Mar 29 13:01:53 2008
@@ -48,4 +48,18 @@
     Name = "/minimizer/sun-presentation-minimizer.oxt";
 End
 
-#endif 
+#endif
+
+/* ** SUN Report Builder ** */
+
+#ifndef DISABLE_REPORTDESIGN
+
+File gid_File_Oxt_Sun_Report_Builder
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Extension_Install;
+    Name = "sun-report-builder.oxt";
+End
+
+#endif
+

Modified: trunk/scratch/scp2/source/extensions/module_extensions.scp
==============================================================================
--- trunk/scratch/scp2/source/extensions/module_extensions.scp	(original)
+++ trunk/scratch/scp2/source/extensions/module_extensions.scp	Sat Mar 29 13:01:53 2008
@@ -58,4 +58,19 @@
     Styles = ( );
 End
 #endif
+
+/* ** SUN Report Builder ** */
+
+#ifndef DISABLE_REPORTDESIGN
+Module gid_Module_Optional_Extensions_REPORTDESIGN
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Sun_Report_Builder );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
 					

Modified: trunk/scratch/scp2/source/extensions/module_extensions.ulf
==============================================================================
--- trunk/scratch/scp2/source/extensions/module_extensions.ulf	(original)
+++ trunk/scratch/scp2/source/extensions/module_extensions.ulf	Sat Mar 29 13:01:53 2008
@@ -39,5 +39,15 @@
 [STR_DESC_MODULE_OPTIONAL_EXTENSIONS]
 en-US = "Useful %PRODUCTNAME extensions."
 
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SDEXT]
+en-US = "SUN Presentation Minimizer"
+
 [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SDEXT]
 en-US = "SUN Presentation Minimizer"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
+en-US = "SUN Report Builder"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
+en-US = "SUN Report Builder"
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]