gnu: libreoffice: Remove input labels.
* gnu/packages/libreoffice.scm (dtoa): New private variable. (libreoffice)[native-inputs, inputs]: Remove labels. [arguments]: Use G-expression and SEARCH-INPUT-FILE & co where appropriate. Remove trailing #t's.
This commit is contained in:
Marius Bakke
parent
8bdc95ecae
commit
a66b9063d1
1 changed files with 184 additions and 183 deletions
|
|
@ -1044,6 +1044,13 @@ and to return information on pronunciations, meanings and synonyms.")
|
|||
converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
|
||||
(license license:mpl2.0)))
|
||||
|
||||
(define dtoa
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz")
|
||||
(sha256
|
||||
(base32 "1d0iwy0q5sjznv23d3nbwmy0r7m1mdzlnv5pc4izddkx9xld10h0"))))
|
||||
|
||||
;; When updating libreoffice, also make sure to update the
|
||||
;; hunspell dictionaries! They use the libreoffice version.
|
||||
(define-public libreoffice
|
||||
|
|
@ -1061,106 +1068,99 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
|
|||
(base32 "14g9873x8m5yakpq7v9f7lhc5fkxh6yhjhgh0pm30cqmxsqhsglv"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(native-inputs
|
||||
`(("bison" ,bison)
|
||||
("cppunit" ,cppunit)
|
||||
("flex" ,flex)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-wrapper)
|
||||
("which" ,which)
|
||||
("ziptime" ,ziptime)))
|
||||
(list bison
|
||||
cppunit
|
||||
flex
|
||||
pkg-config
|
||||
python-wrapper
|
||||
which
|
||||
ziptime))
|
||||
(inputs
|
||||
`(("bluez" ,bluez)
|
||||
("boost" ,boost)
|
||||
("box2d" ,box2d)
|
||||
("clucene" ,clucene)
|
||||
("cups" ,cups)
|
||||
("dbus-glib" ,dbus-glib)
|
||||
("firebird" ,firebird)
|
||||
("fontconfig" ,fontconfig)
|
||||
("fontforge" ,fontforge)
|
||||
("gconf" ,gconf)
|
||||
("glew" ,glew)
|
||||
("glm" ,glm)
|
||||
("gnupg" ,gnupg)
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("gperf" ,gperf)
|
||||
("gpgme" ,gpgme)
|
||||
("graphite2" ,graphite2)
|
||||
("gst-plugins-base" ,gst-plugins-base)
|
||||
("gtk+" ,gtk+)
|
||||
("harfbuzz" ,harfbuzz)
|
||||
("hunspell" ,hunspell)
|
||||
("hyphen" ,hyphen)
|
||||
("libabw" ,libabw)
|
||||
("libcdr" ,libcdr)
|
||||
("libcmis" ,libcmis)
|
||||
("libcuckoo" ,libcuckoo)
|
||||
("libjpeg-turbo" ,libjpeg-turbo)
|
||||
("libe-book" ,libe-book)
|
||||
("libepubgen" ,libepubgen)
|
||||
("libetonyek" ,libetonyek)
|
||||
("libexttextcat" ,libexttextcat)
|
||||
("libfreehand" ,libfreehand)
|
||||
("liblangtag" ,liblangtag)
|
||||
(list bluez
|
||||
boost
|
||||
box2d
|
||||
clucene
|
||||
cups
|
||||
dbus-glib
|
||||
firebird
|
||||
fontconfig
|
||||
fontforge
|
||||
gconf
|
||||
glew
|
||||
glm
|
||||
gnupg
|
||||
gobject-introspection
|
||||
gperf
|
||||
gpgme
|
||||
graphite2
|
||||
gst-plugins-base
|
||||
gtk+
|
||||
harfbuzz
|
||||
hunspell
|
||||
hyphen
|
||||
libabw
|
||||
libcdr
|
||||
libcmis
|
||||
libcuckoo
|
||||
libjpeg-turbo
|
||||
libe-book
|
||||
libepubgen
|
||||
libetonyek
|
||||
libexttextcat
|
||||
libfreehand
|
||||
liblangtag
|
||||
;; XXX: Perhaps this should be propagated from xmlsec.
|
||||
("libltdl" ,libltdl)
|
||||
("libmspub" ,libmspub)
|
||||
("libmwaw" ,libmwaw)
|
||||
("libnumbertext" ,libnumbertext)
|
||||
("libodfgen" ,libodfgen)
|
||||
("libpagemaker" ,libpagemaker)
|
||||
("libqxp" ,libqxp)
|
||||
("libstaroffice" ,libstaroffice)
|
||||
("libvisio" ,libvisio)
|
||||
("libwpg" ,libwpg)
|
||||
("libwps" ,libwps)
|
||||
("libxrandr" ,libxrandr)
|
||||
("libxrender" ,libxrender)
|
||||
("libxslt" ,libxslt)
|
||||
("libxt" ,libxt)
|
||||
("libzmf" ,libzmf)
|
||||
("lpsolve" ,lpsolve)
|
||||
("mariadb" ,mariadb "dev")
|
||||
("mdds" ,mdds)
|
||||
("mythes" ,mythes)
|
||||
("neon" ,neon)
|
||||
("nspr" ,nspr)
|
||||
("nss" ,nss)
|
||||
("openldap" ,openldap)
|
||||
("openssl" ,openssl)
|
||||
("orcus" ,orcus)
|
||||
("perl" ,perl)
|
||||
("perl-archive-zip" ,perl-archive-zip)
|
||||
("poppler" ,poppler)
|
||||
("postgresql" ,postgresql)
|
||||
("python" ,python)
|
||||
("python-lxml" ,python-lxml)
|
||||
("qrcodegen-cpp" ,qrcodegen-cpp)
|
||||
("redland" ,redland)
|
||||
("sane-backends" ,sane-backends)
|
||||
("unixodbc" ,unixodbc)
|
||||
("unzip" ,unzip)
|
||||
("vigra" ,vigra)
|
||||
("xdg-utils" ,xdg-utils)
|
||||
("xmlsec" ,xmlsec-nss)
|
||||
("zip" ,zip)
|
||||
("zxing-cpp" ,zxing-cpp)
|
||||
("dtoa" ; needed after version 6.4.7.2.
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz")
|
||||
(sha256
|
||||
(base32 "1d0iwy0q5sjznv23d3nbwmy0r7m1mdzlnv5pc4izddkx9xld10h0"))))))
|
||||
libltdl
|
||||
libmspub
|
||||
libmwaw
|
||||
libnumbertext
|
||||
libodfgen
|
||||
libpagemaker
|
||||
libqxp
|
||||
libstaroffice
|
||||
libvisio
|
||||
libwpg
|
||||
libwps
|
||||
libxrandr
|
||||
libxrender
|
||||
libxslt
|
||||
libxt
|
||||
libzmf
|
||||
lpsolve
|
||||
`(,mariadb "dev")
|
||||
mdds
|
||||
mythes
|
||||
neon
|
||||
nspr
|
||||
nss
|
||||
openldap
|
||||
openssl
|
||||
orcus
|
||||
perl
|
||||
perl-archive-zip
|
||||
poppler
|
||||
postgresql
|
||||
python
|
||||
python-lxml
|
||||
qrcodegen-cpp
|
||||
redland
|
||||
sane-backends
|
||||
unixodbc
|
||||
unzip
|
||||
vigra
|
||||
xdg-utils
|
||||
xmlsec-nss
|
||||
zip
|
||||
zxing-cpp))
|
||||
(arguments
|
||||
`(#:tests? #f ; Building the tests already fails.
|
||||
(list
|
||||
#:tests? #f ; Building the tests already fails.
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'insert-external-tarballs
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(lambda _
|
||||
(mkdir-p "external/tarballs")
|
||||
(copy-file (assoc-ref inputs "dtoa")
|
||||
"external/tarballs/dtoa-20180411.tgz")
|
||||
#t))
|
||||
(copy-file #$dtoa "external/tarballs/dtoa-20180411.tgz")))
|
||||
(add-before 'configure 'prepare-src
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute*
|
||||
|
|
@ -1173,16 +1173,17 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
|
|||
;; but not for optional tools like ‘gdb’ and ‘valgrind’.
|
||||
(for-each (lambda (command)
|
||||
(substitute* "desktop/scripts/soffice.sh"
|
||||
(((format #f"~a " command))
|
||||
(((format #f "~a " command))
|
||||
(format #f "~a " (which command)))))
|
||||
(list "dirname" "grep" "uname"))
|
||||
|
||||
;; GPGME++ headers are installed in a gpgme++ subdirectory, but
|
||||
;; configure is hardcoded to use FHS directories.
|
||||
(substitute* "configure"
|
||||
(("GPGMEPP_CFLAGS=-I/usr")
|
||||
(("GPGMEPP_CFLAGS=-I/usr/include/gpgme\\+\\+")
|
||||
(string-append "GPGMEPP_CFLAGS=-I"
|
||||
(assoc-ref inputs "gpgme"))))
|
||||
(search-input-directory inputs
|
||||
"include/gpgme++"))))
|
||||
|
||||
;; /usr/bin/xdg-open doesn't exist on Guix System.
|
||||
(substitute* '("shell/source/unix/exec/shellexec.cxx"
|
||||
|
|
@ -1190,17 +1191,16 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
|
|||
(("/usr/bin/xdg-open")
|
||||
(search-input-file inputs "/bin/xdg-open")))))
|
||||
(add-after 'install 'reset-zip-timestamps
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(lambda _
|
||||
(for-each (lambda (file)
|
||||
(invoke "ziptime" file))
|
||||
;; So many different extensions for .zip files.
|
||||
(find-files out "\\.(bau|dat|otp|ott|zip)$")))))
|
||||
(find-files #$output "\\.(bau|dat|otp|ott|zip)$"))))
|
||||
(add-after 'install 'bin-and-desktop-install
|
||||
;; Create 'soffice' and 'libreoffice' symlinks to the executable
|
||||
;; script.
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(lambda _
|
||||
(let ((out #$output))
|
||||
(define (symlink-output src dst)
|
||||
(mkdir-p (dirname (string-append out dst)))
|
||||
(symlink (string-append out src) (string-append out dst)))
|
||||
|
|
@ -1240,10 +1240,9 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
|
|||
'("base" "calc" "draw" "impress" "writer"))
|
||||
(mkdir-p (string-append out "/share/icons/hicolor"))
|
||||
(copy-recursively "sysui/desktop/icons/hicolor"
|
||||
(string-append out "/share/icons/hicolor")))
|
||||
#t)))
|
||||
(string-append out "/share/icons/hicolor"))))))
|
||||
#:configure-flags
|
||||
(list
|
||||
#~(list
|
||||
"--enable-release-build"
|
||||
"--with-vendor=GNU Guix"
|
||||
;; Avoid using all cpu cores by default
|
||||
|
|
@ -1251,7 +1250,9 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
|
|||
"--disable-fetch-external" ; disable downloads
|
||||
"--with-system-libs" ; enable all --with-system-* flags
|
||||
(string-append "--with-boost-libdir="
|
||||
(assoc-ref %build-inputs "boost") "/lib")
|
||||
(dirname
|
||||
(search-input-file %build-inputs
|
||||
"lib/libboost_system.so")))
|
||||
;; Avoid undefined symbols required by boost::spirit
|
||||
"LDFLAGS=-lboost_system"
|
||||
;; Avoid a dependency on ucpp.
|
||||
|
|
|
|||
Reference in a new issue