[bug#28188] [PATCH] gnu: libreoffice: Fix icons, enable liblangtag.

[bug#28188] [PATCH] gnu: libreoffice: Fix icons, enable liblangtag.

[Thomas Danckaert]

[-- Attachment #1: Type: Text/Plain, Size: 442 bytes --]

Hi,

this patch fixes the names of the icons in the libreoffice desktop 
files, installs additional desktop files for “math” and the 
“startcenter”, and tunes the build configuration (enable liblangtag, 
enable parallel build -- seems to work fine on my machine).

It's a bit of everything, not sure if it should be split into 2 
commits (one for the desktop files & icons, one for the build 
options)?

cheers,

Thomas

[-- Attachment #2: 0001-gnu-libreoffice-Fix-icons-enable-liblangtag.patch --]
[-- Type: Text/X-Patch, Size: 4137 bytes --]

From d2384b4dbe8ac91226153f021039df0aa38bab27 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert@gmail.com>
Date: Tue, 22 Aug 2017 19:25:11 +0200
Subject: [PATCH] gnu: libreoffice: Fix icons, enable liblangtag.

* gnu/packages/libreoffice.scm (libreoffice) [inputs]: Add liblangtag.
  [arguments]: Correct icon names in .desktop files; copy desktop files &
  icons for libreoffice-math and libreoffice-startcenter; enable parallel
  build; enable liblangtag.
---
 gnu/packages/libreoffice.scm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 16a8d257d..cca222b1f 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -837,6 +837,7 @@ and to return information on pronunciations, meanings and synonyms.")
        ("libetonyek" ,libetonyek)
        ("libexttextcat" ,libexttextcat)
        ("libfreehand" ,libfreehand)
+       ("liblangtag" ,liblangtag)
        ("libmspub" ,libmspub)
        ("libmwaw" ,libmwaw)
        ("libodfgen" ,libodfgen)
@@ -919,15 +920,16 @@ and to return information on pronunciations, meanings and synonyms.")
                      (substitute* (string-append out src)
                        (("Exec=libreoffice[0-9]+\\.[0-9]+ ")
                         (string-append "Exec=" out "/bin/libreoffice "))
-                       (("Icon=libreoffice[0-9]+\\.[0-9]+")
-                        "Icon=libreoffice")
+                       (("Icon=libreoffice.*")
+                        (string-append "Icon=" app "\n"))
                        (("LibreOffice [0-9]+\\.[0-9]+")
                         "LibreOffice"))
-                     (symlink-output src dst)
-                     (install-file (string-append
+                     (symlink-output src dst)))
+                 (define (install-appdata app)
+                   (install-file (string-append
                                     "sysui/desktop/appstream-appdata/"
                                     "libreoffice-" app ".appdata.xml")
-                                   (string-append out "/share/appdata"))))
+                                   (string-append out "/share/appdata")))
                  (symlink-output "/lib/libreoffice/program/soffice"
                                  "/bin/soffice")
                  (symlink-output "/lib/libreoffice/program/soffice"
@@ -940,16 +942,18 @@ and to return information on pronunciations, meanings and synonyms.")
                   "workdir/CustomTarget/sysui/share/libreoffice/openoffice.org.xml"
                   "/share/mime/packages/libreoffice.xml")
                  (for-each install-desktop-file
+                           '("base" "calc" "draw" "impress" "writer"
+                             "math" "startcenter"))
+                 (for-each install-appdata
                            '("base" "calc" "draw" "impress" "writer"))
-                 (mkdir-p (string-append out "/share/icons"))
+                 (mkdir-p (string-append out "/share/icons/hicolor"))
                  (copy-recursively "sysui/desktop/icons/hicolor"
-                                   (string-append out "/share/icons/")))
+                                   (string-append out "/share/icons/hicolor")))
                #t)))
        #:configure-flags
         (list
           "--enable-release-build"
           "--enable-verbose"
-          "--without-parallelism" ; otherwise the build fails
           "--disable-fetch-external" ; disable downloads
           "--with-system-libs" ; enable all --with-system-* flags
           (string-append "--with-boost-libdir="
@@ -969,8 +973,7 @@ and to return information on pronunciations, meanings and synonyms.")
           "--disable-firebird-sdbc" ; embedded firebird
           "--disable-gltf"
           "--without-doxygen"
-          "--disable-gtk3"
-          "--disable-liblangtag")))
+          "--disable-gtk3")))
     (home-page "https://www.libreoffice.org/")
     (synopsis "Office suite")
     (description "LibreOffice is a comprehensive office suite.  It contains
-- 
2.14.1

[bug#28188] [PATCH] gnu: libreoffice: Fix icons, enable liblangtag.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 563 bytes --]

Thomas Danckaert <post@thomasdanckaert.be> writes:

> Hi,
>
> this patch fixes the names of the icons in the libreoffice desktop 
> files, installs additional desktop files for “math” and the 
> “startcenter”, and tunes the build configuration (enable liblangtag, 
> enable parallel build -- seems to work fine on my machine).
>
> It's a bit of everything, not sure if it should be split into 2 
> commits (one for the desktop files & icons, one for the build 
> options)?

The patch looks good to me.  Thanks for looking after LibreOffice!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#28188: [PATCH] gnu: libreoffice: Fix icons, enable liblangtag.

[Thomas Danckaert]

From: Marius Bakke <mbakke@fastmail.com>
Subject: Re: [bug#28188] [PATCH] gnu: libreoffice: Fix icons, enable 
liblangtag.
Date: Tue, 22 Aug 2017 22:52:55 +0200

> The patch looks good to me.  Thanks for looking after LibreOffice!

Thanks for taking a look!

pushed, closing, etc...

Thomas