From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id YKbnDHyYc2fBcgEA62LTzQ:P1 (envelope-from ) for ; Tue, 31 Dec 2024 07:08:44 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id YKbnDHyYc2fBcgEA62LTzQ (envelope-from ) for ; Tue, 31 Dec 2024 08:08:44 +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=gQGCBwS9; 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=1735628924; 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=wE8o8BHwiKLfYKTfcOVn4tySHKQZddyHbeo26+1I43M=; b=a8IddytWqZjzX2scKqYxtmY2d/M4AJCV3mbzqIVCsneV75F845FKbSFntcI7SRerqC6B0K EgNNyjXbAjX0IwLsMu/6pHHjWc1fGoxakgLixcB2AfpGDEf0XcY5Y5YQYo1E+o7KjleXiQ 336lfqjX7RVqGooYbtLngliLyOB8KcOlB1UD09nIAI/wYkv3lAD8BbslyfIjSLF4CDtW5n pNW7JI4rr4GBTuAFr8OKdxV3Ko5x0k2UExejhNg6d/GPEQ74sTcVHpjBNXgUaYd63/+lsI Nvb4L85kpK1z/MSc9bt/4iO2kmZFR5p0y+QvFtKHTFrE4FT7tpLY6yGf64S2YQ== 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=gQGCBwS9; 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=1735628924; a=rsa-sha256; cv=none; b=ar2cxkwgvIbIIGgdbBnH8s3e3Jd8DaMUEthaWmUpG54A4Qpy6N6T5C0/Fu69jxl6TQmtTB JvHZeuYXSgPtBX6lyUHW6b/qHVk+hY3UCES/EfigBIZCPJ7x8vnkFQTPfizmXwOUGxDPPW N0i2dCDJKy5eiM6ILfecY1k9VmwwxEELqQEAXQ9nXLNNTQ1HqfBHCsKovelu+KYCc9T+Bh YVat+exZAPkCEoZSgxn4Uv94IykUivxlC6VkU271lTivPwmsJt+a5XEwdCLvwHTF8775Zs e+9seJBW3z1wdC2nyxeY6mLyAIwqCSvE7ijNthqphfOwvka7+rlT3R9OwMzXoA== 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 07D681E870 for ; Tue, 31 Dec 2024 08:08:44 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSVz7-0004EX-1u; Tue, 31 Dec 2024 01:44:09 -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 1tSVz3-0004AC-CD for guix-patches@gnu.org; Tue, 31 Dec 2024 01:44: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 1tSVz3-0005HC-3M for guix-patches@gnu.org; Tue, 31 Dec 2024 01:44:05 -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=wE8o8BHwiKLfYKTfcOVn4tySHKQZddyHbeo26+1I43M=; b=gQGCBwS9tP7zQUd5lpL0CGcao/ZYCAJa2vohLsMld7Kd4rQWTupXHnHKwxvX2cAAALcGjfnisBUyveCUTBHWd/VzGw3Zrlw4ATVtJZgwZKUSKz5sswC13FV0kjJlhXJVa2hcAAz32nKoUbhMhUMwk+ttfs5DeHp+DFfap8+CgQP/HQBxWCwDc6q4S7WNXT/fLN9QzUslQ/YNxeJiyqiQcpZm9P8UAgpWtyx0i+gvhyIPxaSc3rd8mJFVTTAnI/5DzJBPRoOggRrm2AdKk2pQuR80sqk91iOM2tOdqlybc89+1KFGVa5YTSoBYKzRQdHwez8RxAqOT1438LRXBWjkjA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tSVz0-0000y2-BD; Tue, 31 Dec 2024 01:44:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75146] [PATCH v4 21/68] gnu: xfce4-settings: Switch to git source. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Tue, 31 Dec 2024 06:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75146@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= , Zhu Zihao , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Zhu Zihao , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 75146-submit@debbugs.gnu.org id=B75146.17356274103420 (code B ref 75146); Tue, 31 Dec 2024 06:44:02 +0000 Received: (at 75146) by debbugs.gnu.org; 31 Dec 2024 06:43:30 +0000 Received: from localhost ([127.0.0.1]:32798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSVyU-0000t5-AQ for submit@debbugs.gnu.org; Tue, 31 Dec 2024 01:43:30 -0500 Received: from mail.envs.net ([5.199.136.28]:50152) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSVxb-0000lO-Qt for 75146@debbugs.gnu.org; Tue, 31 Dec 2024 01:42:36 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 6C98E38A3E71; Tue, 31 Dec 2024 06:42:35 +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 RfODSpAPkAMJ; Tue, 31 Dec 2024 06:42:32 +0000 (UTC) Received: from localhost (unknown [112.44.106.216]) (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; Tue, 31 Dec 2024 06:42:27 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 15c8ba8b; Tue, 31 Dec 2024 06:45:08 +0000 (UTC) Date: Tue, 31 Dec 2024 14:43:51 +0800 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 0.80 X-Spam-Score: 0.80 X-Migadu-Queue-Id: 07D681E870 X-TUID: dUip9l49ZGtv From: 宋文武 * gnu/packages/xfce.scm (xfce4-settings)[source]: Switch to git-fetch. [arguments]: Add "--enable-maintainer-mode" to configure-flags. Remove 'patch-configure phase. [native-inputs]: Add xfce4-dev-tools. [inputs]: Add wlr-protocols. [home-page]: Set to docs.xfce.org. Change-Id: I1646b8b93003406ec330be5524a4643d2de65109 --- gnu/packages/xfce.scm | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 235c4e69a8..52124d1d82 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -733,32 +733,26 @@ (define-public xfce4-settings (package (name "xfce4-settings") (version "4.20.0") - (source (origin - (method url-fetch) - (uri (string-append "https://archive.xfce.org/src/xfce/" - name "/" (version-major+minor version) "/" - name "-" version ".tar.bz2")) - (sha256 - (base32 - "1ag5pimprxc12zgdbs27vngin97fc6l9ig7xzc0naacs8aiqsm13")) - (patches (search-patches "xfce4-settings-defaults.patch")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://gitlab.xfce.org/xfce/" name)) + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xv8fcrrk54r6naxhwj9ff8f1q9g08fh0ailazvbmi1jww12xwyi")) + (patches (search-patches "xfce4-settings-defaults.patch")))) (build-system gnu-build-system) (arguments (list #:configure-flags - #~(list "--enable-pluggable-dialogs" + #~(list "--enable-maintainer-mode" ;for appearance-dialog_ui.h + "--enable-pluggable-dialogs" "--enable-sound-settings" "--enable-upower-glib" - "--enable-xrandr") - #:phases - #~(modify-phases %standard-phases - (add-before 'configure 'patch-configure - (lambda _ - (substitute* "configure" - ;; XDG_CHECK_PACKAGE_BINARY requires an absolute path. - (("\\$PKG_CONFIG --variable=gdbus_codegen gio-2.0") - "type -p gdbus-codegen"))))))) + "--enable-xrandr"))) (native-inputs - (list (list glib "bin") pkg-config intltool)) + (list xfce4-dev-tools)) (inputs (list colord exo @@ -772,12 +766,13 @@ (define-public xfce4-settings libxfce4ui upower python ;; for xfce4-compose-mail + wlr-protocols xf86-input-libinput)) (propagated-inputs ;; Some operations, such as changing icon themes, require these schemas ;; to be in the search path. (list gsettings-desktop-schemas)) - (home-page "https://www.xfce.org/") + (home-page "https://docs.xfce.org/xfce/xfce4-settings/") (synopsis "Xfce settings manager") (description "Settings manager for Xfce, it can control various aspects of the desktop -- 2.46.0