Ticket #5311: libreoffice.patch

xsoft/office/libreoffice.xml

@@ -269 +269 @@
 
     <para>
       Unpack the dictionaries file and create symlinks to tarballs from the
-      source directory so they won't get downloaded again (it is not necessary
-      to unpack the help nor the translations tarballs):
+      source directory so they won't get downloaded again:
     </para>
 
-<screen><userinput>install -dm755 src &amp;&amp;
+<screen><userinput>install -dm755 external/tarballs &amp;&amp;
 
-tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz --no-overwrite-dir --strip-components=1 &amp;&amp;
-<!-- Not necessary for this version
-tar -xf ../libreoffice-help-&libreoffice-dlversion;.tar.xz -\-no-overwrite-dir -\-strip-components=1 &amp;&amp;
--->
-ln -sv ../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz src/ &amp;&amp;
-ln -sv ../../libreoffice-help-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
+ln -sfv ../../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ &amp;&amp;
+ln -sfv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
 
-<!-- Not necessary for this version
     <para>
-      If you have downloaded the translations tarball, unpack it:
-    </para>
-
-<screen><userinput>tar -xf ../libreoffice-translations-&libreoffice-dlversion;.tar.xz -\-no-overwrite-dir -\-strip-components=1 &amp;&amp;
-ln -sv ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
--->
-    <para>
       If you have downloaded the translations tarball, create a symlink:
     </para>
 
-<screen><userinput>ln -sv ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
+<screen><userinput>ln -sfv ../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
 
     <note>
       <para>
@@ -337 +324 @@
 <screen><userinput>sed -e "/gzip -f/d"   \
     -e "s|.1.gz|.1|g" \
     -i bin/distro-install-desktop-integration        &amp;&amp;
-sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
+sed -e "/distro-install-file-lists/d"           \
+    -e "s:fetch_Download_item:&amp;_unchecked:" \
+    -e "/fetch_Download_item/s:,no-check::"     \
+    -i Makefile.in &amp;&amp;
 
 chmod -v +x bin/unpack-sources                     &amp;&amp;
 sed -e "s/target\.mk/langlist\.mk/"                \
@@ -436 +426 @@
 
     <para>
       <command>sed -e ...</command>: First sed prevents compression of the
-      manual pages, the second one prevents a script that causes install to
-      fail from running and the third one fixes the unpack script.
+      manual pages, second one prevents a script that causes install to fail
+      from running and fixes an issue when downloading external packages
+      and the third one fixes the unpack script.
     </para>
 
     <para>