me/guix
Archived
1
0
Fork 0
Code Activity

gnu: libreoffice: Remove input labels.

Browse source 
* 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 2022-08-10 22:54:31 +02:00
parent 8bdc95ecae
commit a66b9063d1
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 184 additions and 183 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

213
gnu/packages/libreoffice.scm
View file

@ -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.") converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(license license:mpl2.0))) (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 ;; When updating libreoffice, also make sure to update the
;; hunspell dictionaries! They use the libreoffice version. ;; hunspell dictionaries! They use the libreoffice version.
(define-public libreoffice (define-public libreoffice
@ -1061,106 +1068,99 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(base32 "14g9873x8m5yakpq7v9f7lhc5fkxh6yhjhgh0pm30cqmxsqhsglv")))) (base32 "14g9873x8m5yakpq7v9f7lhc5fkxh6yhjhgh0pm30cqmxsqhsglv"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("bison" ,bison) (list bison
("cppunit" ,cppunit) cppunit
("flex" ,flex) flex
("pkg-config" ,pkg-config) pkg-config
("python" ,python-wrapper) python-wrapper
("which" ,which) which
("ziptime" ,ziptime))) ziptime))
(inputs (inputs
`(("bluez" ,bluez) (list bluez
("boost" ,boost) boost
("box2d" ,box2d) box2d
("clucene" ,clucene) clucene
("cups" ,cups) cups
("dbus-glib" ,dbus-glib) dbus-glib
("firebird" ,firebird) firebird
("fontconfig" ,fontconfig) fontconfig
("fontforge" ,fontforge) fontforge
("gconf" ,gconf) gconf
("glew" ,glew) glew
("glm" ,glm) glm
("gnupg" ,gnupg) gnupg
("gobject-introspection" ,gobject-introspection) gobject-introspection
("gperf" ,gperf) gperf
("gpgme" ,gpgme) gpgme
("graphite2" ,graphite2) graphite2
("gst-plugins-base" ,gst-plugins-base) gst-plugins-base
("gtk+" ,gtk+) gtk+
("harfbuzz" ,harfbuzz) harfbuzz
("hunspell" ,hunspell) hunspell
("hyphen" ,hyphen) hyphen
("libabw" ,libabw) libabw
("libcdr" ,libcdr) libcdr
("libcmis" ,libcmis) libcmis
("libcuckoo" ,libcuckoo) libcuckoo
("libjpeg-turbo" ,libjpeg-turbo) libjpeg-turbo
("libe-book" ,libe-book) libe-book
("libepubgen" ,libepubgen) libepubgen
("libetonyek" ,libetonyek) libetonyek
("libexttextcat" ,libexttextcat) libexttextcat
("libfreehand" ,libfreehand) libfreehand
("liblangtag" ,liblangtag) liblangtag
;; XXX: Perhaps this should be propagated from xmlsec. ;; XXX: Perhaps this should be propagated from xmlsec.
("libltdl" ,libltdl) libltdl
("libmspub" ,libmspub) libmspub
("libmwaw" ,libmwaw) libmwaw
("libnumbertext" ,libnumbertext) libnumbertext
("libodfgen" ,libodfgen) libodfgen
("libpagemaker" ,libpagemaker) libpagemaker
("libqxp" ,libqxp) libqxp
("libstaroffice" ,libstaroffice) libstaroffice
("libvisio" ,libvisio) libvisio
("libwpg" ,libwpg) libwpg
("libwps" ,libwps) libwps
("libxrandr" ,libxrandr) libxrandr
("libxrender" ,libxrender) libxrender
("libxslt" ,libxslt) libxslt
("libxt" ,libxt) libxt
("libzmf" ,libzmf) libzmf
("lpsolve" ,lpsolve) lpsolve
("mariadb" ,mariadb "dev") `(,mariadb "dev")
("mdds" ,mdds) mdds
("mythes" ,mythes) mythes
("neon" ,neon) neon
("nspr" ,nspr) nspr
("nss" ,nss) nss
("openldap" ,openldap) openldap
("openssl" ,openssl) openssl
("orcus" ,orcus) orcus
("perl" ,perl) perl
("perl-archive-zip" ,perl-archive-zip) perl-archive-zip
("poppler" ,poppler) poppler
("postgresql" ,postgresql) postgresql
("python" ,python) python
("python-lxml" ,python-lxml) python-lxml
("qrcodegen-cpp" ,qrcodegen-cpp) qrcodegen-cpp
("redland" ,redland) redland
("sane-backends" ,sane-backends) sane-backends
("unixodbc" ,unixodbc) unixodbc
("unzip" ,unzip) unzip
("vigra" ,vigra) vigra
("xdg-utils" ,xdg-utils) xdg-utils
("xmlsec" ,xmlsec-nss) xmlsec-nss
("zip" ,zip) zip
("zxing-cpp" ,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"))))))
(arguments (arguments
`(#:tests? #f ; Building the tests already fails. (list
#:tests? #f ; Building the tests already fails.
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'insert-external-tarballs (add-after 'unpack 'insert-external-tarballs
(lambda* (#:key inputs #:allow-other-keys) (lambda _
(mkdir-p "external/tarballs") (mkdir-p "external/tarballs")
(copy-file (assoc-ref inputs "dtoa") (copy-file #$dtoa "external/tarballs/dtoa-20180411.tgz")))
"external/tarballs/dtoa-20180411.tgz")
#t))
(add-before 'configure 'prepare-src (add-before 'configure 'prepare-src
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* (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’. ;; but not for optional tools like ‘gdb’ and ‘valgrind’.
(for-each (lambda (command) (for-each (lambda (command)
(substitute* "desktop/scripts/soffice.sh" (substitute* "desktop/scripts/soffice.sh"
(((format #f"~a " command)) (((format #f "~a " command))
(format #f "~a " (which command))))) (format #f "~a " (which command)))))
(list "dirname" "grep" "uname")) (list "dirname" "grep" "uname"))
;; GPGME++ headers are installed in a gpgme++ subdirectory, but ;; GPGME++ headers are installed in a gpgme++ subdirectory, but
;; configure is hardcoded to use FHS directories. ;; configure is hardcoded to use FHS directories.
(substitute* "configure" (substitute* "configure"
(("GPGMEPP_CFLAGS=-I/usr") (("GPGMEPP_CFLAGS=-I/usr/include/gpgme\\+\\+")
(string-append "GPGMEPP_CFLAGS=-I" (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. ;; /usr/bin/xdg-open doesn't exist on Guix System.
(substitute* '("shell/source/unix/exec/shellexec.cxx" (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") (("/usr/bin/xdg-open")
(search-input-file inputs "/bin/xdg-open"))))) (search-input-file inputs "/bin/xdg-open")))))
(add-after 'install 'reset-zip-timestamps (add-after 'install 'reset-zip-timestamps
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let ((out (assoc-ref outputs "out")))
(for-each (lambda (file) (for-each (lambda (file)
(invoke "ziptime" file)) (invoke "ziptime" file))
;; So many different extensions for .zip files. ;; 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 (add-after 'install 'bin-and-desktop-install
;; Create 'soffice' and 'libreoffice' symlinks to the executable ;; Create 'soffice' and 'libreoffice' symlinks to the executable
;; script. ;; script.
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let ((out (assoc-ref outputs "out"))) (let ((out #$output))
(define (symlink-output src dst) (define (symlink-output src dst)
(mkdir-p (dirname (string-append out dst))) (mkdir-p (dirname (string-append out dst)))
(symlink (string-append out src) (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")) '("base" "calc" "draw" "impress" "writer"))
(mkdir-p (string-append out "/share/icons/hicolor")) (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/hicolor"))) (string-append out "/share/icons/hicolor"))))))
#t)))
#:configure-flags #:configure-flags
(list #~(list
"--enable-release-build" "--enable-release-build"
"--with-vendor=GNU Guix" "--with-vendor=GNU Guix"
;; Avoid using all cpu cores by default ;; 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 "--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="
(assoc-ref %build-inputs "boost") "/lib") (dirname
(search-input-file %build-inputs
"lib/libboost_system.so")))
;; Avoid undefined symbols required by boost::spirit ;; Avoid undefined symbols required by boost::spirit
"LDFLAGS=-lboost_system" "LDFLAGS=-lboost_system"
;; Avoid a dependency on ucpp. ;; Avoid a dependency on ucpp.