From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uCh7AxlnRGDZYAAA0tVLHw (envelope-from ) for ; Sun, 07 Mar 2021 05:39:37 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id wE3uOhhnRGClQQAA1q6Kng (envelope-from ) for ; Sun, 07 Mar 2021 05:39:36 +0000 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 08BAC18E25 for ; Sun, 7 Mar 2021 06:39:36 +0100 (CET) Received: from localhost ([::1]:40102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIm8c-00056c-QD for larch@yhetil.org; Sun, 07 Mar 2021 00:39:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIm8M-00056U-TE for guix-devel@gnu.org; Sun, 07 Mar 2021 00:39:18 -0500 Received: from out1.migadu.com ([2001:41d0:2:863f::]:59225) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIm8F-0003kV-OF for guix-devel@gnu.org; Sun, 07 Mar 2021 00:39:18 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615095547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=N3bdfacXNxqRmfcE44kEJwzQEeGSnzY7URv1blLZEug=; b=FlAo/h5W3h7MU1HaP42bmAg0Wy8FMwIAbqFscmfEW0jPDN3RaAS+YZpjzF0sBBrRlmgcZO q5JPDVlPqX48mBi4el6ZHuHeyVzGJSQbgUrrx34Y55OsJib4fHPsbzlet7EXSGQLvyNuVH um4w04UG35zYwlNBB+LdfSlX2+2/zqKNx39EeiwzxcnMbUlE5Jykdz0SuepxncIpZ6Ixlv LXNB2bgSA2avfHzg0WzaCt3c7zbAxXFkLERAKlMxsgkmHhyrB6bjTIvsxtmb78rOb4qfPU vkoECDoqvwe56U8jfQdSeRL0MmXmI2pezjnF2LXYsiLpJSrzJaW3eZ7pg+45eg== From: Raghav Gururajan To: Leo Famulari Cc: zimoun , Guix Devel References: <87a6rkqq4i.fsf@gnu.org> <2e04da26-03b9-76f3-6637-baddee63c453@raghavgururajan.name> Subject: Re: Release on April 18th? Message-ID: <13cf6e6d-a00d-4d35-04de-549119a43e1e@raghavgururajan.name> Date: Sun, 7 Mar 2021 00:39:04 -0500 MIME-Version: 1.0 In-Reply-To: <2e04da26-03b9-76f3-6637-baddee63c453@raghavgururajan.name> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="2TbaEG9VvDMtlDXyLLhwdwpa2Wswopmik" X-Migadu-Auth-User: rg@raghavgururajan.name Received-SPF: pass client-ip=2001:41d0:2:863f::; envelope-from=rg@raghavgururajan.name; helo=out1.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615095576; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=N3bdfacXNxqRmfcE44kEJwzQEeGSnzY7URv1blLZEug=; b=YQC1csf5o4+uPYhzEGL7jmzL0Xy1eBo9aTZz9SrPTKpY3G0YKIiorKnYT9aTHI65tkHGqW 9+blNMqE7OyH02C6pguFNFVMUZgLITCzewCplITrGjNVoB/OngcYvu1uLDs8f/augMOTMr k1/t0RnbhBvVvnVWKehGXtYOC9zcM9YiUJcOPTvHiTLO5655e68olzmOmm2lDhGfVBI2+J mFBf5PVKjqfHRcaNtK7Gn5vtb3qtxw0nucf9bV5wcJTnpdwHhs04sp77g9JFkGa59PZ48N kTeM4eiZoJgHPErjXODJ9C858iXD37PZEfgwQWMTnTBFdTKWvuToJ6HNaFhYWA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615095576; a=rsa-sha256; cv=none; b=pMmDFBybDqnwbvoxivCbIcJcAlvA9aZV/I7CF3iTEVnjtkH7D3GMOu1GlplVm5SLkhvlYE rP2m4M75cyHrkA4UIn3ASGywiWRTaPJuONY8vvqU2lqIqWPnRQBx24WrY0Ai/sYSwrMj20 T+UAEpLJp0CpQrO9TSF/BMfcXTyxkDBweTnEFEQJQRAGh+aFRFi73J38UNiE1r3FETIzkQ 5rl+eONiT57iub3kfdZhvV/gICGHv3f/Pm5LXvOSEU7Fvn9msA/8POK04AXIZRap5uNLFa L9dpQUoc8KGYebRfQ0pjWoSj5P+GkQ5tEAufoQfrsnKsbi5lkJbRJfzgdtp0SA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=raghavgururajan.name header.s=key1 header.b="FlAo/h5W"; dmarc=pass (policy=quarantine) header.from=raghavgururajan.name; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Spam-Score: -4.17 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=raghavgururajan.name header.s=key1 header.b="FlAo/h5W"; dmarc=pass (policy=quarantine) header.from=raghavgururajan.name; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Queue-Id: 08BAC18E25 X-Spam-Score: -4.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: s/aBCWY8FD33 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --2TbaEG9VvDMtlDXyLLhwdwpa2Wswopmik Content-Type: multipart/mixed; boundary="Svt7qMfzUOSvxdAI5GqUtUoqIaUYKUadt"; protected-headers="v1" From: Raghav Gururajan To: Leo Famulari Cc: zimoun , Guix Devel Message-ID: <13cf6e6d-a00d-4d35-04de-549119a43e1e@raghavgururajan.name> Subject: Re: Release on April 18th? References: <87a6rkqq4i.fsf@gnu.org> <2e04da26-03b9-76f3-6637-baddee63c453@raghavgururajan.name> In-Reply-To: <2e04da26-03b9-76f3-6637-baddee63c453@raghavgururajan.name> --Svt7qMfzUOSvxdAI5GqUtUoqIaUYKUadt Content-Type: multipart/mixed; boundary="------------DB70B4A082262CE24372E6ED" Content-Language: en-US This is a multi-part message in MIME format. --------------DB70B4A082262CE24372E6ED Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! >> Unfortunately, a package was added recently that depends on Qt 4 >> (telegram-desktop). Hopefully its dependency graph can be updated to u= se >> Qt 5. >=20 > IIRC, telegram-desktop uses Qt5. >=20 > Was it any of its dependencies? If so how can I narrow-it down using=20 > `guix graph`? I'll try to update it. Just saw your message in IRC. For nimf, can you merge attached patches=20 to master? Regards, RG. --------------DB70B4A082262CE24372E6ED Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-nimf-Use-separate-outputs-for-gtk-and-qt-modules.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0001-gnu-nimf-Use-separate-outputs-for-gtk-and-qt-modules.pa"; filename*1="tch" =46rom c544f794b41d5120d1749cc864a5175abddab052 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 6 Mar 2021 23:50:37 -0500 Subject: [PATCH 1/2] gnu: nimf: Use separate outputs for gtk and qt modul= es. * gnu/packages/language.scm (nimf) [outputs]: Add gtk and qt. [arguments]<#:phases>['patch-paths]: Modify. --- gnu/packages/language.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 651b2305c9..db7b9d7f33 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -85,7 +85,7 @@ (sha256 (base32 "01qi7flmaqrn2fk03sa42r0caks9d8lsv88s0bgxahhxwk1x76gc"))= )) (build-system glib-or-gtk-build-system) - (outputs '("out" "doc")) + (outputs '("out" "gtk" "qt" "doc")) (arguments `(#:imported-modules (,@%glib-or-gtk-build-system-modules @@ -134,18 +134,18 @@ "/bin:$GTK2_LIBDIR/libgtk2.0-0"))) (substitute* "modules/clients/gtk/Makefile.am" (("\\$\\(GTK3_LIBDIR\\)") - (string-append (assoc-ref outputs "out") + (string-append (assoc-ref outputs "gtk") "/lib")) (("\\$\\(GTK2_LIBDIR\\)") - (string-append (assoc-ref outputs "out") + (string-append (assoc-ref outputs "gtk") "/lib"))) (substitute* "modules/clients/qt4/Makefile.am" (("\\$\\(QT4_LIB_DIR\\)") - (string-append (assoc-ref outputs "out") + (string-append (assoc-ref outputs "qt") "/lib"))) (substitute* "modules/clients/qt5/Makefile.am" (("\\$\\(QT5_IM_MODULE_DIR\\)") - (string-append (assoc-ref outputs "out") + (string-append (assoc-ref outputs "qt") "/lib/qt5/plugins/inputmethods"))) (substitute* '("bin/nimf-settings/Makefile.am" "data/apparmor-abstractions/Makefile.am" --=20 2.30.1 --------------DB70B4A082262CE24372E6ED Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-nimf-Disable-qt4-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-nimf-Disable-qt4-support.patch" =46rom 93fda7fa66b7c6697a428ab628872fc86b9b09e1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 7 Mar 2021 00:30:36 -0500 Subject: [PATCH 2/2] gnu: nimf: Disable qt4 support. * gnu/packages/language.scm (nimf) [arguments]: Add new phase 'disable-qt= 4 and modify phase 'patch-paths. [inputs]: Remove qt4. --- gnu/packages/language.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index db7b9d7f33..be1c5d4191 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -105,7 +105,15 @@ "/share/gtk-doc/html")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-flags + (add-after 'unpack 'disable-qt4 + (lambda _ + (substitute* '("configure.ac" "modules/clients/Makefile.am"= ) + (("\\[QtGui\\]") + "[Qt5Gui]") + ((" qt4") + "")) + #t)) + (add-after 'disable-qt4 'patch-flags (lambda* (#:key inputs #:allow-other-keys) (substitute* "configure.ac" (("-Werror") @@ -139,10 +147,6 @@ (("\\$\\(GTK2_LIBDIR\\)") (string-append (assoc-ref outputs "gtk") "/lib"))) - (substitute* "modules/clients/qt4/Makefile.am" - (("\\$\\(QT4_LIB_DIR\\)") - (string-append (assoc-ref outputs "qt") - "/lib"))) (substitute* "modules/clients/qt5/Makefile.am" (("\\$\\(QT5_IM_MODULE_DIR\\)") (string-append (assoc-ref outputs "qt") @@ -182,7 +186,6 @@ ("hangul" ,libhangul) ("m17n-db" ,m17n-db) ("m17n-lib" ,m17n-lib) - ("qt-4" ,qt-4) ("qtbase" ,qtbase) ("rime" ,librime) ("rsvg" ,librsvg) --=20 2.30.1 --------------DB70B4A082262CE24372E6ED-- --Svt7qMfzUOSvxdAI5GqUtUoqIaUYKUadt-- --2TbaEG9VvDMtlDXyLLhwdwpa2Wswopmik Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYERm+AUDAAAAAAAKCRBfWBZkf4vlUaYo AP9A36XwuJKWDigUomCOvZNvCfMU+t/W92tvlWU0m2nYbAEA/fhsnBlc03HfqXARp+Lgwiglemv1 /Y0Xa9JXxe8mTwA= =/koQ -----END PGP SIGNATURE----- --2TbaEG9VvDMtlDXyLLhwdwpa2Wswopmik--