me/guix
Archived
1
0
Fork 0
Code Activity

gnu: evolution-data-server: Update to 3.44.4 and remove input labels.

Browse source 
* gnu/packages/gnome.scm (evolution-data-server): Update to 3.44.4.
[arguments]: Use gexps.
[native-inputs, propagated-inputs, inputs]: Delete input labels.
This commit is contained in:
Maxim Cournoyer 2022-08-22 23:35:56 -04:00
parent e631e122e3
commit 6852a791b6
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 65 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
gnu/packages/gnome.scm
View file

@ -7770,7 +7770,7 @@ Microsoft Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
(define-public evolution-data-server (define-public evolution-data-server
(package (package
(name "evolution-data-server") (name "evolution-data-server")
(version "3.42.1") (version "3.44.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -7778,75 +7778,76 @@ Microsoft Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
(version-major+minor version) "/" (version-major+minor version) "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0a7my8spwcaf2i2fz8ndddi1drv6l9gxq0qblmnkxzyhfwm7zrp6")))) (base32 "1sxjrjr31wqbp9g4pf6dwj8rc4mi7c5fbfd489ha92ym7246bin0"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags (list
(let* ((lib (string-append (assoc-ref %outputs "out") "/lib")) #:configure-flags
(runpaths (map (lambda (s) #~(let* ((lib (string-append #$output "/lib"))
(string-append lib "/evolution-data-server/" s)) (runpaths (map (lambda (s)
'("addressbook-backends" "calendar-backends" (string-append lib "/evolution-data-server/" s))
"camel-providers" "credential-modules" '("addressbook-backends" "calendar-backends"
"registry-modules")))) "camel-providers" "credential-modules"
(list "-DENABLE_GOOGLE=OFF" ;disable Google Contacts support "registry-modules"))))
"-DENABLE_VALA_BINDINGS=ON" (list "-DENABLE_GOOGLE=OFF" ;disable Google Contacts support
(string-append "-DCMAKE_INSTALL_RPATH=" lib ";" "-DENABLE_VALA_BINDINGS=ON"
(string-append lib "/evolution-data-server;") (string-append "-DCMAKE_INSTALL_RPATH=" lib ";"
(string-join runpaths ";")) (string-append lib "/evolution-data-server;")
"-DENABLE_INTROSPECTION=ON" ;required for Vala bindings (string-join runpaths ";"))
"-DWITH_PHONENUMBER=ON")) "-DENABLE_INTROSPECTION=ON" ;required for Vala bindings
#:phases "-DWITH_PHONENUMBER=ON"))
(modify-phases %standard-phases #:phases
(add-after 'unpack 'disable-failing-tests #~(modify-phases %standard-phases
(lambda _ (add-after 'unpack 'disable-failing-tests
;; tests/book-migration/test-migration.c:160:test_fetch_contacts: (lambda _
;; assertion failed (g_slist_length (contacts) == 20): (0 == 20) ;; tests/book-migration/test-migration.c:160:test_fetch_contacts:
(delete-file-recursively "tests/book-migration") ;; assertion failed (g_slist_length (contacts) == 20): (0 == 20)
(substitute* "tests/CMakeLists.txt" (delete-file-recursively "tests/book-migration")
(("add_subdirectory\\(book-migration\\)") "")))) (substitute* "tests/CMakeLists.txt"
(add-after 'unpack 'patch-paths (("add_subdirectory\\(book-migration\\)") ""))))
(lambda _ (add-after 'unpack 'patch-paths
(substitute* '("tests/test-server-utils/e-test-server-utils.c" (lambda _
"tests/libedata-book/data-test-utils.c" (substitute* '("tests/test-server-utils/e-test-server-utils.c"
"tests/libedata-book/test-book-cache-utils.c" "tests/libedata-book/data-test-utils.c"
"tests/libedata-cal/test-cal-cache-utils.c") "tests/libedata-book/test-book-cache-utils.c"
(("/bin/rm") (which "rm"))))) "tests/libedata-cal/test-cal-cache-utils.c")
(add-before 'configure 'dont-override-rpath (("/bin/rm") (which "rm")))))
(lambda _ (add-before 'configure 'dont-override-rpath
(substitute* "CMakeLists.txt" (lambda _
;; CMakeLists.txt hard-codes runpath to just the libdir. (substitute* "CMakeLists.txt"
;; Remove it so the configure flag is respected. ;; CMakeLists.txt hard-codes runpath to just the libdir.
(("SET\\(CMAKE_INSTALL_RPATH .*") ""))))))) ;; Remove it so the configure flag is respected.
(("SET\\(CMAKE_INSTALL_RPATH .*") "")))))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. (list `(,glib "bin") ; for glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection) gobject-introspection
("gperf" ,gperf) gperf
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) gsettings-desktop-schemas
("intltool" ,intltool) intltool
("pkg-config" ,pkg-config) pkg-config
("protobuf" ,protobuf) protobuf
("vala" ,vala) vala
("python" ,python-wrapper))) python-wrapper))
(propagated-inputs (propagated-inputs
;; These are all in the Requires field of .pc files. ;; These are all in the Requires field of .pc files.
`(("gtk+" ,gtk+) (list gtk+
("libical" ,libical) libical
("libsecret" ,libsecret) libsecret
("libsoup" ,libsoup-minimal-2) libsoup-minimal-2
("nss" ,nss) nss
("sqlite" ,sqlite))) sqlite))
(inputs (inputs
`(("bdb" ,bdb) (list bdb
("boost" ,boost) boost
("gcr" ,gcr) gcr
("gnome-online-accounts:lib" ,gnome-online-accounts "lib") `(,gnome-online-accounts "lib")
("json-glib" ,json-glib) json-glib
("libcanberra" ,libcanberra) libcanberra
("libgweather" ,libgweather) libgweather
("libphonenumber" ,libphonenumber) libphonenumber
("mit-krb5" ,mit-krb5) mit-krb5
("openldap" ,openldap) openldap
("webkitgtk" ,webkitgtk-with-libsoup2))) webkitgtk-with-libsoup2))
(synopsis "Store address books and calendars") (synopsis "Store address books and calendars")
(home-page "https://wiki.gnome.org/Apps/Evolution") (home-page "https://wiki.gnome.org/Apps/Evolution")
(description (description