From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WCWjKrQ3zmR5aAAASxT56A (envelope-from ) for ; Sat, 05 Aug 2023 13:51:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id mONKKrQ3zmRObwEA9RJhRA (envelope-from ) for ; Sat, 05 Aug 2023 13:51:16 +0200 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 82C0D3D86D for ; Sat, 5 Aug 2023 13:51:15 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b=STH5ZPLE; 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=1691236276; 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: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=5/fHdmqWeMsg6Mq73PhmIQYEQAvyK/P0yNBXVyb0bRs=; b=gOuJTmWdfnnfCFZuQMVIMXHIPLEsoEZxirlgSnd+oQSBGZb7SVxTQei3j8362mJlwuyiUL sDtsQ5BQWF4+vi60Bgj/IoyQs8pCLFrVjjfocyNFtek4yy8L0olNAAxqGI4T4xQSRsIi48 oTEBqYaKR4qmPCuCPSMrXXFWsN+H4LPJxs5LrD9tsDIwqPXTXzQWXjN00LiJzirah9IXt7 dljUIMVq1atwdTmR7XGMDMseWMDlMJiQCMUs+VXxyxHXyYd1/RQN0gJO3O7Z0hppX4O87C zL0alb1C0U9OgB5SGgUKkmFiY4LroI0HisKkxg294q33ZWIVIUoUGPeGpsbFsQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b=STH5ZPLE; 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=1691236276; a=rsa-sha256; cv=none; b=JjsJrSNoY/d8zeRKSN45RRtA4QhGdxl1i6piHIXc6A1TaZ1MyLw2JQKYegQGU3EtTZDLxI kmA8HTw4W0wAwT9SG/bIbYuS0BRiYZPVvTqIvVZ5hIyrug9mOtY2xMpRGDgOe2xWI2eFvD 2aGaIuitmHFHgSJx+oytyHuIwgGFv7OQTHjGocQhKn0E1L/0f1DLr7YxKAlwy+uG8XRfCq pT3BNU1tLMn8Rp7N0yKCJfFvvHU9i34I+CtXwsKEVRj6o7RUAQACrhZaJRAgKFh4JIjK2j k3DHN7bus/WXhD8+QWGArQoy1oY37+n9Ptv2rPrktD9RTo0Pa7XV0GaaO69PQg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSFoF-0000lx-0L; Sat, 05 Aug 2023 07:51:03 -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 1qSFoE-0000lo-8k for guix-patches@gnu.org; Sat, 05 Aug 2023 07:51:02 -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 1qSFoE-00077c-0b for guix-patches@gnu.org; Sat, 05 Aug 2023 07:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSFoD-0000zT-TP for guix-patches@gnu.org; Sat, 05 Aug 2023 07:51:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH 000/209] update kde package and add plasme desktop Resent-From: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Aug 2023 11:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Zheng Junjie <873216071@qq.com> Cc: guix-devel@gnu.org, andreas@enge.fr, 64798@debbugs.gnu.org Received: via spool by 64798-submit@debbugs.gnu.org id=B64798.16912362503789 (code B ref 64798); Sat, 05 Aug 2023 11:51:01 +0000 Received: (at 64798) by debbugs.gnu.org; 5 Aug 2023 11:50:50 +0000 Received: from localhost ([127.0.0.1]:55993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSFo1-0000z2-EF for submit@debbugs.gnu.org; Sat, 05 Aug 2023 07:50:50 -0400 Received: from mail.envs.net ([5.199.136.28]:46112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSFnx-0000yo-AL for 64798@debbugs.gnu.org; Sat, 05 Aug 2023 07:50:48 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 3749638A083C; Sat, 5 Aug 2023 11:50:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1691236243; bh=5/fHdmqWeMsg6Mq73PhmIQYEQAvyK/P0yNBXVyb0bRs=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=STH5ZPLEIk9ZV7yuM3On+l3NthBHQ9ezUhqe7h3IUOIt+DjHzfaYveN8XMG5T3HjK wTkiEjsR27RpDQsNzSrSnVSbTI6oZbQ+cnFDp4xGf976EzWC0p6F12YV9vTpPZeSrV XiQwUzYb/by9sYk0vK76E6360RgwSBpQgw7Ztcc4qWYFBpLg4Bk8BC7wfbwEJ2XT+d 9CF3K8U/2dJy8cAu4i4BbC/csMk3raneQ7XgEADhN9yZXPojXV9eBVQ840BX/RWxKV UdZMGRsF5URQI67V2qKS4Z89GQxH8DFWUGbNZYdMC6/X56sO8B/1zg0L7kqtEPq13V 8HcXDRDIOYdjSfMuVe5w5DLXQsopRMrgbn+TO08ZC1WNIN/pvhcukFPUP2iShWvlIR DNRKZjpji1UCV/WnXcTdJRf3N1xP2DuN+ygmhVvrPtzq7kuHgkB5zgrkaIpbGyKFkM XO1kZZHitN5jEgTakeOzf0X45qJlmkh6qkt3dTbAnmq8r0YPpfUEkQeYbw6pEF7v5c 0e+JbXV+NVXW8118q07YonEE3392Wg4P1Gy+PTZ84iroEr0yid1wczbKAxDfFhdvKM 9iBXX69lUPfTPLwZYcxrqquXdaToTkgIlPP0G3Oc/ddC2LL/yODVYsh9I3rFwsNSEp ANM73nZyjaN8BrGzQBGv/SG0= 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 SYIrmd5GKLfz; Sat, 5 Aug 2023 11:50:35 +0000 (UTC) Received: from localhost (unknown [36.170.44.61]) (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, 5 Aug 2023 11:50:35 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id e622ffd8; Sat, 5 Aug 2023 11:50:26 +0000 (UTC) In-Reply-To: <87cz057b5g.fsf@envs.net> ("=?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?="'s message of "Wed, 02 Aug 2023 22:48:43 +0800") References: <873517qf8w.fsf@envs.net> <87cz057b5g.fsf@envs.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) Date: Sat, 05 Aug 2023 19:50:26 +0800 Message-ID: <87o7jlbtdp.fsf@envs.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-ACL-Warn: , =?utf-8?b?5a6L5paH5q2mIHZpYSBHdWl4LXBhdGNoZXM=?= From: =?utf-8?b?5a6L5paH5q2mIHZpYSBHdWl4LXBhdGNoZXM=?= 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-Queue-Id: 82C0D3D86D X-Migadu-Scanner: mx1.migadu.com X-Spam-Score: -6.65 X-Migadu-Spam-Score: -6.65 X-TUID: gNmdbb4IptgK --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable =E5=AE=8B=E6=96=87=E6=AD=A6 writes: > =E5=AE=8B=E6=96=87=E6=AD=A6 writes: > >> Zheng Junjie <873216071@qq.com> writes: >> >>> hello! >>> >>> I updated some kde package, and add plasma desktop. >> >> Hello, I had pick those patches from your Github repo, and modify >> some commit messages (mostly from 'use ...' to 'Use ...', 'add ...' to >> 'Add ...') to hopefully align better with our style. >> >> And put it here https://codeberg.org/iyzsong/guix with my wip (building >> qtwebengine now...), I plan to update all KDE packages (games, internet, >> multimedia, etc.), and will push to a kde-updates branch on >> git.savannah.gnu.org once it's in good shape. > > I have push a kde-updates branch to savannah, with plasma update to > 5.27.7. Applications are all build fine but some have runtime issues. > I haven't got Plasma built due to substitute issues, will try later in > next days... > > In addition to version updates, there have some changes: > > 2b9e2e65cf gnu: Remove kwayland-server. > 08846c7ebf gnu: qgpgme: Propagate gpgme. > b9e192ad9a gnu: Add qcoro-qt5. > ab3eba1447 gnu: Add kpipewire. > > Review is welcome, Thanks! Plasma build and works fine. Also fixed 3 mahjongg games with: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-kajongg-Hardcode-paths-to-ogg123-and-python3.patch >From 1e4085670a149df7e9858ef6c52995415cf27037 Mon Sep 17 00:00:00 2001 Message-ID: <1e4085670a149df7e9858ef6c52995415cf27037.1691235884.git.iyzsong@member.fsf.org> From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 5 Aug 2023 15:37:57 +0800 Subject: [PATCH 1/2] gnu: kajongg: Hardcode paths to 'ogg123' and 'python3'. * gnu/packages/kde-games.scm (kajongg)[inputs]: Add vorbis-tools. [arguments]<#:phases>: Hardcode paths to 'ogg123' and 'python3'. --- gnu/packages/kde-games.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index a47deb6c68..9e2b885c2b 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -37,7 +37,8 @@ (define-module (gnu packages kde-games) #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) - #:use-module (gnu packages qt)) + #:use-module (gnu packages qt) + #:use-module (gnu packages xiph)) (define-public ktuberling (package @@ -300,7 +301,15 @@ (define-public kajongg (substitute* "src/mjresource.py" (("'share', 'kmahjongglib'" all) (string-append "'" (assoc-ref inputs "libkmahjongg") - "/share', 'kmahjongglib'"))))) + "/share', 'kmahjongglib'"))) + (substitute* "src/sound.py" + (("oggBinary = 'ogg123'") + (format #f "oggBinary = '~a'" + (search-input-file inputs "bin/ogg123")))) + (substitute* "src/common.py" + (("interpreterName = 'python3'") + (format #f "interpreterName = '~a'" + (search-input-file inputs "bin/python3")))))) (add-after 'qt-wrap 'wrap (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -327,7 +336,8 @@ (define-public kajongg python-qtpy python-zope-interface qtbase-5 - qtsvg-5)) + qtsvg-5 + vorbis-tools)) (home-page "https://apps.kde.org/kajongg/") (synopsis "Classical Mah Jongg game for 4 players") (description "Kajongg is the ancient Chinese board game for 4 players. base-commit: 0a4490e4fd77a0dd50262d080bd024a2f41cdc4a -- 2.41.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-libkmahjongg-Make-its-tilset-available-to-games.patch >From 4c0a6635d81970da2f461757ff891f2528a57b5c Mon Sep 17 00:00:00 2001 Message-ID: <4c0a6635d81970da2f461757ff891f2528a57b5c.1691235884.git.iyzsong@member.fsf.org> In-Reply-To: <1e4085670a149df7e9858ef6c52995415cf27037.1691235884.git.iyzsong@member.fsf.org> References: <1e4085670a149df7e9858ef6c52995415cf27037.1691235884.git.iyzsong@member.fsf.org> From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 5 Aug 2023 19:36:49 +0800 Subject: [PATCH 2/2] gnu: libkmahjongg: Make its tilset available to games. * gnu/packages/kde-games.scm (libkmahjongg)[arguments]: Add a phase to add its "$out/share" to XDG_DATA_DIRS. --- gnu/packages/kde-games.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index 9e2b885c2b..8ed530d83e 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -27,6 +27,7 @@ (define-module (gnu packages kde-games) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system qt) + #:use-module (guix gexp) #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages gl) @@ -184,6 +185,24 @@ (define-public libkmahjongg (sha256 (base32 "1a0c0q34h5yxwx76y6934ibn6hm1ip1hc2xvl11q1kaazq0alca3")))) (build-system qt-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tileset-dir + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Add "$out/share" to XDG_DATA_DIRS so that the default tileset + ;; is always available. + (substitute* "src/kmahjonggtileset.cpp" + (("_inited = true;") + (format #f "QByteArray x = qgetenv(\"XDG_DATA_DIRS\"); +if (!x.isEmpty()) { + QString datadirs = QString::fromLocal8Bit(x) + QLatin1String(\":~a\"); + qputenv(\"XDG_DATA_DIRS\", datadirs.toLocal8Bit()); +} +_inited = true;" + (string-append + (assoc-ref outputs "out") "/share"))))))))) (native-inputs (list extra-cmake-modules)) (inputs -- 2.41.0 --=-=-= Content-Type: text/plain CC to guix-devel: Anyone can help to setup a CI job for this kde-updates branch? (more than 2000 packages will need rebuild due to sdl2 -> fcitx -> extra-cmake-modules) Thanks! --=-=-=--