ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-28 15:22:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: evolution-data-server: Update to 3.26.6.

Browse source 
* gnu/packages/gnome.scm (evolution-data-server): Update to 3.26.6.
[arguments]: Set RUNPATH in #:configure-flags to match new libdir structure.
Add phase 'dont-override-rpath' to make the build system respect it.
This commit is contained in:
Marius Bakke 2018-03-06 15:23:38 +01:00
parent 613ef763a5
commit ac033c7ba1
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gnu/packages/gnome.scm
View file

@ -4875,7 +4875,7 @@ (define-public gnome-online-accounts
(define-public evolution-data-server (define-public evolution-data-server
(package (package
(name "evolution-data-server") (name "evolution-data-server")
(version "3.24.3") (version "3.26.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -4883,27 +4883,44 @@ (define-public evolution-data-server
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1jj1q81bl3r0c8rnsfqi83igqlprzdcjim1fvygbyfy7b8gigqqk")))) "1v0hwlrlm23bz5dmamdavm771f4gs64fyq82argrc0nwgn2a2fp4"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(;; XXX FIXME: 11/85 tests are failing. '(;; XXX FIXME: 11/85 tests are failing.
#:tests? #f #:tests? #f
#:configure-flags #:configure-flags
(list "-DENABLE_UOA=OFF" ;disable Ubuntu Online Accounts support (let* ((lib (string-append (assoc-ref %outputs "out")
"-DENABLE_GOOGLE=OFF" ;disable Google Contacts support "/lib"))
"-DENABLE_GOOGLE_AUTH=OFF" ;disable Google authentication (runpaths (map (lambda (s) (string-append
"-DENABLE_VALA_BINDINGS=ON" lib "/evolution-data-server/" s))
;; FIXME: Building against ICU 60 requires C++11 or higher. Remove '("addressbook-backends" "calendar-backends"
;; this when our default compiler is >= GCC6. "camel-providers" "credential-modules"
"-DCMAKE_CXX_FLAGS=-std=gnu++11" "registry-modules"))))
"-DENABLE_INTROSPECTION=ON") ;required for Vala bindings (list "-DENABLE_UOA=OFF" ;disable Ubuntu Online Accounts support
"-DENABLE_GOOGLE=OFF" ;disable Google Contacts support
"-DENABLE_GOOGLE_AUTH=OFF" ;disable Google authentication
"-DENABLE_VALA_BINDINGS=ON"
;; FIXME: Building against ICU 60 requires C++11 or higher. Remove
;; this when our default compiler is >= GCC6.
"-DCMAKE_CXX_FLAGS=-std=gnu++11"
(string-append "-DCMAKE_INSTALL_RPATH=" lib ";"
(string-append lib "/evolution-data-server;")
(string-join runpaths ";"))
"-DENABLE_INTROSPECTION=ON")) ;required for Vala bindings
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-paths (add-after 'unpack 'patch-paths
(lambda _ (lambda _
(substitute* "tests/test-server-utils/e-test-server-utils.c" (substitute* "tests/test-server-utils/e-test-server-utils.c"
(("/bin/rm") (which "rm"))) (("/bin/rm") (which "rm")))
#t))))) #t))
(add-before 'configure 'dont-override-rpath
(lambda _
(substitute* "CMakeLists.txt"
;; CMakeLists.txt hard-codes runpath to just the libdir.
;; Remove it so the configure flag is respected.
(("SET\\(CMAKE_INSTALL_RPATH .*") ""))
#t)))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)