From patchwork Thu Mar 28 03:22:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 1581 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 5903416D9F; Thu, 28 Mar 2019 03:32:58 +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 CC5E116D95 for ; Thu, 28 Mar 2019 03:32:57 +0000 (GMT) Received: from localhost ([127.0.0.1]:57288 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9Lmj-0000HF-Bh for patchwork@mira.cbaines.net; Wed, 27 Mar 2019 23:32:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9Ljt-0006PN-BK for guix-patches@gnu.org; Wed, 27 Mar 2019 23:30:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9Ld8-0006Fc-4R for guix-patches@gnu.org; Wed, 27 Mar 2019 23:23:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48390) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h9Ld7-0006FU-Vh for guix-patches@gnu.org; Wed, 27 Mar 2019 23:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h9Ld7-0000D2-Pr for guix-patches@gnu.org; Wed, 27 Mar 2019 23:23:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35028] [PATCH 1/3] gnu: gnome-online-accounts: Split off 'lib' output. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2019 03:23:01 +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.1553743381784 (code B ref 35028); Thu, 28 Mar 2019 03:23:01 +0000 Received: (at 35028) by debbugs.gnu.org; 28 Mar 2019 03:23:01 +0000 Received: from localhost ([127.0.0.1]:33701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h9Ld6-0000Ca-KM for submit@debbugs.gnu.org; Wed, 27 Mar 2019 23:23:00 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:52797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h9Ld4-0000CM-Qc for 35028@debbugs.gnu.org; Wed, 27 Mar 2019 23:22:59 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 95C8321841; Wed, 27 Mar 2019 23:22:53 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 27 Mar 2019 23:22:53 -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=WyhpcCNzns9g56CctTLqNwZpVMLQVx+Ip1Ndn01cRHc=; b=pLVYXw2F T9PMQWlmizpzceLToR+gYQN339NEIZ3eS64dOcbayfRjjO5qnUDjKiLGx+U6qaHX oBBeJhXM3lB+zEfXeN9JBVH0fPQlkDA1b/mcsVPT/Lqz+Omp+TRGprdVAf3WwXrV 143uqfP2Vwj//6RyNQsoz0lwxTGF+a+MXcBs08RC2kQL8dmOKKhDCWMU5yM2y0p2 EG/1doMlQryZ5jN+lwv7Clv2VAlFE4Xk8QV9/v97hvatzKbICj6e6jyE+Ss94J2u IzmGnOJLeiLqfJNPsGYNyNuHd1voDq2A6f3nLzqmWNmpNJOyUKQzEKsu8KruwcOW wMr8nZiBJva7GQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrkeefgdeilecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpefvihhmohhthhihucfurghmphhlvgcuoehsrghmphhlvghtsehn ghihrhhordgtohhmqeenucffohhmrghinhepghhnohhmvgdrohhrghdpphgtrdhinhenuc fkphepjeegrdduudeirddukeeirdeggeenucfrrghrrghmpehmrghilhhfrhhomhepshgr mhhplhgvthesnhhghihrohdrtghomhenucevlhhushhtvghrufhiiigvpedt 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 6544510311; Wed, 27 Mar 2019 23:22:52 -0400 (EDT) From: Timothy Sample Date: Wed, 27 Mar 2019 23:22:30 -0400 Message-Id: <20190328032232.10058-1-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 (gnome-online-accounts)[outputs]: Add 'lib'. [arguments]: Set the 'libdir' path to the 'out' output, and add a phase to ensure that libgoa gets installed in the 'lib' output. (evolution-data-server, gfbgraph, gnome-calendar, gnome-control-center, gnome-todo, libgdata, libzapojit): Use the 'lib' output of gnome-online-accounts. --- gnu/packages/gnome.scm | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 060379aba9..9222f99003 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -389,7 +389,7 @@ formats like PNG, SVG, PDF and EPS.") ("libsoup" ,libsoup))) (propagated-inputs `(("gcr" ,gcr) - ("gnome-online-accounts" ,gnome-online-accounts) + ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("liboauth" ,liboauth) ("libxml2" ,libxml2))) (home-page "https://wiki.gnome.org/Projects/libgdata") @@ -4941,7 +4941,23 @@ window manager.") (sha256 (base32 "1l8p1ghknmkmjpnpl7jr53j66qbzpikickzbmrz0aczyhq6pdy29")))) + (outputs '("out" "lib")) (build-system glib-or-gtk-build-system) + (arguments + `(#:configure-flags + (list (string-append "--libdir=" (assoc-ref %outputs "out") "/lib")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-libgoa-output + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (assoc-ref outputs "lib"))) + (substitute* '("src/goa/Makefile.in" "src/goa/goa-1.0.pc.in") + (("@prefix@") lib) + (("@exec_prefix@") lib) + (("@libdir@") (string-append lib "/lib")) + (("@includedir@") (string-append lib "/include")) + (("@datadir@") (string-append lib "/share"))) + #t)))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. ("gobject-introspection" ,gobject-introspection) @@ -5038,7 +5054,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (inputs `(("bdb" ,bdb) ("gcr" ,gcr) - ("gnome-online-accounts" ,gnome-online-accounts) + ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("json-glib" ,json-glib) ("libgweather" ,libgweather) ("mit-krb5" ,mit-krb5) @@ -5631,6 +5647,7 @@ devices using the GNOME desktop.") ("gnome-bluetooth" ,gnome-bluetooth) ("gnome-desktop" ,gnome-desktop) ("gnome-online-accounts" ,gnome-online-accounts) + ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("gnome-settings-daemon" ,gnome-settings-daemon) ("grilo" ,grilo) ("ibus" ,ibus) @@ -6300,7 +6317,7 @@ library.") ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("gnome-online-accounts" ,gnome-online-accounts) + `(("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("json-glib" ,json-glib) ("rest" ,rest))) (home-page "https://wiki.gnome.org/Projects/Zapojit") @@ -6373,7 +6390,7 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.") ("pkg-config" ,pkg-config))) (inputs `(("evolution-data-server" ,evolution-data-server) - ("gnome-online-accounts" ,gnome-online-accounts) + ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) (home-page "https://wiki.gnome.org/Apps/Calendar") (synopsis "GNOME's calendar application") @@ -6425,7 +6442,7 @@ desktop. It supports multiple calendars, month, week and year view.") ("libpeas" ,libpeas) ("python-pygobject" ,python-pygobject) ("evolution-data-server" ,evolution-data-server) - ("gnome-online-accounts" ,gnome-online-accounts) + ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) (home-page "https://wiki.gnome.org/Apps/Todo") (synopsis "GNOME's ToDo Application") @@ -6754,7 +6771,7 @@ compiled.") ("gobject-introspection" ,gobject-introspection))) (inputs `(("json-glib" ,json-glib) - ("gnome-online-accounts" ,gnome-online-accounts) + ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("rest" ,rest))) (synopsis "GLib/GObject wrapper for the Facebook API") (description "This library allows you to use the Facebook API from