From patchwork Thu Sep 21 19:37:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 54144 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 8CD9127BBEA; Thu, 21 Sep 2023 23:53:10 +0100 (BST) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 52F7527BBE9 for ; Thu, 21 Sep 2023 23:53:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjSXU-0005g5-Lk; Thu, 21 Sep 2023 18:52:52 -0400 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 1qjSXU-0005fL-2H for guix-patches@gnu.org; Thu, 21 Sep 2023 18:52:52 -0400 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 1qjSXT-0004Ve-PE for guix-patches@gnu.org; Thu, 21 Sep 2023 18:52:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qjSXd-0003uG-Vm for guix-patches@gnu.org; Thu, 21 Sep 2023 18:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65031] [PATCH v2] gnu: Add syncplay. References: <20230803061517.27336-1-aurtzy@gmail.com> In-Reply-To: <20230803061517.27336-1-aurtzy@gmail.com> Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Sep 2023 22:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65031 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 65031@debbugs.gnu.org Cc: aurtzy Received: via spool by 65031-submit@debbugs.gnu.org id=B65031.169533672414948 (code B ref 65031); Thu, 21 Sep 2023 22:53:01 +0000 Received: (at 65031) by debbugs.gnu.org; 21 Sep 2023 22:52:04 +0000 Received: from localhost ([127.0.0.1]:34961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjSWf-0003sV-LV for submit@debbugs.gnu.org; Thu, 21 Sep 2023 18:52:04 -0400 Received: from mail-qk1-x730.google.com ([2607:f8b0:4864:20::730]:58555) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjQTl-00009T-8I for 65031@debbugs.gnu.org; Thu, 21 Sep 2023 16:40:57 -0400 Received: by mail-qk1-x730.google.com with SMTP id af79cd13be357-76ef6d98d7eso88432385a.0 for <65031@debbugs.gnu.org>; Thu, 21 Sep 2023 13:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695328836; x=1695933636; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Et+hi0p4lanzoPCGNJwwRIazpY3P3f+h+NYp6NFZUz8=; b=QmdXWm3F0zhOzulokVnb5YefCQjgf5e1I2JOqDHNiL0w2OQ2IZllv5DHEhJZpMEnnS qDWMeFRhmR353wfkXDego6P2txgMUSipwvQ2Y4l6nKnUneSCy0Ojv2JDfvM36ntfjh7i rxo9o+yHTdPD7cD6l8PhvnV5VW2dQ0l/re1S77E/2B8pJF0Fy8/OZVlMNuGnbboaDu4B VEyofz9mcZjGWSj7t/ETZwpNncemJZ2MxllKIFOp+j9XRaG9irnL38b8d7KuPbDvZ6WN uiW3VRtRD/xoMdMCzDngSIartb30UBZ4O5XzuG+8XNAWjeV2NXPFkrEaMxe950G+oEnI KPLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695328836; x=1695933636; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Et+hi0p4lanzoPCGNJwwRIazpY3P3f+h+NYp6NFZUz8=; b=j3YjueW7lCDleqVntb004oUjg4LvxLL3dorFOEO1xwLA6FvAfDrWsuP93xSBMPODcv zp2D9UVSLR89eGDQ48uqywcudrGNwwZWgyWSAMcfmRF24CCx/6XWWEW1KIF1NVLLsb1f ih6t26sFIAqJOZRsaR1CQbPoYDdlRLIc3UteWC988mMioPb8YoFyRjAlNKNY71StM6b5 +Q9FYZ6sG63/N33BPOJHrQe7GoHq93PM6hgUAOcHPf/GSUE3KfFn6CuxM4Ny7cNKXMNG qC5LlIr32fIOFvYhYwuw+bbtxUSL5B3pL3GC1FGmXLYDindtahBP4wEjzP5xprFkKtgl 89pA== X-Gm-Message-State: AOJu0YzL6JKub6OVABwLcZc0H6RBVFPk/SusT4tdH6Mv2KyMaaSrMTU0 6BAzG0FeWx4DvF8EbFHthWme2EiQGDS8ETJbc94= X-Google-Smtp-Source: AGHT+IHFnkqDzg3KEZ8rc99FwWGmpGD3qSBn8zfj4D1JjVNKAJZDBhVzc+p0DnBz7/osVebE4l5tBQ== X-Received: by 2002:a05:620a:408d:b0:76f:1230:3187 with SMTP id f13-20020a05620a408d00b0076f12303187mr8350772qko.67.1695328836343; Thu, 21 Sep 2023 13:40:36 -0700 (PDT) Received: from al-laptop.stonybrook.edu ([129.49.100.0]) by smtp.gmail.com with ESMTPSA id g24-20020a05620a13d800b0076f18be9a64sm881670qkl.81.2023.09.21.13.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 13:40:35 -0700 (PDT) From: aurtzy Date: Thu, 21 Sep 2023 15:37:06 -0400 Message-ID: <20230921203812.3649-2-aurtzy@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 21 Sep 2023 18:51:57 -0400 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/networking.scm (syncplay): New variable. * gnu/packages/patches/syncplay-fix-typeerror.patch: New file. --- > Is it compatible with Qt 6? To try it, replace qtwayland-5 with > qtwayland, and specify a #:qtbase qtbase argument. Looks like it is! #:qtbase doesn't seem to be supported by gnu-build-system or python-build-system (switched to the latter for this v2; elaborated further below) and I had to make a few other adjustments to get it working, so I may need advice if I've missed anything here. A patch has been added to fix a Qt 6 issue causing Syncplay to crash. > These should be inputs, not propagated-inputs, unless it can be used as > a library? Also, please sort the inputs alphabetically. Fixed; not a library. It appears I was using an inappropriate build system for this package - I originally made them propagated because gnu-build-system wasn't doing whatever wrapping python-build-system does to make the inputs available, so this v2 uses python-build-system instead now. Best, aurtzy gnu/packages/networking.scm | 54 +++++++++++++++++++ .../patches/syncplay-fix-typeerror.patch | 25 +++++++++ 2 files changed, 79 insertions(+) create mode 100644 gnu/packages/patches/syncplay-fix-typeerror.patch diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c1cab1fe0d..a7fde61ea8 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -60,6 +60,7 @@ ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023 aurtzy ;;; ;;; This file is part of GNU Guix. ;;; @@ -4700,3 +4701,56 @@ (define-public dropwatch recording packets that are dropped by the kernel. It provides the commands @command{dropwatch} and @command{dwdump}.") (license license:gpl2+))) + +(define-public syncplay + (package + (name "syncplay") + (version "1.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Syncplay/syncplay.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "061kpnb48lad8rr8v58xac33mwpbrixfbhn7d0xa63zpxg43bvsd")) + (patches (search-patches "syncplay-fix-typeerror.patch")))) + (build-system python-build-system) + (arguments + (list #:imported-modules `(,@%python-build-system-modules + (guix build qt-utils) + (guix build utils)) + #:modules '((guix build python-build-system) + (guix build qt-utils) + (guix build utils)) + #:phases #~(modify-phases %standard-phases + (delete 'check) + (replace 'install + (lambda _ + (invoke "make" "install" "DESTDIR=" + (string-append "PREFIX=" + (assoc-ref %outputs "out"))))) + (add-after 'install 'wrap-qt + (lambda* (#:key inputs #:allow-other-keys) + (wrap-qt-program "syncplay" + #:output #$output + #:inputs inputs + #:qt-major-version "6")))))) + (native-inputs (list python-pyside-6)) + (inputs (list bash-minimal + python-certifi + python-idna + python-service-identity + python-twisted + qtwayland)) + (home-page "https://syncplay.pl") + (synopsis "Client/server to synchronize media playback on many computers") + (description + "Syncplay is a solution to synchronize video playback across multiple +instances of media players over the Internet. When one person pauses/unpauses +playback or skips to a position in the video, this is replicated across all +media players connected to the same server and in the same \"room\" (viewing +session). A built-in text chat for discussing the synced media is also +included for convenience.") + (license license:asl2.0))) diff --git a/gnu/packages/patches/syncplay-fix-typeerror.patch b/gnu/packages/patches/syncplay-fix-typeerror.patch new file mode 100644 index 0000000000..6b1168a0e9 --- /dev/null +++ b/gnu/packages/patches/syncplay-fix-typeerror.patch @@ -0,0 +1,25 @@ +From b62b038cdf58c54205987dfc52ebf228505ad03b Mon Sep 17 00:00:00 2001 +From: Etoh +Date: Tue, 11 Apr 2023 20:22:52 +0100 +Subject: [PATCH] Fix ArchLinux GUI TypeError (#600) + +--- + syncplay/ui/gui.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py +index 7c100542..ca0f5d4a 100755 +--- a/syncplay/ui/gui.py ++++ b/syncplay/ui/gui.py +@@ -2106,7 +2106,10 @@ def __init__(self, passedBar=None): + if isMacOS(): + self.setWindowFlags(self.windowFlags()) + else: +- self.setWindowFlags(self.windowFlags() & Qt.AA_DontUseNativeMenuBar) ++ try: ++ self.setWindowFlags(self.windowFlags() & Qt.AA_DontUseNativeMenuBar) ++ except TypeError: ++ self.setWindowFlags(self.windowFlags()) + self.setWindowTitle("Syncplay v" + version + revision) + self.mainLayout = QtWidgets.QVBoxLayout() + self.addTopLayout(self)