ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: evolution-data-server: Add 'libedataserverui' output.

Browse source 
gnu/packages/gnome.scm (evolution-data-server)[outputs]: Add
'libedataserverui'.
[arguments]: Add phases so that only libedataserverui is linked with
WebKitGTK, and that it is moved to its own output.
(evolution, gnome-calendar, gnome-todo)[inputs]: Add libedataserverui.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Timothy Sample 2019-03-27 23:22:31 -04:00 committed by Ludovic Courtès
parent 14c297fde1
commit da43d1cb32
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gnu/packages/gnome.scm
View file

@ -4994,6 +4994,7 @@ (define-public evolution-data-server
(sha256
(base32
"12b9lfgwd57rzn9394xrbvl9ym5aqldpz9v7c9a421dsv8dgq13b"))))
(outputs '("out" "libedataserverui"))
(build-system cmake-build-system)
(arguments
'(;; XXX FIXME: 11/85 tests are failing.
@ -5034,7 +5035,40 @@ (define-public evolution-data-server
;; CMakeLists.txt hard-codes runpath to just the libdir.
;; Remove it so the configure flag is respected.
(("SET\\(CMAKE_INSTALL_RPATH .*") ""))
#t)))))
#t))
(add-before 'configure 'factor-webkit
(lambda _
(substitute* "CMakeLists.txt"
(("webkit2gtk-4\\.0>=\\$[{]webkit2gtk_minimum_version[}]") "")
(("if[(]ENABLE_OAUTH2[)]")
(string-append
"if(ENABLE_OAUTH2)\n"
"\tpkg_check_modules(OAUTH2_UI REQUIRED "
"webkit2gtk-4.0>=${webkit2gtk_minimum_version})")))
(substitute* "src/libedataserverui/CMakeLists.txt"
(("\\$[{]OAUTH2_([A-Z_]+)[}]" all part)
(string-append all " ${OAUTH2_UI_" part "}")))))
(add-after 'install 'split
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(libedsui (assoc-ref outputs "libedataserverui")))
(for-each (lambda (file)
(mkdir-p (dirname (string-append libedsui file)))
(rename-file (string-append out file)
(string-append libedsui file)))
'("/lib/pkgconfig/libedataserverui-1.2.pc"
"/lib/libedataserverui-1.2.so"
"/lib/libedataserverui-1.2.so.2"
"/lib/libedataserverui-1.2.so.2.0.0"
"/lib/girepository-1.0/EDataServerUI-1.2.typelib"
"/include/evolution-data-server/libedataserverui"
"/share/gir-1.0/EDataServerUI-1.2.gir"
"/share/vala/vapi/libedataserverui-1.2.vapi"
"/share/vala/vapi/libedataserverui-1.2.deps"))
(substitute* (string-append libedsui "/lib/pkgconfig/"
"libedataserverui-1.2.pc")
((out) libedsui))
#t))))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection)
@ -6391,7 +6425,8 @@ (define-public gnome-calendar
(inputs
`(("evolution-data-server" ,evolution-data-server)
("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("libedataserverui" ,evolution-data-server "libedataserverui")))
(home-page "https://wiki.gnome.org/Apps/Calendar")
(synopsis "GNOME's calendar application")
(description
@ -6438,6 +6473,7 @@ (define-public gnome-todo
(inputs
`(("rest" ,rest) ; For Todoist plugin
("json-glib" ,json-glib) ; For Todoist plugin
("libedataserverui" ,evolution-data-server "libedataserverui")
("libical" ,libical)
("libpeas" ,libpeas)
("python-pygobject" ,python-pygobject)
@ -7608,6 +7644,7 @@ (define-public evolution
("gtkspell3" ,gtkspell3)
("highlight" ,highlight)
("libcanberra" ,libcanberra)
("libedataserverui" ,evolution-data-server "libedataserverui")
("libgweather" ,libgweather)
("libnotify" ,libnotify)
("libsoup" ,libsoup)