From patchwork Tue Jan 16 21:59:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 59143 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 F40BD27BBEC; Fri, 19 Jan 2024 21:57:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2FDBD27BBE2 for ; Fri, 19 Jan 2024 21:57:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQwrJ-0007U1-Ge; Fri, 19 Jan 2024 16:57:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQwrG-0007S4-8i for guix-patches@gnu.org; Fri, 19 Jan 2024 16:57:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQwrG-0006Co-0z for guix-patches@gnu.org; Fri, 19 Jan 2024 16:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQwrI-0008P7-E5 for guix-patches@gnu.org; Fri, 19 Jan 2024 16:57:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68556] [PATCH gnome-team v2 10/23] gnu: gnome-shell-extension-gsconnect: Update to 55. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Jan 2024 21:57:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68556 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68556@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 68556-submit@debbugs.gnu.org id=B68556.170570140732172 (code B ref 68556); Fri, 19 Jan 2024 21:57:04 +0000 Received: (at 68556) by debbugs.gnu.org; 19 Jan 2024 21:56:47 +0000 Received: from localhost ([127.0.0.1]:60241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQwr0-0008Mp-Tl for submit@debbugs.gnu.org; Fri, 19 Jan 2024 16:56:47 -0500 Received: from planete-kraus.eu ([2a00:5881:4008:2810::309]:34886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQwqy-0008Lg-KY for 68556@debbugs.gnu.org; Fri, 19 Jan 2024 16:56:45 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 2ece03a7; Fri, 19 Jan 2024 21:56:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniA; bh=vo5ImwDDUkMlhh0e7Sit5lJbD88=; b=G VPBAH3wGOttVJ4t2EjBoY2h4BzvQH/uY+kgvflTS0Fhdu1oNPTrduJ8zkW+CWKch yVp2J9yn8k95PkybKl6F4O8p7y6cYb2aTRP5jsgVl+9i9qwvUhADoHKkrJ6swIQC UrXhHeKwDooxVW4ElOe6MCSa9XEZeSA6pIcH2cmWxNCY41YI5R02AGIvq4roJk92 bf/R258U6bro1FSPjjGPPjjRKFrXNC0nhtQCxxMBk/OPKE+9SvqSyePkDrPw9uhz ziOXeHCcoq1aO7xL6Iz+4MDoXhdVicaOymE3b2LP7aFDxyf5AzzzmKtqezO9VOEH amNBQbus8eMkLPmJoZV1w== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 18cbe6c7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 19 Jan 2024 21:56:40 +0000 (UTC) Message-ID: In-Reply-To: References: Date: Tue, 16 Jan 2024 22:59:14 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect): Update to 55. [arguments]: Convert to list of G-Expressions. [#:configure-flags]: Do not set settings_schemadir nor post_install anymore. [#:phase 'skip-post-installation]: New phase. [inputs]: Drop labels. [native-inputs]: Drop labels. Change-Id: I63933e43815826a8ab91a472ecda235173486dae --- gnu/packages/gnome-xyz.scm | 134 ++++++++++++++++++------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 80462d6e08..b5816e62b6 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -761,7 +761,7 @@ (define-public gnome-shell-extension-dash-to-dock (define-public gnome-shell-extension-gsconnect (package (name "gnome-shell-extension-gsconnect") - (version "50") ; See GNOME Shell supported versions in metadata.json + (version "55") (source (origin (method git-fetch) (uri (git-reference @@ -771,77 +771,77 @@ (define-public gnome-shell-extension-gsconnect (file-name (git-file-name name version)) (sha256 (base32 - "0vg87fdihs5kp7apgyd32ldjmwzmrxaimsc005yjyy8m3f65sjmr")))) + "158qbjl6m807g0fy15dvhwwwy6z8r0g7kh9gjyhm7n3y14v5p8wz")))) (build-system meson-build-system) (arguments - `(#:tests? #f ;; every test fails - #:configure-flags - (let* ((out (assoc-ref %outputs "out")) - (name+version (strip-store-file-name out)) - (gschema-dir (string-append out - "/share/gsettings-schemas/" - name+version - "/glib-2.0/schemas")) - (gnome-shell (assoc-ref %build-inputs "gnome-shell")) - (openssh (assoc-ref %build-inputs "openssh")) - (openssl (assoc-ref %build-inputs "openssl"))) - (list - (string-append "-Dgnome_shell_libdir=" gnome-shell "/lib") - (string-append "-Dgsettings_schemadir=" gschema-dir) - (string-append "-Dopenssl_path=" openssl "/bin/openssl") - (string-append "-Dsshadd_path=" openssh "/bin/ssh-add") - (string-append "-Dsshkeygen_path=" openssh "/bin/ssh-keygen") - (string-append "-Dsession_bus_services_dir=" out "/share/dbus-1/services") - "-Dpost_install=true")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (let* ((glib (assoc-ref inputs "glib:bin")) - (gapplication (string-append glib "/bin/gapplication")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (substitute* "data/org.gnome.Shell.Extensions.GSConnect.desktop.in" - (("gapplication") gapplication)) - (for-each - (lambda (file) - (substitute* file - (("'use strict';") - (string-append "'use strict';\n\n" - "'" gi-typelib-path "'.split(':').forEach(" - "path => imports.gi.GIRepository.Repository." - "prepend_search_path(path));")))) - '("src/extension.js" "src/prefs.js")) - #t))) - (add-after 'install 'wrap-daemons - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (service-dir - (string-append out "/share/gnome-shell/extensions" - "/gsconnect@andyholmes.github.io/service")) + (list + #:tests? #f ;; every test fails + #:configure-flags + #~(let ((out #$output) + (gnome-shell #$(this-package-input "gnome-shell")) + (openssh #$(this-package-input "openssh")) + (openssl #$(this-package-input "openssl"))) + (list + (string-append "-Dgnome_shell_libdir=" gnome-shell "/lib") + (string-append "-Dopenssl_path=" openssl "/bin/openssl") + (string-append "-Dsshadd_path=" openssh "/bin/ssh-add") + (string-append "-Dsshkeygen_path=" openssh "/bin/ssh-keygen") + (string-append "-Dsession_bus_services_dir=" out "/share/dbus-1/services"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-post-installation + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false") + (("update_desktop_database: true") + "update_desktop_database: false")))) + (add-before 'configure 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((gapplication (search-input-file inputs "/bin/gapplication")) (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (wrap-program (string-append service-dir "/daemon.js") - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))) - #t)))))) + (substitute* "data/org.gnome.Shell.Extensions.GSConnect.desktop.in" + (("gapplication") gapplication)) + (for-each + (lambda (file) + (substitute* file + (("'use strict';") + (string-append "'use strict';\n\n" + "'" gi-typelib-path "'.split(':').forEach(" + "path => imports.gi.GIRepository.Repository." + "prepend_search_path(path));")))) + '("src/extension.js" "src/prefs.js"))))) + (add-after 'install 'wrap-daemons + (lambda _ + (let* ((out #$output) + (service-dir + (string-append out "/share/gnome-shell/extensions" + "/gsconnect@andyholmes.github.io/service")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append service-dir "/daemon.js") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))))))) (inputs - `(("at-spi2-core" ,at-spi2-core) - ("caribou" ,caribou) - ("evolution-data-server" ,evolution-data-server) - ("gjs" ,gjs) - ("glib" ,glib) - ("glib:bin" ,glib "bin") - ("gsound" ,gsound) - ("gnome-shell" ,gnome-shell) - ("gtk+" ,gtk+) - ("nautilus" ,nautilus) - ("openssh" ,openssh) - ("openssl" ,openssl) - ("python-pygobject" ,python-pygobject) - ("upower" ,upower))) + (list + at-spi2-core + caribou + evolution-data-server + gjs + glib + `(,glib "bin") ;for /bin/gapplication + gsound + gnome-shell + gtk+ + nautilus + openssh + openssl + python-pygobject + upower)) (native-inputs - `(("gettext" ,gettext-minimal) - ("gobject-introspection" ,gobject-introspection) - ("libxml2" ,libxml2) - ("pkg-config" ,pkg-config))) + (list + gettext-minimal + gobject-introspection + libxml2 + pkg-config)) (home-page "https://github.com/GSConnect/gnome-shell-extension-gsconnect/wiki") (synopsis "Connect GNOME Shell with your Android phone") (description "GSConnect is a complete implementation of KDE Connect