From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 0OGkKy5hqGUurQAAe85BDQ:P1 (envelope-from ) for ; Thu, 18 Jan 2024 00:22:22 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 0OGkKy5hqGUurQAAe85BDQ (envelope-from ) for ; Thu, 18 Jan 2024 00:22:22 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="b uri18E"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1705533742; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=B98aHDQ7Yr3KVAhF/rIoyep3/+sHiJXxoDI9+nx/1BY=; b=EQZQaNwhBJS85TgvgH/n0gkcJgmZ6JPQ9n2pAWdPERkOfmS1n9eD07EOY1m8/+GZvJnCwN dDif/sBSzaCnrY3EbR4QJLZxn2UMCod8aK0MEaxezoQ6RK/NUnnl8B7VrZDzDrW0ZEaaBe /yfKI91znIrCqisIKkjUocP6tGZGLY5GX7XTOjlz06GFZFxWzGihLI2RtQeoOQaw6e1Pjo 99wIKVoVBAiZPyn0YZ6J4WBTgMWjMj+NzYX7vN0SNif5+9pdx0jo6kR1Nsyzlz10OgYavX pmxRVyQsQe6V6/EoPMycKNJTPeyjn/rtGNkVg8hkMx5y1JkZP69vhxlFPyu2yw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="b uri18E"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1705533742; a=rsa-sha256; cv=none; b=q9J/SkeGTfovbgLkcl7ss8e/VgLJ4qkkgzD+bAGKRROb24cttM0OEUKCfcoosLfzPHLv5t mQMJkWI+xjG1lULzFOvEzoIRG/KzOnT5bP11wZMVrC4XfeuoElkZtL5GyILr/KoOVlanh4 ltv6Ms4pWxoXXWrH7b1MeMfh4sVYhE10ZpPsP8slrI16aCyBvBvk1VhJezv+W+CxZxljYC 6MyBe3lz0GEvbU3nSBPnsIEKKZ5aeufr0lJxzfIptdQ4OWQhWwIv/Anajj7eeseFcopl82 OUr99ev5+BZ+9JsvOPwJVb5jq7cPbuWvXplr8MKhLxm089aYbu2PZTDwTttorg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 50A5B1FC66 for ; Thu, 18 Jan 2024 00:22:22 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQFEa-0003jN-61; Wed, 17 Jan 2024 18:22:12 -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 1rQFES-0003fg-Gw for guix-patches@gnu.org; Wed, 17 Jan 2024 18:22:04 -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 1rQFER-0001r9-F5 for guix-patches@gnu.org; Wed, 17 Jan 2024 18:22:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQFES-00036q-Kr for guix-patches@gnu.org; Wed, 17 Jan 2024 18:22:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68556] [PATCH gnome-team 10/25] gnu: gnome-shell-extension-gsconnect: Update to 55. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jan 2024 23:22: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.170553368711833 (code B ref 68556); Wed, 17 Jan 2024 23:22:04 +0000 Received: (at 68556) by debbugs.gnu.org; 17 Jan 2024 23:21:27 +0000 Received: from localhost ([127.0.0.1]:53908 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQFDq-00034j-Lr for submit@debbugs.gnu.org; Wed, 17 Jan 2024 18:21:27 -0500 Received: from planete-kraus.eu ([89.234.140.182]:49320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQF8Z-00018a-Rd for 68556@debbugs.gnu.org; Wed, 17 Jan 2024 18:16:01 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 033d2a08; Wed, 17 Jan 2024 23:15:57 +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=tLDO6L7ZmP9YnBB6x4xC0qycnCY=; b=b uri18Eh7sPtHNltQu5HKP7VU+7y6idOD9ZCFxeE+catppxUqApDBkYB+WL5EC41w amOSWQQPxM96KVuhr8t+004hNtMoR7UvQTqvECJ8fsejgORa44hhJq9iojjk521n MXbQ359bdSFZTl3yL3RX1ZRvCzPrESXzki8LLEZUQmCbrGsPCWGL/naBUP8PkbDa /Xmv/23QD9RrlKT/ulYPO+/VxXAwMm8mz/Qo85BVpIALUZPmyGttlbLM7B/MaGJL We4XyztFPl8qT23JiAZuS3zjgeHtt3W2+uSUpIF4m50pEgQ3AtGg1gMQ7jM3TRiR Okc5HQN/dIgSmyWSwkYMw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id f1994e87 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 17 Jan 2024 23:15:56 +0000 (UTC) Message-ID: <403c904ac492dd6be2fe2e9b3846e1d38f65771f.1705532622.git.vivien@planete-kraus.eu> 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 From: Vivien Kraus via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.69 X-Spam-Score: -4.69 X-Migadu-Queue-Id: 50A5B1FC66 X-Migadu-Scanner: mx12.migadu.com X-TUID: d6BSdTCgAXNU * 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 efe040c37e..519a5cda30 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 -- 2.41.0