Andy Tai <atai@HIDDEN>
to control <at> debbugs.gnu.org
.
Full text available.Received: (at submit) by debbugs.gnu.org; 13 May 2024 15:43:41 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon May 13 11:43:41 2024 Received: from localhost ([127.0.0.1]:33380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1s6Xq0-00008U-GE for submit <at> debbugs.gnu.org; Mon, 13 May 2024 11:43:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:48402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lichengtai@HIDDEN>) id 1s6Xpy-00008O-Jq for submit <at> debbugs.gnu.org; Mon, 13 May 2024 11:43:39 -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 <lichengtai@HIDDEN>) id 1s6Xpw-0005r0-UO for guix-patches@HIDDEN; Mon, 13 May 2024 11:43:37 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <lichengtai@HIDDEN>) id 1s6Xpu-000060-EQ for guix-patches@HIDDEN; Mon, 13 May 2024 11:43:36 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1e50a04c317so23775135ad.1 for <guix-patches@HIDDEN>; Mon, 13 May 2024 08:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715615012; x=1716219812; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=WmdKFgNDt6PXU2vKqkOQjvGUU7NoZsfwPLLRuEtcbPU=; b=HOZ2MiwND3ytocpY7VZ2IADdZEACnQoZ0U3pPdN/igg+jdNNzr3ZOVjCWhQu9WBtob QYO8yM6w8niGfNjXwA18tgXzI6dKFSKzw9B81HOQPgQE0TTztHXP1O9EWJKxWeoEHGCR 21BnSYFocvORZNq7mXKjRuxDb4dr9UCDc6Vv2JJ/KNDpEK5+0CeaoRkIB+00vUZVsC7u a4A+jY0V8pZC8VjqrhJ6PrQMyTWYGgTquGgI/qpiKAOmllUCMMwDToPnrwFc4r9OIHbt NMb/+5BIjulDuItuOutaTa2HQlJD8PbDfMwN4LpsHds6Pd8hDG/PrhzyflDYGblcsyY2 z4Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715615012; x=1716219812; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=WmdKFgNDt6PXU2vKqkOQjvGUU7NoZsfwPLLRuEtcbPU=; b=UWhtrbmWwSSSVefJeV21Ihyownyo1/UOnBFME16tzPWDI/p9SVgh65KT6Vs84y+/B5 CfoylyMBHt8lSinMJe7U2n/C22Pl5JDcQbgdkcpan8UCwmR40qyC1uHD80viVwoT3vG+ ureBAO1oxlWNNwOsusIjaRmQml/Aaw+MrruJ4BW0050sYf/JNDf2WWALXtz8icIpx0+W +4laDcWsFjUfRFs6Wy8JrJeELAxZYAOI542uA2bwGu1vrF9LQpEWbh8ljJcGUFTjExBE JvL/1UBdFXitBl4KbTLOt+B4BmC76/9EO5+YVeWAYCUj25WzEGb2AcnesW/F641HOXhJ F5ag== X-Gm-Message-State: AOJu0YwRWyr9lYf7c6WtQOhL6x9fyw0yYB5zgyzjZQrpF39x4WfwKdsj 8GjxME2amKSuozq/heAdp7yrDR4HGu/HfRjsKceiCSVoEQL8DuB8/GQUPg== X-Google-Smtp-Source: AGHT+IGAleiKHDdCUYM1amQ3Bln2+H69mzdI8/0I2pdmtyJ9R6fJuyhgYleyvJdzJ73TIVpMKHCdeA== X-Received: by 2002:a17:903:2d1:b0:1ea:201:5843 with SMTP id d9443c01a7336-1ef43c0e8f2mr132791015ad.6.1715615012112; Mon, 13 May 2024 08:43:32 -0700 (PDT) Received: from DEskMiniX300.. (c-98-37-226-154.hsd1.ca.comcast.net. [98.37.226.154]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c25683dsm80130335ad.299.2024.05.13.08.43.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 08:43:31 -0700 (PDT) From: Andy Tai <atai@HIDDEN> To: guix-patches@HIDDEN, 70881 <at> debbugs.gnu.org, ngraves@HIDDEN Subject: [PATCH v2] gnu: xpra: Update to 6.0. Date: Mon, 13 May 2024 08:43:29 -0700 Message-Id: <5ebbe8944573e337c0e1562ef1e603e214807dbc.1715614980.git.atai@HIDDEN> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=lichengtai@HIDDEN; helo=mail-pl1-x630.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.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.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit Cc: Andy Tai <atai@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.1 (--) * gnu/packages/xorg.scm (xpra): Update to 6.0. [inputs]: Add xxhash. [native-inputs]: Change python-cython to python-cython-3. * gnu/packages/patches/xpra-6.0-install_libs.patch: New file. * gnu/packages/patches/xpra-6.0-systemd-run.patch: New file. * gnu/packages/patches/xpra-5.0-install_libs.patch: Removed. * gnu/packages/patches/xpra-5.0-systemd-run.patch: Removed. * gnu/local.mk (dist_patch_DATA): Update accordingly Change-Id: Ic8ec98296220aebabb3d94951e11a3c957a8fcbc --- gnu/local.mk | 4 +-- ...libs.patch => xpra-6.0-install_libs.patch} | 30 +++++++++---------- ...d-run.patch => xpra-6.0-systemd-run.patch} | 12 ++++---- gnu/packages/xorg.scm | 12 ++++---- 4 files changed, 30 insertions(+), 28 deletions(-) rename gnu/packages/patches/{xpra-5.0-install_libs.patch => xpra-6.0-install_libs.patch} (67%) rename gnu/packages/patches/{xpra-5.0-systemd-run.patch => xpra-6.0-systemd-run.patch} (90%) diff --git a/gnu/local.mk b/gnu/local.mk index 439fe587b0..bc0fe77e93 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2231,8 +2231,8 @@ dist_patch_DATA = \ %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \ %D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch \ - %D%/packages/patches/xpra-5.0-systemd-run.patch \ - %D%/packages/patches/xpra-5.0-install_libs.patch \ + %D%/packages/patches/xpra-6.0-systemd-run.patch \ + %D%/packages/patches/xpra-6.0-install_libs.patch \ %D%/packages/patches/xsane-fix-memory-leak.patch \ %D%/packages/patches/xsane-fix-pdf-floats.patch \ %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \ diff --git a/gnu/packages/patches/xpra-5.0-install_libs.patch b/gnu/packages/patches/xpra-6.0-install_libs.patch similarity index 67% rename from gnu/packages/patches/xpra-5.0-install_libs.patch rename to gnu/packages/patches/xpra-6.0-install_libs.patch index 4d40bf1f79..c608b519f4 100644 --- a/gnu/packages/patches/xpra-5.0-install_libs.patch +++ b/gnu/packages/patches/xpra-6.0-install_libs.patch @@ -4,39 +4,39 @@ This workaround for Gentoo interferes with our use of --no-compile during the 'install stage. diff --git a/setup.py b/setup.py -index e254bf99c..90db55c3f 100755 +index 4f066fa8bf..14a9ed65ed 100755 --- a/setup.py +++ b/setup.py -@@ -663,8 +663,6 @@ if modules_ENABLED: +@@ -760,8 +760,6 @@ if modules_ENABLED: # Utility methods for building with Cython - - def add_cython_ext(*args, **kwargs): + + def do_add_cython_ext(*args, **kwargs): - if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv): - return if not cython_ENABLED: raise ValueError(f"cannot build {args}: cython compilation is disabled") if cython_tracing_ENABLED: -@@ -1809,9 +1807,6 @@ else: +@@ -1971,9 +1969,6 @@ else: if root_prefix.endswith("/usr"): - #ie: "/" or "/usr/src/rpmbuild/BUILDROOT/xpra-0.18.0-0.20160513r12573.fc23.x86_64/" + # ie: "/" or "/usr/src/rpmbuild/BUILDROOT/xpra-0.18.0-0.20160513r12573.fc23.x86_64/" root_prefix = root_prefix[:-4] - for x in sys.argv: - if x.startswith("--root="): - root_prefix = x[len("--root="):] - print(f"install_data_override.run() root_prefix={root_prefix}") + print(f" root_prefix={root_prefix!r}") build_xpra_conf(root_prefix) - -@@ -1955,13 +1950,6 @@ else: + +@@ -2116,13 +2111,6 @@ else: if uinput_ENABLED: add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"]) - -- #gentoo does weird things, calls --no-compile with build *and* install -- #then expects to find the cython modules!? ie: + +- # gentoo does weird things, calls --no-compile with build *and* install +- # then expects to find the cython modules!? ie: - #> python2.7 setup.py build -b build-2.7 install --no-compile \ - # --root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7 -- #otherwise we use the flags to skip pkgconfig -- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv): +- # otherwise we use the flags to skip pkgconfig +- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv): # noqa: E501 - pkgconfig = no_pkgconfig - + if OSX and "py2app" in sys.argv: import py2app #@UnresolvedImport diff --git a/gnu/packages/patches/xpra-5.0-systemd-run.patch b/gnu/packages/patches/xpra-6.0-systemd-run.patch similarity index 90% rename from gnu/packages/patches/xpra-5.0-systemd-run.patch rename to gnu/packages/patches/xpra-6.0-systemd-run.patch index 437a8cc37f..2d60c29423 100644 --- a/gnu/packages/patches/xpra-5.0-systemd-run.patch +++ b/gnu/packages/patches/xpra-6.0-systemd-run.patch @@ -3,12 +3,12 @@ Distriction specific patch, not going upstream Disable systemd-run if the command is not found. diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py -index 3813331a5..46e2c83a6 100755 +index 1c5e8ddaad..084aabe792 100755 --- a/xpra/scripts/main.py +++ b/xpra/scripts/main.py -@@ -337,23 +337,26 @@ def use_systemd_run(s) -> bool: +@@ -396,23 +396,26 @@ def use_systemd_run(s) -> bool: cmd = ["systemd-run", "--quiet"] - if getuid()!=0: + if getuid() != 0: cmd += ["--user"] - cmd += ["--scope", "--", "true"] - proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False) @@ -30,7 +30,7 @@ index 3813331a5..46e2c83a6 100755 + r = proc.returncode except TimeoutExpired: # pragma: no cover r = None -- return r==0 +- return r == 0 + if r is None: + try: + proc.terminate() @@ -43,6 +43,6 @@ index 3813331a5..46e2c83a6 100755 + return r==0 + except FileNotFoundError: + return False - + + def verify_gir(): - try: diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 74059a2691..1f1fe4d7c6 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -76,6 +76,7 @@ (define-module (gnu packages xorg) #:use-module (gnu packages check) #:use-module (gnu packages cups) #:use-module (gnu packages compression) + #:use-module (gnu packages digest) #:use-module (gnu packages emacs) #:use-module (gnu packages flex) #:use-module (gnu packages fonts) @@ -6157,16 +6158,16 @@ (define-public xcompmgr (define-public xpra (package (name "xpra") - (version "5.0.8") + (version "6.0") (source (origin (method url-fetch) (uri (string-append "https://www.xpra.org/src/xpra-" version ".tar.xz")) (sha256 - (base32 "0ml9nv6gwrqgyrn3hp5kkxsbdl5fpz5w8vjsvn0qfdsgbvq617wy")) - (patches (search-patches "xpra-5.0-systemd-run.patch" - "xpra-5.0-install_libs.patch")))) + (base32 "1dh89k2whvim4lgnryr9hisdq2zzcc5md9c3vm49y6jsp4j77glq")) + (patches (search-patches "xpra-6.0-systemd-run.patch" + "xpra-6.0-install_libs.patch")))) (build-system python-build-system) (inputs (list bash-minimal ; for wrap-program @@ -6192,6 +6193,7 @@ (define-public xpra xf86-video-dummy xf86-input-mouse xf86-input-keyboard + xxhash python-pillow ;; Optional dependencies. libx264 @@ -6207,7 +6209,7 @@ (define-public xpra python-lz4 ; Faster compression than zlib. python-netifaces python-pycups)) - (native-inputs (list pkg-config pandoc python-cython)) + (native-inputs (list pkg-config pandoc python-cython-3)) (arguments (list #:configure-flags #~(list "--without-Xdummy" base-commit: 7ca9809cdbfe326294a5d8c64b4b8c59d0e76bea -- 2.34.1
Andy Tai <atai@HIDDEN>
:guix-patches@HIDDEN
.
Full text available.guix-patches@HIDDEN
:bug#70919
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.