ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 22:50:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libreoffice: Fix icons, enable liblangtag.

Browse source 
* 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.
This commit is contained in:
Thomas Danckaert 2017-08-22 19:25:11 +02:00
parent 5cdb0cd380
commit 17e56dac12
No known key found for this signature in database
GPG key ID: 5C3B064C724A5726
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/libreoffice.scm
View file

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