From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id yHsNImMFcGfE8AAAqHPOHw:P1 (envelope-from ) for ; Sat, 28 Dec 2024 14:04:19 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id yHsNImMFcGfE8AAAqHPOHw (envelope-from ) for ; Sat, 28 Dec 2024 15:04:19 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=dLyZWxkB; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735394659; h=from:from:sender:sender:reply-to: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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=EpyBjJwVVI2T+NzorFPqpp0gampgwmsqcdL7BEcU03Q=; b=ZwkNETIDZ3IfNWDd8E3KkvMefNNGYPWNn2ZImcfIyccxsZhocYbHP8OPTb+1p1il9BagGb W3VjuLEw3Z0nFeD8rE0v4NCkrKlTKRx6TxhibTO/leHCnyVlwhPvHfroE11k7s4qaDo3// Siv+6tlbTKJsfVWoa7baZBZ5mV0B7XZZlStUHeepqr7GI03oNeMWLNMhOoh7LxfRg2gQi8 DgHq/lMuXCQ7MEjgDoD4L6Natr4FvQSAZvOTnYuMAb7TtBHMWU43xUx8m4aTlkOO/O0CdO WU7lw1dBdxcKt1E0WrIGpKK43MjI4NuE+acVcp9LHxILHFH+fbozerI0PUBNMw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=dLyZWxkB; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735394659; a=rsa-sha256; cv=none; b=tROhG4E1C0f5TiaPFHCuqnHP2zMTUuRtJwKzr0QTOcAySIa2hTaK9aaxV+evNLF3Uj8VA3 yQO5+lciMyq5+2ck7oACM3BqIXKY6jE5i2BQe1OpE4J7mq87CMoLypZwht0hb1kmxGsZUy CmmZsGMU0aePyAjS99pI+0Kc/phXKgwXY73EckfysxUXCH/CFdLrZJ964TuvebGGsp+j+K 6n/fB0kyICzMVf1X08a3uBKBwCRKT/nD+a12oBsxCq9xgjI/qg5w1imSwaRZjgc9zGsm5R 3PX+0gFRsnj3neDSXL7TP+IlTTZwVCEbAdMieultsoa3LS9JmPS1nusPCF34/Q== 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 189CE5B326 for ; Sat, 28 Dec 2024 15:04:19 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRUqZ-0006dW-HM; Sat, 28 Dec 2024 06:19:07 -0500 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 1tRUqX-0006bx-3Y for guix-patches@gnu.org; Sat, 28 Dec 2024 06:19:05 -0500 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 1tRUqW-0002fu-PS for guix-patches@gnu.org; Sat, 28 Dec 2024 06:19:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=EpyBjJwVVI2T+NzorFPqpp0gampgwmsqcdL7BEcU03Q=; b=dLyZWxkBox0z5ekFVUTli4zcV7Ri0CZ4V1bKMsgFBZzT2yD172ZXy5z4/gXZNOB6ZKaZSYZpqZ864jgUIedojUKzUzzIVARvg6d08M8J0YoZRW9K34d7kebeyp4XTOLWWTVM9225FvCCpQGLiLw3/eixJsyvRWHzh2T4f2PZg8Rcz1fKfk2VLRZaPnlK32mo2APpsrZ1O7Bg/PWKAc/jqngrOjejyWHu0hWMRM78bqhABm+eZOCdwNQ5beQgQOKJxQyW05aa1F+bSSr1BCxMZoPHCuyjBYKBUlWx9p9AVwiXhDr2CKHN89W1zHeckyQpnYqIeozi5frxfHVDoSo42w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRUqW-0007Ln-DS for guix-patches@gnu.org; Sat, 28 Dec 2024 06:19:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75160] [PATCH xorg-updates 073/109] gnu: libxt: Update to 1.3.1. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Dec 2024 11:19:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75160 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75160@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 75160-submit@debbugs.gnu.org id=B75160.173538471227991 (code B ref 75160); Sat, 28 Dec 2024 11:19:04 +0000 Received: (at 75160) by debbugs.gnu.org; 28 Dec 2024 11:18:32 +0000 Received: from localhost ([127.0.0.1]:49302 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRUq0-0007HI-8H for submit@debbugs.gnu.org; Sat, 28 Dec 2024 06:18:32 -0500 Received: from mail.envs.net ([5.199.136.28]:52812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRUo3-000752-A0 for 75160@debbugs.gnu.org; Sat, 28 Dec 2024 06:16:31 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id DEB9338A3E5E; Sat, 28 Dec 2024 11:16:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id h2Q7VBWt3KLm; Sat, 28 Dec 2024 11:16:27 +0000 (UTC) Received: from localhost (unknown [112.44.73.41]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sat, 28 Dec 2024 11:16:24 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id e5693d49; Sat, 28 Dec 2024 11:17:12 +0000 (UTC) Date: Sat, 28 Dec 2024 19:15:44 +0800 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: <2b8157bebabbffec03739fcad2c79bb7314b7173.1735384288.git.iyzsong@member.fsf.org> References: <2b8157bebabbffec03739fcad2c79bb7314b7173.1735384288.git.iyzsong@member.fsf.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches From: iyzsong--- via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 189CE5B326 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -1.19 X-Spam-Score: -1.19 X-TUID: fjisq7fFNDxY From: 宋文武 * gnu/packages/patches/libxt-guix-search-paths.patch: Adjust patch. * gnu/packages/xorg.scm (libxt): Update to 1.3.1. Change-Id: Ife5b761766c73a63413b5397286fffbd5e3e90a4 --- .../patches/libxt-guix-search-paths.patch | 17 ++++++++--------- gnu/packages/xorg.scm | 6 +++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/patches/libxt-guix-search-paths.patch b/gnu/packages/patches/libxt-guix-search-paths.patch index 61022d232a..174e68d45c 100644 --- a/gnu/packages/patches/libxt-guix-search-paths.patch +++ b/gnu/packages/patches/libxt-guix-search-paths.patch @@ -1,12 +1,12 @@ diff --git a/src/Intrinsic.c b/src/Intrinsic.c --- a/src/Intrinsic.c +++ b/src/Intrinsic.c -@@ -1345,21 +1345,99 @@ FillInLangSubs(Substitution subs, XtPerDisplay pd) +@@ -1310,21 +1310,98 @@ FillInLangSubs(Substitution subs, XtPerD } /* - * default path used if environment variable XFILESEARCHPATH -- * is not defined. Also substitued for %D. +- * is not defined. Also substituted for %D. - * The exact value should be documented in the implementation - * notes for any Xt implementation. + Return the default search path for the function @@ -65,11 +65,6 @@ diff --git a/src/Intrinsic.c b/src/Intrinsic.c + bytesAllocd += SIZEOF_STEMS; + bytesAllocd += 6 * (1 + strlen (guix_profile)); + } - -- return xfilesearchpath; --#else -- return XFILESEARCHPATHDEFAULT; --#endif + if (home != NULL) + { + bytesAllocd += SIZEOF_STEMS; @@ -107,12 +102,16 @@ diff --git a/src/Intrinsic.c b/src/Intrinsic.c + + /* Remove final : */ + path[strlen(path) - 1] = '\0'; -+ + +- return xfilesearchpath; +-#else +- return XFILESEARCHPATHDEFAULT; +-#endif + return path; } -@@ -1388,7 +1466,7 @@ XtResolvePathname(Display *dpy, +@@ -1353,7 +1430,7 @@ XtResolvePathname(Display *dpy, { XtPerDisplay pd; static const char *defaultPath = NULL; diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8adee50024..97052a7575 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5444,17 +5444,17 @@ (define-public libxcursor (define-public libxt (package (name "libxt") - (version "1.2.1") + (version "1.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libXt-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "0q1x7842r8rcn2m0q4q9f69h4qa097fyizs8brzx5ns62s7w1737")) + "120jjd6l7fjdxy5myrc1dmc0cwpqa18a97hrbg0d9x146frp99z0")) (patches (search-patches "libxt-guix-search-paths.patch")))) (build-system gnu-build-system) (outputs '("out" -- 2.46.0