From patchwork Thu Mar 28 03:22:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 1578 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2A21A16D9F; Thu, 28 Mar 2019 03:30:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 140D816D95 for ; Thu, 28 Mar 2019 03:30:01 +0000 (GMT) Received: from localhost ([127.0.0.1]:57217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9Ljs-0006kU-G9 for patchwork@mira.cbaines.net; Wed, 27 Mar 2019 23:30:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9Ljl-0006PN-H4 for guix-patches@gnu.org; Wed, 27 Mar 2019 23:29:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9Le7-0006bJ-HA for guix-patches@gnu.org; Wed, 27 Mar 2019 23:24:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48399) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h9Le6-0006af-FR for guix-patches@gnu.org; Wed, 27 Mar 2019 23:24:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h9Le6-0000F1-B8 for guix-patches@gnu.org; Wed, 27 Mar 2019 23:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35028] [PATCH 2/3] gnu: evolution-data-server: Add 'libedataserverui' output. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2019 03:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35028 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35028@debbugs.gnu.org Received: via spool by 35028-submit@debbugs.gnu.org id=B35028.1553743392845 (code B ref 35028); Thu, 28 Mar 2019 03:24:02 +0000 Received: (at 35028) by debbugs.gnu.org; 28 Mar 2019 03:23:12 +0000 Received: from localhost ([127.0.0.1]:33706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h9LdI-0000DZ-1a for submit@debbugs.gnu.org; Wed, 27 Mar 2019 23:23:12 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:34189) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h9LdG-0000DN-8D for 35028@debbugs.gnu.org; Wed, 27 Mar 2019 23:23:10 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 300DC21BA9; Wed, 27 Mar 2019 23:23:05 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 27 Mar 2019 23:23:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=5Ii+mjH5He1xJQ8UuOQ8RoetSCCMFu62ZmJ0nAFiRb8=; b=LsR6wndL akw8fDJjn5YGmWIKg5T1axY7CZOuSoqD37Gmm5pA+iqZhlg+9CfJhmorH4y3ExKK ecZyMQah45zG3x8gIbHgeJvzkB2cRsA5z6264j55nHURkeU/2j3rp3qj8qg+bLt+ TtAJipr8bfVRsXgZwggQfNhRLFLk0NCctzLW9fE4BxF8e7MA5kffy24lwXZ5ckf9 Tti7Slt69DyuEcyPURXLWHVRHGT3k+DCHY9FLKkTM+aFInugg7P1U0qQmeuIBleO bPPVwF5wksirb62vsLAxhIt9KY94E4QanCNm0RM26cQrnjL2I8joXRuYVAOdgHAW K1FYUKLKCko82g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrkeefgdeilecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpefvihhmohhthhihucfurghmphhlvgcuoehsrghmphhlvghtsehn ghihrhhordgtohhmqeenucffohhmrghinhepghhnohhmvgdrohhrghenucfkphepjeegrd duudeirddukeeirdeggeenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhplhgvthes nhhghihrohdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from mrblack.lan (74-116-186-44.qc.dsl.ebox.net [74.116.186.44]) by mail.messagingengine.com (Postfix) with ESMTPA id AAAAD10311; Wed, 27 Mar 2019 23:23:04 -0400 (EDT) From: Timothy Sample Date: Wed, 27 Mar 2019 23:22:31 -0400 Message-Id: <20190328032232.10058-2-samplet@ngyro.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <877ecj7ksh.fsf@ngyro.com> References: <877ecj7ksh.fsf@ngyro.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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)