[ooo-build-commit] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                                                  |    2 +
 patches/dev300/scp2_extensions-gdocs_2.1.0_modified_installation.diff |   18 ++++++++++
 2 files changed, 20 insertions(+)

New commits:
commit 1ca5a65edc0a67c09fd3f48db9d257957ae44f1b
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Fri Sep 3 13:57:44 2010 +0200

    fix gdocs installation with non-root user
    
    * patches/dev300/scp2_extensions-gdocs_2.1.0_modified_installation.diff
    * patches/dev300/apply: gdocs_2.1.0_modified.oxt packs two files twice;
      installer want't to rewrite the files with the same file; it does not
      work if the unix rights are 444 => temporary used 644 until we update
      to a better gdocs*.oxt

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a4b23d1..c257853 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2533,6 +2533,8 @@ emf+-cppcanvas-input-validation.diff, thorsten
 scp2_build_extensions.diff
 scp2_makefile_extensions.diff
 scp2_extensions.diff
+# hack to install the problematic gdocs_2.1.0.oxt; can be removed with new gdocs version
+scp2_extensions-gdocs_2.1.0_modified_installation.diff, pmladek
 
 scp2_extensions_templates.diff
 extensions_configure.diff
diff --git a/patches/dev300/scp2_extensions-gdocs_2.1.0_modified_installation.diff b/patches/dev300/scp2_extensions-gdocs_2.1.0_modified_installation.diff
new file mode 100644
index 0000000..39396ae
--- /dev/null
+++ b/patches/dev300/scp2_extensions-gdocs_2.1.0_modified_installation.diff
@@ -0,0 +1,18 @@
+--- scp2/source/extensions/file_extensions.scp.old	2010-08-31 21:22:37.000000000 +0200
++++ scp2/source/extensions/file_extensions.scp	2010-09-03 12:08:09.000000000 +0200
+@@ -186,7 +186,14 @@ End
+ #ifdef WITH_EXTENSION_GOOGLE_DOCS
+ 
+ File gid_File_Oxt_Google_Docs
+-    TXT_FILE_BODY;
++/*  FIXME: gdocs_2.1.0_modified.oxt pack twice two files;
++    it breaks installation with non-root user rights because
++    the file can't be overwriten with unix rights 444
++    => temporary using USER_FILE_BODY instead of TXT_FILE_BODY
++    to set 644 user rights; can be removed if we update
++    gdocs_*_modified.oxt
++*/
++    USER_FILE_BODY;
+     Styles = (PACKED, ARCHIVE);
+     Dir = gid_Brand_Dir_Share_Extensions_Google_Docs;
+     Name = "gdocs.oxt";