From: Timothy Sample <samplet@ngyro.com>
To: 35028@debbugs.gnu.org
Subject: [bug#35028] [PATCH 2/3] gnu: evolution-data-server: Add 'libedataserverui' output.
Date: Wed, 27 Mar 2019 23:22:31 -0400 [thread overview]
Message-ID: <20190328032232.10058-2-samplet@ngyro.com> (raw)
In-Reply-To: <877ecj7ksh.fsf@ngyro.com>
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.
---
gnu/packages/gnome.scm | 41 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 39 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9222f99003..595ba20f7f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4994,6 +4994,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
(sha256
(base32
"12b9lfgwd57rzn9394xrbvl9ym5aqldpz9v7c9a421dsv8dgq13b"))))
+ (outputs '("out" "libedataserverui"))
(build-system cmake-build-system)
(arguments
'(;; XXX FIXME: 11/85 tests are failing.
@@ -5034,7 +5035,40 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
;; 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 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.")
(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 @@ desktop. It supports multiple calendars, month, week and year view.")
(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 @@ generic enough to work for everyone.")
("gtkspell3" ,gtkspell3)
("highlight" ,highlight)
("libcanberra" ,libcanberra)
+ ("libedataserverui" ,evolution-data-server "libedataserverui")
("libgweather" ,libgweather)
("libnotify" ,libnotify)
("libsoup" ,libsoup)
--
2.21.0
next prev parent reply other threads:[~2019-03-28 3:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-28 3:14 [bug#35028] [PATCH 0/3] Remove WebKitGTK from GNOME Shell closure Timothy Sample
2019-03-28 3:22 ` [bug#35028] [PATCH 1/3] gnu: gnome-online-accounts: Split off 'lib' output Timothy Sample
2019-03-28 3:22 ` Timothy Sample [this message]
2019-03-28 3:22 ` [bug#35028] [PATCH 3/3] gnu: gnome-shell: Remove gnome-control-center from inputs Timothy Sample
2019-03-30 14:19 ` bug#35028: [PATCH 0/3] Remove WebKitGTK from GNOME Shell closure Ludovic Courtès
2019-04-13 17:49 ` [bug#35028] " Timothy Sample
2019-04-14 17:44 ` Ludovic Courtès
2019-04-15 0:18 ` Timothy Sample
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190328032232.10058-2-samplet@ngyro.com \
--to=samplet@ngyro.com \
--cc=35028@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.