From patchwork Sat Dec 30 16:33:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 2085 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 4AE0327BBEA; Sat, 30 Dec 2023 16:35:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 6D1F827BBE2 for ; Sat, 30 Dec 2023 16:35:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJcIi-0006Y2-HV; Sat, 30 Dec 2023 11:35:04 -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 1rJcIg-0006Xo-HH for guix-patches@gnu.org; Sat, 30 Dec 2023 11:35:02 -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 1rJcIg-0006NS-8B for guix-patches@gnu.org; Sat, 30 Dec 2023 11:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJcIg-000271-Fg for guix-patches@gnu.org; Sat, 30 Dec 2023 11:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH 0/8] Fix usage of glib-or-gtk-build-system Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 16:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17039540678067 (code B ref -1); Sat, 30 Dec 2023 16:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Dec 2023 16:34:27 +0000 Received: from localhost ([127.0.0.1]:44925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJcI7-000263-90 for submit@debbugs.gnu.org; Sat, 30 Dec 2023 11:34:27 -0500 Received: from lists.gnu.org ([2001:470:142::17]:36680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJcI4-00025n-Hn for submit@debbugs.gnu.org; Sat, 30 Dec 2023 11:34:26 -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 1rJcHx-0006Nh-4C for guix-patches@gnu.org; Sat, 30 Dec 2023 11:34:17 -0500 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJcHu-0006Jm-Vz for guix-patches@gnu.org; Sat, 30 Dec 2023 11:34:16 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 11C682778E3; Sat, 30 Dec 2023 16:34:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954050; bh=8b+Q8F8394YtSjTt40Yfkftg6eoA8Lr4eRe3wesXelw=; h=From:To:Cc:Subject:Date; b=ONvaOR3eBaE5Ipxm7jJkn8OWc2GBw1jS3WPvoKTh+l+lYSZ9jloS2zCkrdx1r3x/3 zg17268JQ2WZ1UO4XN/Bnd7doC/3uglWfCC6GfVZJ/KeI88L+VG6guQ3oe3T/H0fBT Ai81k/rhPLKxfceYMHUPAYSuPHlk2h9xDlNgzA0Rsx7Nv8xqHD7EjNIOpzs7PLhAr+ IdB9X8VYgdcSgdipQQvVC2Xmo0/+Okdqz0RczjwH4mjNdKfu5XJJfacgxxrlbpn/fB yUnCllro9RhVMStXXLq+EvS7EV+fwPsiUwc4a/imfjnezUZVVJBfkZfNbX6nEt7WCU OYcloRia1M+KdizEPky0ydDOr7i/edkHzD5G+y0tSdn8sydXX/sVAB9GcY2L2W04p7 E8qGYeLkc8L67swxkkfXqt0l6XAFffdDfeDe4nFBxuhOO9qehdi1TDho2GWqOyUieR iIrzDCWULVw6dNprue8B8CTc3u6WwUjG6rMmwmY71gVLdg9wstXA6QT97u+7C8xBfi gYh5PKuPDB0BHtq+GxIhqcG7zwjWOnFPhAjUrQmwhoxdQQ+a4wcvMUUuPdu/WNoKqX 9e0xIlp9NKPfxludvCkx8yBF9vZbnIUQaXy+WT2rhULV8wGI/qoCWYeGp4l2dKs9kU SKmVGule9YzVqPCVdd3CFniI= Received: from localhost (unknown [81.17.16.82]) by wolfsden.cz (Postfix) with ESMTPSA id 3A90E279D16; Sat, 30 Dec 2023 16:34:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954049; bh=8b+Q8F8394YtSjTt40Yfkftg6eoA8Lr4eRe3wesXelw=; h=From:To:Cc:Subject:Date; b=VrOMfdxH9hSxB9A+ua/aIQkDaiYeXZH9CHkQzCifw5W+oay9ZkBraiY4Qtt5be+9G TR83+ZcGIy50zHctutCtbnePpRZzERy/BKbJKBjp9aYRVaZ+Fjqx8bSFSyXODz9uKj 1n7AX/1qy7A65ECBRuV5buEhFZQ3qXU79H2g2Y6BVW+N5VezUovjyssoCFrPWV8Bnl KsG2FKrYAxRqndm9j4P0/ZRpnnRoAVouHFF3jO6zpsIVmfhPim8mHYMwf59YKhl7CV 0V4SpJMwtROq02g7+70u/+ZXoRrFp8HGwfQg/gebw5z1SakQBnnWRV6HdO12tRGsIm JIUn0KuYcdQqFL6CYGWpb+/ElU5s77fwN/WAuNCt+lC0XtHn5TbJbiS2V6L2T2p2mT VWhE6amz64OPI5NfVR6qIwdnFUUnRatZu4kYnA71GaZ5jrVvHW0wWU88t2YSrR/dxV 70A4xdfCNczmlCXgBTH1IXpe4GeTSqajA5j33EIyY8F+YEA2ImojZ11wvDNLTuILmt 7u7nHkP8vCo98VUK3RVg7rtIy471ELZvz/ZLXCPKIObZBCLigGkMa43peJEsvOciEb zyqgWgjdnZe2/8Ryrm0TYSSTPq0RWJKrCFqhJx42liiA2RRIbGdsIe/qLZiv/y9Mnj 7eFYhdWtTkyN6oUQ5a5v/YUQ= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 41237f4a; Sat, 30 Dec 2023 16:34:08 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 30 Dec 2023 17:33:36 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: softfail client-ip=37.205.8.62; envelope-from=ws@wolfsnet.cz; helo=wolfsden.cz X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_SOFTFAIL=0.665, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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 Using glib-or-gtk-build-system requires hard-coding the list of modules in #:modules. Libreoffice and netsurf tried to use %glib-or-gtk-build-system-modules instead, but that lead to crashes. This series introduces new %glib-or-gtk-build-system-default-modules that contains the list that should go into #:modules. Using it in libreoffice and netsurf fixes the mentioned crashes. Other places were adjusted as well to use it instead of copying over the list. That would be hard to keep in sync. Tomas Volf (8): build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules. gnu: netsurf: Actually use glib-or-gtk-build-system. gnu: libreoffice: Actually use glib-or-gtk-build-system. gnu: sugar: Dehardcode #:modules. gnu: sugar-datastore: Dehardcode #:modules. gnu: sugar-toolkit-gtk3: Dehardcode #:modules. gnu: nimf: Dehardcode #:modules. gnu: hime: Dehardcode #:modules. gnu/packages/language.scm | 12 ++++-------- gnu/packages/libreoffice.scm | 2 +- gnu/packages/sugar.scm | 15 ++++++--------- gnu/packages/web.scm | 2 +- guix/build-system/glib-or-gtk.scm | 9 +++++---- 5 files changed, 17 insertions(+), 23 deletions(-) base-commit: f24b14767d362a84e6469682b4fe303b50f4b589 --- 2.41.0