ooo-build r15295 - in trunk: . bin bin/piece desktop patches patches/vba

[pmladek svn gnome org]

Author: pmladek
Date: Thu Feb  5 19:09:50 2009
New Revision: 15295
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15295&view=rev

Log:
2009-02-05  Petr Mladek  <pmladek suse cz>

	* desktop/openoffice.xml: add OOXML MIME types
	* piece/file-list-postprocess: install openoffice.xml (bnc#439804)

	* patches/vba/basic-caller-support.diff: put --- and +++ lines
	  next to each other

	* patches/apply.pl.in, bin/sloppypatch.pl: more small fixes to
	  process patches also in other pieces



Modified:
   trunk/ChangeLog
   trunk/bin/piece/file-list-postprocess
   trunk/bin/sloppypatch.pl
   trunk/desktop/openoffice.xml
   trunk/patches/apply.pl.in
   trunk/patches/vba/basic-caller-support.diff

Modified: trunk/bin/piece/file-list-postprocess
==============================================================================
--- trunk/bin/piece/file-list-postprocess	(original)
+++ trunk/bin/piece/file-list-postprocess	Thu Feb  5 19:09:50 2009
@@ -13,6 +13,15 @@
 $OO_TOOLSDIR/piece/desktop-support-app "$piece" "$ooo_build_tag" "fromtemplate"
 $OO_TOOLSDIR/piece/desktop-support-app "$piece" "$ooo_build_tag" "ooffice"
 
+# extra shared MIME info
+mkdir -p $DESTDIR/usr/share/mime/packages
+cp $OO_TOOLSDIR/../desktop/openoffice.xml $DESTDIR/usr/share/mime/packages
+echo /usr/share/mime/packages/openoffice.xml >>files-$piece.txt
+if test "z$RUN_POST_INSTALL_SCRIPTS" = "zyes" && 
+    which update-mime-database >/dev/null 2>&1 ; then
+    update-mime-database /usr/share/mime || :
+fi
+
 # create bash completion
 mkdir -p $DESTDIR/etc/bash_completion.d
 $OO_TOOLSDIR/generate-bash-completion --binsuffix="$BINSUFFIX" $OO_TOOLSDIR/bash-completion.in $DESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh || exit 1;

Modified: trunk/bin/sloppypatch.pl
==============================================================================
--- trunk/bin/sloppypatch.pl	(original)
+++ trunk/bin/sloppypatch.pl	Thu Feb  5 19:09:50 2009
@@ -56,15 +56,19 @@
     # copied context patches:
     # 	first line:  *** path
     #	second line: --- path
+    # IMPORTANT: we need extra reqular expression for --- and *** to do not match lines like -**
     if  ( ( ! defined $firstline ) &&
-          ( $line =~ m/^[\*-][\*-][\*-] [ \t]*([^\s]+)/ ) ) {
+          ( ( $line =~ m/^\*\*\* [ \t]*([^\s]+)/ ) ||
+	    ( $line =~ m/^--- [ \t]*([^\s]+)/ ) ) ) {
 	# found first line that defines the path of the patched file
 	($firstline_topdir, $firstline_subpath) = analyze_path("$1");
-	$firstline = $line if (defined $firstline_topdir);
+	$firstline = $line;
 	next;
     }
 
-    if ( $line =~ m/^[\+-][\+-][\+-] [ \t]*([^\s]+)/ ) {
+    # there are diffs with just the +++ line => the first line is missing in this cases
+    if ( ( ( defined $firstline ) && ( $line =~ m/^--- [ \t]*([^\s]+)/ ) ) ||
+         ( $line =~ m/^\+\+\+ [ \t]*([^\s]+)/ ) ) {
 	# found second line that defines the path of the patched file
 	($topdir, $subpath) = analyze_path("$1");
 
@@ -107,7 +111,7 @@
 my $result = 0;
 if ($sections > 0) {
 # patch complains a lot with empty input
-#    print "calling: patch @ARGV < $tmpfile\n";
+#   print "calling: patch @ARGV < $tmpfile\n";
     if (system ("patch @ARGV < $tmpfile")) {
 	 print STDERR "\nError: failed to apply patch @ARGV: $!\n\n";
     }

Modified: trunk/desktop/openoffice.xml
==============================================================================
--- trunk/desktop/openoffice.xml	(original)
+++ trunk/desktop/openoffice.xml	Thu Feb  5 19:09:50 2009
@@ -162,4 +162,49 @@
     <comment>OpenOffice.org extension</comment>
     <glob pattern="*.oxt" />
   </mime-type>
+  <mime-type type="application/vnd.ms-word.document.macroEnabled.12">
+    <glob pattern="*.docm" />
+  </mime-type>
+  <mime-type type="application/vnd.openxmlformats-officedocument.wordprocessingml.document">
+    <glob pattern="*.docx" />
+  </mime-type>
+  <mime-type type="application/vnd.ms-word.template.macroEnabled.12">
+    <glob pattern="*.dotm" />
+  </mime-type>
+  <mime-type type="application/vnd.openxmlformats-officedocument.wordprocessingml.template">
+    <glob pattern="*.dotx" />
+  </mime-type>
+  <mime-type type="application/vnd.ms-powerpoint.slideshow.macroEnabled.12">
+    <glob pattern="*.ppsm" />
+  </mime-type>
+  <mime-type type="application/vnd.openxmlformats-officedocument.presentationml.slideshow">
+    <glob pattern="*.ppsx" />
+  </mime-type>
+  <mime-type type="application/vnd.ms-powerpoint.presentation.macroEnabled.12">
+    <glob pattern="*.pptm" />
+  </mime-type>
+  <mime-type type="application/vnd.openxmlformats-officedocument.presentationml.presentation">
+    <glob pattern="*.pptx" />
+  </mime-type>
+  <mime-type type="application/vnd.ms-powerpoint.template.macroEnabled.12">
+    <glob pattern="*.potm" />
+  </mime-type>
+  <mime-type type="application/vnd.openxmlformats-officedocument.presentationml.template">
+    <glob pattern="*.potx" />
+  </mime-type>
+  <mime-type type="application/vnd.ms-excel.sheet.binary.macroEnabled.12">
+    <glob pattern="*.xlsb" />
+  </mime-type>
+  <mime-type type="application/vnd.ms-excel.sheet.macroEnabled.12">
+    <glob pattern="*.xlsm" />
+  </mime-type>
+  <mime-type type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
+    <glob pattern="*.xlsx" />
+  </mime-type>
+  <mime-type type="application/vnd.ms-excel.template.macroEnabled.12">
+    <glob pattern="*.xltm" />
+  </mime-type>
+  <mime-type type="application/vnd.openxmlformats-officedocument.spreadsheetml.template">
+    <glob pattern="*.xltx" />
+  </mime-type>
 </mime-info>

Modified: trunk/patches/apply.pl.in
==============================================================================
--- trunk/patches/apply.pl.in	(original)
+++ trunk/patches/apply.pl.in	Thu Feb  5 19:09:50 2009
@@ -48,6 +48,7 @@
 #	print "\tpatched file '$pf'\n";
 	next if ($pf =~ m/^\//);	# skip absolute paths; they might come from the unused +++ or --- line
 	next if ($pf =~ m/^\.\./);	# skip paths starting with ../; they comes from the unused +++ or --- line
+	next if ($pf =~ m/^\d+,\d+$/);	# skip paths that look like "number,number", e.g 74,7; they comes from the hunk definition from the patches with "copied context"
 	$pf =~ m/^([^\/]+)\// || die "malformed path $pf";
 	my $topdir = "$dest_dir/$1";
 #	print "\tcheck directory $topdir\n";

Modified: trunk/patches/vba/basic-caller-support.diff
==============================================================================
--- trunk/patches/vba/basic-caller-support.diff	(original)
+++ trunk/patches/vba/basic-caller-support.diff	Thu Feb  5 19:09:50 2009
@@ -261,7 +261,6 @@
      /** adjusts the internal macro mode, according to the current security settings
 --- /data4/Latest/ooo-build/build/ooh680-m1/sfx2/source/doc/objmisc.cxx	2008-01-08 09:36:27.000000000 +0000
 +++ sfx2/source/doc/objmisc.cxx	2008-01-10 15:12:14.000000000 +0000
---- /data4/Latest/ooo-build/build/ooh680-m1/sc/source/ui/drawfunc/fusel.cxx	2008-01-08 09:36:20.000000000 +0000
 @@ -1515,7 +1515,7 @@ namespace
  }
  
@@ -301,6 +300,7 @@
  }
  
  //-------------------------------------------------------------------------
+--- /data4/Latest/ooo-build/build/ooh680-m1/sc/source/ui/drawfunc/fusel.cxx	2008-01-08 09:36:20.000000000 +0000
 +++ sc/source/ui/drawfunc/fusel.cxx	2008-01-10 15:25:12.000000000 +0000
 @@ -221,13 +221,23 @@ BOOL __EXPORT FuSelection::MouseButtonDo
                         SfxObjectShell* pObjSh = SfxObjectShell::Current();