[bug#53531] Deprecate QSyncthingTray in favor of syncthing-gtk

[bug#53531] Deprecate QSyncthingTray in favor of syncthing-gtk

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 88 bytes --]

This patch series deprecates QSyncthingTray in favor of Debian's fork of
syncthing-gtk.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#53531] [PATCH 1/2] WIP: qsyncthingtray: Use QtWebEngine instead of QtWebKit.

[Leo Famulari]

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
-- 
2.34.0

[bug#53531] [PATCH 2/2] gnu: QSyncthingTray: Deprecate in favor of Debian's syncthing-gtk fork.

[Leo Famulari]

This package is abandoned upstream and depends on the insecure and
abandoned QtWebKit.

Upstream abandonment:

https://github.com/sieren/QSyncthingTray/issues/247

See <https://issues.guix.gnu.org/53289> 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")
-- 
2.34.0

[bug#53531] [PATCH 2/2] gnu: QSyncthingTray: Deprecate in favor of Debian's syncthing-gtk fork.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 617 bytes --]

On Tue, Jan 25, 2022 at 02:37:27PM -0500, Leo Famulari wrote:
> This package is abandoned upstream and depends on the insecure and
> abandoned QtWebKit.
> 
> Upstream abandonment:
> 
> https://github.com/sieren/QSyncthingTray/issues/247
> 
> See <https://issues.guix.gnu.org/53289> for more information about this change

I like this idea. Although I'm not sure about keeping the first patch.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#53531] [PATCH 2/2] gnu: QSyncthingTray: Deprecate in favor of Debian's syncthing-gtk fork.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

On Wed, Jan 26, 2022 at 11:42:05AM +0200, Efraim Flashner wrote:
> I like this idea. Although I'm not sure about keeping the first patch.

I forgot to mention: the first patch is just a demonstration of why
using QtWebEngine doesn't work "out of the box".

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#53531: [PATCH 2/2] gnu: QSyncthingTray: Deprecate in favor of Debian's syncthing-gtk fork.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 546 bytes --]

On Wed, Jan 26, 2022 at 11:42:05AM +0200, Efraim Flashner wrote:
> On Tue, Jan 25, 2022 at 02:37:27PM -0500, Leo Famulari wrote:
> > This package is abandoned upstream and depends on the insecure and
> > abandoned QtWebKit.
> > 
> > Upstream abandonment:
> > 
> > https://github.com/sieren/QSyncthingTray/issues/247
> > 
> > See <https://issues.guix.gnu.org/53289> for more information about this change
> 
> I like this idea. Although I'm not sure about keeping the first patch.

Pushed as 4578ad78bee1dfd450962627ae66d3e15ebadad2

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]