From patchwork Tue Jan 25 19:37:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 36813 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 57B1D27BBEA; Tue, 25 Jan 2022 19:40:56 +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 1EDE627BBE9 for ; Tue, 25 Jan 2022 19:40:56 +0000 (GMT) Received: from localhost ([::1]:33022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nCRgV-0005XD-8i for patchwork@mira.cbaines.net; Tue, 25 Jan 2022 14:40:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCRdi-0004XT-FC for guix-patches@gnu.org; Tue, 25 Jan 2022 14:38:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57286) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nCRdi-0002Vu-5u for guix-patches@gnu.org; Tue, 25 Jan 2022 14:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nCRdi-0001eo-4f for guix-patches@gnu.org; Tue, 25 Jan 2022 14:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53531] [PATCH 1/2] WIP: qsyncthingtray: Use QtWebEngine instead of QtWebKit. References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Jan 2022 19:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53531 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 53531@debbugs.gnu.org Received: via spool by 53531-submit@debbugs.gnu.org id=B53531.16431394586332 (code B ref 53531); Tue, 25 Jan 2022 19:38:02 +0000 Received: (at 53531) by debbugs.gnu.org; 25 Jan 2022 19:37:38 +0000 Received: from localhost ([127.0.0.1]:50187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCRdK-0001dz-BG for submit@debbugs.gnu.org; Tue, 25 Jan 2022 14:37:38 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:41375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCRdJ-0001de-Ei for 53531@debbugs.gnu.org; Tue, 25 Jan 2022 14:37:37 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 5645E5C016C; Tue, 25 Jan 2022 14:37:32 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 25 Jan 2022 14:37:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=mesmtp; bh=b9F9LxzH/tGCNOFFbShKpsVndf/aIZVbFRBAXiAdrxk=; b=fw 4pUmAQQZ2PRLTmqE2v1wPyQIppZu7tnilsBEVdadAr6LmCuTkmRWW2zbXd/KyvsI u00ZFA3RAe+at/9NHhOWKVdWW/Ei62II3QZqRz1NiESj1//q53Ym7mGt9vrAulcR oLVN8adcXukzn1YZ74sQeS+/2liCFfaCvdCun6fzs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=b9F9LxzH/tGCNOFFbShKpsVndf/aI ZVbFRBAXiAdrxk=; b=HrYLS5N6VXlsdzS07m79k27DwGRiOCgQwaXj6yHYnmq7u igF0KJu7ejeJyHKzZ203/c+0jQtb5kNoNU8BMv1uWQdMtu9Nwn897jJbmfnnjApN edaPMfAtDeyPOGYo9f4oZnIMIksX0cWM3CH35ML2L4pORa8HMgIurCx0NALAsYBE DTOIH/WubXDZJ3BAi3svH/LUxKfEVYVztGo1x90ndVPrwQ3JqdjBEZpyKqGDRqn0 z8+r6G25rGcwP84MhUEnUbHOe4E6yWyyo9jcyJywHgvX+ZtCo8XR/Oi/s25nL+5M 24WcNhTj547uDm9WmF4UTPY0S7puFoa2aGBZUyDRg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrvdelgdduvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhi rdhnrghmvgeqnecuggftrfgrthhtvghrnhepgeevfedtgefgveeggffhfedulefgudeitd ekhfeggeevheefjeehuefffeehveeinecuffhomhgrihhnpehgihhthhhusgdrtghomhen ucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghose hfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <53531@debbugs.gnu.org>; Tue, 25 Jan 2022 14:37:32 -0500 (EST) From: Leo Famulari Date: Tue, 25 Jan 2022 14:37:26 -0500 Message-Id: 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 This doesn't work. When trying to launch the web view from the tray icon, QSyncthingTray crashes like this: ------ Could not find QtWebEngineProcess Aborted ------ * gnu/packages/sync.scm (qsyncthingtray)[arguments]: Remove Webkit-related argument from #:configure-flags. [inputs]: Remove qtwebkit. Add qtdeclarative, qtwebchannel, and qtwebengine. --- gnu/packages/sync.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 165be17e4c..d9c91804b5 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -378,8 +378,7 @@ (define-public qsyncthingtray "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w")))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DQST_BUILD_WEBKIT=1") - #:phases + `(#:phases (modify-phases %standard-phases ;; The program is meant to be run from the git repo or source tarball. (replace 'install @@ -394,7 +393,7 @@ (define-public qsyncthingtray #t)))) #:tests? #f)) ; no test target (inputs - (list qtbase-5 qtwebkit)) + (list qtbase-5 qtdeclarative qtwebchannel qtwebengine)) (home-page "https://github.com/sieren/QSyncthingTray") (synopsis "Traybar Application for Syncthing") (description From patchwork Tue Jan 25 19:37:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 36812 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 C180A27BBEA; Tue, 25 Jan 2022 19:38:35 +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 4803F27BBE9 for ; Tue, 25 Jan 2022 19:38:35 +0000 (GMT) Received: from localhost ([::1]:59938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nCReE-0004cb-Cc for patchwork@mira.cbaines.net; Tue, 25 Jan 2022 14:38:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCRdi-0004XV-RN for guix-patches@gnu.org; Tue, 25 Jan 2022 14:38:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57287) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nCRdi-0002W1-Hy for guix-patches@gnu.org; Tue, 25 Jan 2022 14:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nCRdi-0001ev-Gq for guix-patches@gnu.org; Tue, 25 Jan 2022 14:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53531] [PATCH 2/2] gnu: QSyncthingTray: Deprecate in favor of Debian's syncthing-gtk fork. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Jan 2022 19:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53531 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 53531@debbugs.gnu.org Received: via spool by 53531-submit@debbugs.gnu.org id=B53531.16431394636343 (code B ref 53531); Tue, 25 Jan 2022 19:38:02 +0000 Received: (at 53531) by debbugs.gnu.org; 25 Jan 2022 19:37:43 +0000 Received: from localhost ([127.0.0.1]:50189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCRdO-0001eE-LZ for submit@debbugs.gnu.org; Tue, 25 Jan 2022 14:37:42 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:56751) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCRdJ-0001dh-NM for 53531@debbugs.gnu.org; Tue, 25 Jan 2022 14:37:38 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 9BF955C01A1; Tue, 25 Jan 2022 14:37:32 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 25 Jan 2022 14:37:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=mesmtp; bh=qMaIzJ5uIHlxfiyu35WStI9Yrts t3Ehiyrp9HI7v/co=; b=EWPYHarEpHW7rS9zVVvsTnaKpbSeR4zAsS5lDpC+1HE dAbJOEpNIl4QAgWJesTF31QK0TQxL9k+eYsZc0UQg3r3eNDRkKWudCE+Kzdq0fDT zoY6lHfHjOi9LbGncGYe+Ha+eGGEPH2S/7pupGV2W0y7Fj6q8A47QFKJeJILj8FY = DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=qMaIzJ 5uIHlxfiyu35WStI9Yrtst3Ehiyrp9HI7v/co=; b=PKGZszUuGL8DXWM0CU3WE0 tWhg1ByMaHGtuT3QxRd9GBYnQFhOeHiZ1IzXJSkpJJWWBeYrnvmIF8saf1bAwf8k ftVABYXg7CrfA3KckvRzlFw9OyXDoUZkv1xH/pOBCKIKhc2nMF7voZyd3/n8hnBm pL6COSudKhNRnpEkyAKsECu28bAdTCkkoR1dRVFcGP8vwb4rz4NIgQZNTME6dNYi AJnaLr/soYcdytM/Nb5kZ35pkTqt77vUCDyl4xjqByzoke94tQHImWrKgmz8whCd qwSXjmhedfppAzfWod1dtq5AM/hMdMaKWbIhGgeUgfNYl9i0O67qnxUN2QS26yOw == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrvdelgdduvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnheptdffjeejueduheeuteehiedvvdeitd eigeetvddujeejledtheffhfehtdehledtnecuffhomhgrihhnpehgihhthhhusgdrtgho mhdpghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <53531@debbugs.gnu.org>; Tue, 25 Jan 2022 14:37:32 -0500 (EST) From: Leo Famulari Date: Tue, 25 Jan 2022 14:37:27 -0500 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: References: 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 This package is abandoned upstream and depends on the insecure and abandoned QtWebKit. Upstream abandonment: https://github.com/sieren/QSyncthingTray/issues/247 See for more information about this change * gnu/packages/sync.scm (qsyncthingtray): Move this variable ... * gnu/packages/syncthing.scm (qsyncthingtray): ... to here. And make it into a deprecated-package that points to syncthing-gtk. --- gnu/packages/sync.scm | 51 -------------------------------------- gnu/packages/syncthing.scm | 3 +++ 2 files changed, 3 insertions(+), 51 deletions(-) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index d9c91804b5..db0e001658 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -362,57 +362,6 @@ (define-public owncloud-client silently and reliably flow across to every other.") (license license:gpl2+))) -(define-public qsyncthingtray - (package - (name "qsyncthingtray") - (version "0.5.8") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sieren/QSyncthingTray") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w")))) - (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; The program is meant to be run from the git repo or source tarball. - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "QSyncthingTray" bin) - (mkdir-p (string-append out "/share/pixmaps")) - (copy-file "../source/resources/images/Icon1024.png" - (string-append - out "/share/pixmaps/QSyncthingTray.png")) - #t)))) - #:tests? #f)) ; no test target - (inputs - (list qtbase-5 qtdeclarative qtwebchannel qtwebengine)) - (home-page "https://github.com/sieren/QSyncthingTray") - (synopsis "Traybar Application for Syncthing") - (description - "A traybar application for syncthing. -@enumerate -@item Shows number of connections at a glance. -@item Traffic statistics about incoming, outgoing and total throughput. -@item Launches Syncthing and Syncthing-iNotifier if specified. -@item Quickly pause Syncthing with one click. -@item Last Synced Files - Quickly see the recently synchronised files and open -their folder. -@item Quick Access to all shared folders. -@item Presents Syncthing UI in a separate view instead of using the browser. -@item Supports authenticated HTTPS connections. -@item Uses System Notifications about current connection status. -@item Toggle for monochrome icon. -@end enumerate\n") - (license license:lgpl3+))) - (define-public lsyncd (package (name "lsyncd") diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index c19cc97862..c96d5cc3f2 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -217,6 +217,9 @@ (define-public syncthing-gtk @end itemize\n") (license gpl2)))) +(define-public qsyncthingtray + (deprecated-package "qsyncthingtray" syncthing-gtk)) + (define-public go-github-com-jackpal-go-nat-pmp (package (name "go-github-com-jackpal-go-nat-pmp")