From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 8IdLADgM2GEOegAAgWs5BA (envelope-from ) for ; Fri, 07 Jan 2022 10:47:36 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id MIVmNDcM2GGz/AAAG6o9tA (envelope-from ) for ; Fri, 07 Jan 2022 10:47:35 +0100 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 6D39E194D9 for ; Fri, 7 Jan 2022 10:47:35 +0100 (CET) Received: from localhost ([::1]:53778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5lqQ-0001Pn-Kx for larch@yhetil.org; Fri, 07 Jan 2022 04:47:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5lm2-0003wj-Rp for guix-patches@gnu.org; Fri, 07 Jan 2022 04:43:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50187) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5lm1-00028Q-SQ for guix-patches@gnu.org; Fri, 07 Jan 2022 04:43:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n5lm1-0004L7-OF for guix-patches@gnu.org; Fri, 07 Jan 2022 04:43:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53072] [PATCH] gnu: Add gpaste at v3.42.2. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Jan 2022 09:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53072 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53072@debbugs.gnu.org Cc: Attila Lendvai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164154852416594 (code B ref -1); Fri, 07 Jan 2022 09:43:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jan 2022 09:42:04 +0000 Received: from localhost ([127.0.0.1]:43090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5ll6-0004JZ-3s for submit@debbugs.gnu.org; Fri, 07 Jan 2022 04:42:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:44674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5ll4-0004JC-12 for submit@debbugs.gnu.org; Fri, 07 Jan 2022 04:42:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5ll3-0002Lm-K3 for guix-patches@gnu.org; Fri, 07 Jan 2022 04:42:01 -0500 Received: from [2a00:1450:4864:20::533] (port=46852 helo=mail-ed1-x533.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5ll1-0001zS-JB for guix-patches@gnu.org; Fri, 07 Jan 2022 04:42:01 -0500 Received: by mail-ed1-x533.google.com with SMTP id k15so19776098edk.13 for ; Fri, 07 Jan 2022 01:41:58 -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=/+22gXZIvq7zHVHbotXE1zt9J7+QAPy7jVGxg/gWqgw=; b=INH50D4rVHq/cqIoj22IvTkFTLNMpTtHeN5mDGOpe6T+BqwDq3Ey1iqvf9A3TeUrV6 mq4oGftQ/+W+Jsv93e6rPRWVBZU5SzZ35dN5M3QARMgUCrrEyFOOh7LHbYlsgcoQDuVS fyv0x6I0OzNAMfSNe5zY/6Pns+FZSEZRU4QzCGnaXubmJV1Gs6uBOor1Me2Swrfywkoy i5RJCD9EG2xYvjDfKk7KYgqjQrBCJXG6BCcMfDCFFVbxoZDXYKO3+8QTkoG81Cfm6UaP 4PKQkItiMTx0YH55f74JJpw2ZLjBsBBOdGUBAA59RZPgdE/wD9m+I+4h0iZNmb4RAAfP Qmhg== 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=/+22gXZIvq7zHVHbotXE1zt9J7+QAPy7jVGxg/gWqgw=; b=Gc/VHI4HKGQyKXjYroQi/7s7gAQ89p3YajthHgveWpIH0n3thRYElie0T8Kw7V+b9+ WF0J7pHmNRWbJC0hVbm4JEdM93Uw+v57c4qjV6ThWbNE8Ebo0cGNwRrmw4msra7eFPJc E2Fp+S4hjYV/kMgCHzwjIYsDJpBFMWnWmK3aapOE6aSFDQVgejfGOsH/LWTiJQq0VUP2 CX+N3N5A75rQbw8Sdt2T8Z6I0BzcPMT2UVOzJUln9oQ+BSrtbMTcecNOd3rFsWpHpV8v BA4mpri987ySWi54fXtKM1rTSEpP5+TPcIwY1cCM32pa4WduHFmudXaTJTAyrdJkQRkm hfoA== X-Gm-Message-State: AOAM533zxORKriFLSfMBZT8dymMz761rz5wkLh1kc28JsWlF30yeEcN2 gTjvoOQ3nLul/hX2jT4jMQz8IGxfzJ4= X-Google-Smtp-Source: ABdhPJx2IsJ6iohc+wfIRKPgeN2nwnThzGLZsZVp2q6T7utkn6JKzoVoaLlmgTAHV3quWHPki8h/ZA== X-Received: by 2002:a50:ab1a:: with SMTP id s26mr5565042edc.182.1641548516931; Fri, 07 Jan 2022 01:41:56 -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 ga10sm299824ejc.12.2022.01.07.01.41.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 01:41:55 -0800 (PST) From: Attila Lendvai Date: Fri, 7 Jan 2022 10:39:12 +0100 Message-Id: <20220107093911.17095-1-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::533 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=attila.lendvai@gmail.com; helo=mail-ed1-x533.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641548855; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=/+22gXZIvq7zHVHbotXE1zt9J7+QAPy7jVGxg/gWqgw=; b=JbLuuW4b+e/074r72vSXMsFNM60d0k9fB9/fILLl3RGRJlJtFtA2bWmURQ5uvq9DvcqBC0 Mr83b0YZYMy0u+KaAJXTPE4iyP7WYQz8+NyiSwm91IqwNSPfIQf/H15uDGrbQfAwic/hbm ywgqe/fYR86WhjYDCNJi3a4ByQj6WxF/1qNFVBtAcwIXEZyvC5sirhQdl3CB3bNbbHBy92 jx6Tl9f1FgzKj8vSq4hqcqDrluqhFbpu5kq4yb+CQYCUCLgoa11gW3xZ49yp0k0PohdoW1 JZZYFHvglvjusHNdGvHmmosi+mARTTth8apqa6DUup+iA8CPHccrbA/AN5ATfg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641548855; a=rsa-sha256; cv=none; b=CBNsdFjXJZZc4U9Yo5pvwPZFjsxkhUMxIBJBdcVG2tOVGPu3WLMSblMQYfjUWKG9gjQhBG LzBp4fBVfp/c7Qvb0oKrz50Ql0LWsb5ahuhKd6+JJt+IAzBennmTYmraNmW8F6pEnxaLKn aM3gyGZdf2Xat68RPYyNYjCTdW8BNXbhJTVZ8cMAs3mJiA6+qEm0y5X8omD4fVDL17vCIP NHcz02uKFHz7y8rhNy70s+xJ/Xu97syXwTwt3HJykmUiOcm3HdBVLzLU/BtAYqYBcbuR6R lyCaPwufUAAjbssAPLdDTJvU4jn1ze70ywtPd4bWq0TWApCaQJhv2KYzPYGdkQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=INH50D4r; dmarc=none; 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" X-Migadu-Spam-Score: -3.10 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=INH50D4r; dmarc=none; 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" X-Migadu-Queue-Id: 6D39E194D9 X-Spam-Score: -3.10 X-Migadu-Scanner: scn0.migadu.com X-TUID: F3ZL4z+8vt/v * gnu/packages/gnome-xyz.scm (gpaste): New variable. --- this is rather fresh, and i just started to use it on my everyday install, so i recommend some grace period and/or extensive testing before applying. i'm opening this issue nevertheless, so that i can link to it from the gpaste discussions and that others don't waste their time packaging it yet again. gnu/local.mk | 1 + gnu/packages/gnome-xyz.scm | 61 +++++++++++++++++++++ gnu/packages/patches/gpaste-fix-paths.patch | 39 +++++++++++++ 3 files changed, 101 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..4d8bb77bc9 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,65 @@ (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 + #: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/"))) + (substitute* "src/libgpaste/settings/gpaste-settings.c" + (("@gschemasCompiled@") + (string-append out "/share/glib-2.0/schemas")))))) + (add-after 'install 'compile-schemas + (lambda* (#:key outputs #:allow-other-keys) + (invoke "glib-compile-schemas" + (string-append (assoc-ref outputs "out") + "/share/glib-2.0/schemas"))))))) + (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..cc8a83b5af --- /dev/null +++ b/gnu/packages/patches/gpaste-fix-paths.patch @@ -0,0 +1,39 @@ +This is copied verbatim 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; +--- a/src/libgpaste/settings/gpaste-settings.c ++++ b/src/libgpaste/settings/gpaste-settings.c +@@ -1013,7 +1013,11 @@ + } + else + { +- return g_settings_new (G_PASTE_SETTINGS_NAME); ++ // library used by introspection requires schemas but we cannot set XDG_DATA_DIRS for the library ++ GSettingsSchemaSource *schema_source = g_settings_schema_source_new_from_directory ("@gschemasCompiled@", NULL, FALSE, NULL); ++ g_autoptr (GSettingsSchema) schema = g_settings_schema_source_lookup (schema_source, G_PASTE_SETTINGS_NAME, FALSE); ++ g_settings_schema_source_unref (schema_source); ++ return g_settings_new_full (schema, NULL, NULL); + } + } + \ No newline at end of file -- 2.34.0