From patchwork Fri Jan 7 12:50:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 36068 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 3D31327BBEA; Fri, 7 Jan 2022 12:52:53 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 AE2DB27BBE9 for ; Fri, 7 Jan 2022 12:52:52 +0000 (GMT) Received: from localhost ([::1]:56988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5ojd-0003k7-Ow for patchwork@mira.cbaines.net; Fri, 07 Jan 2022 07:52:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5oiy-0003jK-3I for guix-patches@gnu.org; Fri, 07 Jan 2022 07:52:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50371) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5oiw-0000GR-Gz for guix-patches@gnu.org; Fri, 07 Jan 2022 07:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n5oiw-0003aK-ES for guix-patches@gnu.org; Fri, 07 Jan 2022 07:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53072] [PATCH v2] gnu: Add gpaste at v3.42.2. References: <20220107093911.17095-1-attila@lendvai.name> In-Reply-To: <20220107093911.17095-1-attila@lendvai.name> Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Jan 2022 12:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53072 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53072@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 53072-submit@debbugs.gnu.org id=B53072.164155991013756 (code B ref 53072); Fri, 07 Jan 2022 12:52:02 +0000 Received: (at 53072) by debbugs.gnu.org; 7 Jan 2022 12:51:50 +0000 Received: from localhost ([127.0.0.1]:43274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5oik-0003Zo-A9 for submit@debbugs.gnu.org; Fri, 07 Jan 2022 07:51:50 -0500 Received: from mail-wr1-f54.google.com ([209.85.221.54]:43782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5oii-0003Zc-VZ for 53072@debbugs.gnu.org; Fri, 07 Jan 2022 07:51:50 -0500 Received: by mail-wr1-f54.google.com with SMTP id o3so10853501wrh.10 for <53072@debbugs.gnu.org>; Fri, 07 Jan 2022 04:51:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZG5ihGAUVMvOz2mOz7HDueWUpt85UwPirmgiOAP5dF8=; b=TF7f5qqGtoQtAk+lpu8D1TA3f7quRaKTHuBR4PibxlQk/Vl6ZYvC9OKSuzM6w7SGpi Z/EID20ZyaMvdCqtqS5mOgQ1sw/ZWWUi39MubAd+F6X5YHcWlELs6qniKy1+BTYOLFa0 /0oKVGtWtV/V8QcYIGNA2ROfY7OLeRgASP6vxu1YfTrQHpcOpANT6HTnRAkYxdryUaLm 9S/VUe/sn3hMoJEaNnygT7S4oPZviLG3zLp6mCIvBcyQdf1ID8KK7Zi61u20YWJdBs3Q UAv/uOVhZVmOUnB9J2KVL8tlJXI883OKlvDlRWzgpkDCL/LI7W7GVHPNRQsGRBHBigOw HIbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=ZG5ihGAUVMvOz2mOz7HDueWUpt85UwPirmgiOAP5dF8=; b=5vm3sAMU6TKiZb2dU6f17W3BmX5ARJsDQO1Z26oBpOPGLORN2sPM/1VZoJx0PE937p HpVnzFTQPO5wPg1qoBj6BR9GS2X+ZfwR4IEGfGPhqP1T3c1iUbVwzDcftE9eUeDm3VCB tW57UyrdSM9fKB+S2ltCkvTMGLqBGVOp2HFant2x+ylGjjcUIyr0r/kxwrNGeTdj/bvd aXDgf3sUd1713kGpQosz6YCMlyd0peHV+xnnSqA5x2My3qA0uUzlnbjG7W8t+pQcXDIP vjkRMAXD3APcChc7n4VobyxbWH4cWXD9Jv6uVCgPA8EnogVlO/X40re76+F8tc5BhHUH CSaQ== X-Gm-Message-State: AOAM532jM65030j0O5RlTIYzG6wSKO3CEfi2tEU72MAkBbMb0MsXTdQI sumQkgPvw5PBZQM/GTOzMGJctgvmaRE= X-Google-Smtp-Source: ABdhPJwzL8mx9HjRaRTHEPbA1fiiMI2SblifNevl4XrZX4OBM+dkMMAhWg0jW63HkYfrXeCzdttfpA== X-Received: by 2002:adf:ebcb:: with SMTP id v11mr39974353wrn.133.1641559902992; Fri, 07 Jan 2022 04:51:42 -0800 (PST) Received: from localhost.localdomain (catv-89-132-245-188.catv.broadband.hu. [89.132.245.188]) by smtp.gmail.com with ESMTPSA id l26sm4561422wrz.44.2022.01.07.04.51.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 04:51:42 -0800 (PST) From: Attila Lendvai Date: Fri, 7 Jan 2022 13:50:30 +0100 Message-Id: <20220107125029.27565-1-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome-xyz.scm (gpaste): New variable. --- v2 adds #:glib-or-gtk? #true, which simplifies the rest. gnu/local.mk | 1 + gnu/packages/gnome-xyz.scm | 54 +++++++++++++++++++++ gnu/packages/patches/gpaste-fix-paths.patch | 24 +++++++++ 3 files changed, 79 insertions(+) create mode 100644 gnu/packages/patches/gpaste-fix-paths.patch diff --git a/gnu/local.mk b/gnu/local.mk index c8ec622aa1..488e91eb05 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1201,6 +1201,7 @@ dist_patch_DATA = \ %D%/packages/patches/go-github-com-urfave-cli-fix-tests.patch \ %D%/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch \ %D%/packages/patches/go-skip-gc-test.patch \ + %D%/packages/patches/gpaste-fix-paths.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \ %D%/packages/patches/gpodder-disable-updater.patch \ %D%/packages/patches/gpsbabel-fix-i686-test.patch \ diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 8161db557d..7ca43c524b 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -39,9 +39,11 @@ (define-module (gnu packages gnome-xyz) #:use-module (guix packages) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) #:use-module (gnu packages acl) #:use-module (gnu packages attr) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages build-tools) @@ -686,6 +688,58 @@ (define-public gnome-shell-extension-paperwm notebooks and tiling window managers.") (license license:gpl3))) +(define-public gpaste + (package + (name "gpaste") + (version "3.42.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Keruspe/GPaste") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1k5qvgzwl357k72qfim5zfas2a0n6j24jnlm1v472l7h6gb6lssm")) + (patches + (search-patches "gpaste-fix-paths.patch")))) + (build-system meson-build-system) + (native-inputs + (list autoconf automake gettext-minimal gobject-introspection + (list glib "bin") ; for glib-compile-resources + libtool pkg-config vala)) + (inputs + (list appstream-glib libarchive gjs mutter graphene)) + (arguments + `(#:meson ,meson-0.59 ;positional arguments error with meson 0.60 + #:glib-or-gtk? #true + #:configure-flags + (list + (string-append "-Dcontrol-center-keybindings-dir=" + %output "/share/gnome-control-center/keybindings") + (string-append "-Ddbus-services-dir=" + %output "/share/dbus-1/services") + (string-append "-Dsystemd-user-unit-dir=" + %output "/etc/systemd/user")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-introspection-install-dir + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* '("src/gnome-shell/extension.js" + "src/gnome-shell/prefs.js") + (("@typelibPath@") + (string-append out "/lib/girepository-1.0/"))))))))) + (home-page "https://github.com/Keruspe/GPaste") + (synopsis "Clipboard management system for GNOME Shell") + (description "GPaste is a clipboard manager, a tool which allows you to +keep a trace of what you’re copying and pasting. Is is really useful when +you go through tons of documentation and you want to keep around a bunch of +functions you might want to use, for example. The clipboard manager will +store an history of everything you do, so that you can get back to older +copies you now want to paste.") + (license license:bsd-2))) + (define-public arc-theme (package (name "arc-theme") diff --git a/gnu/packages/patches/gpaste-fix-paths.patch b/gnu/packages/patches/gpaste-fix-paths.patch new file mode 100644 index 0000000000..be63878fe6 --- /dev/null +++ b/gnu/packages/patches/gpaste-fix-paths.patch @@ -0,0 +1,24 @@ +This is copied from NixOS, which is under MIT licence. +https://github.com/NixOS/nixpkgs/blob/master/pkgs/desktops/gnome/misc/gpaste/ +--- a/src/gnome-shell/extension.js ++++ b/src/gnome-shell/extension.js +@@ -6,6 +6,8 @@ + + const Config = imports.misc.config; + ++imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@'); ++ + imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION; + imports.gi.versions.GLib = '2.0'; + imports.gi.versions.GPaste = '1.0'; +--- a/src/gnome-shell/prefs.js ++++ b/src/gnome-shell/prefs.js +@@ -6,6 +6,8 @@ + + const Gettext = imports.gettext; + ++imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@'); ++ + //const { GPaste } = imports.gi; + + const ExtensionUtils = imports.misc.extensionUtils;