From: Raghav Gururajan <rg@raghavgururajan.name>
To: Leo Famulari <leo@famulari.name>
Cc: zimoun <zimon.toutoune@gmail.com>, Guix Devel <guix-devel@gnu.org>
Subject: Re: Release on April 18th?
Date: Sun, 7 Mar 2021 00:39:04 -0500 [thread overview]
Message-ID: <13cf6e6d-a00d-4d35-04de-549119a43e1e@raghavgururajan.name> (raw)
In-Reply-To: <2e04da26-03b9-76f3-6637-baddee63c453@raghavgururajan.name>
[-- Attachment #1.1.1: Type: text/plain, Size: 428 bytes --]
Hi Leo!
>> Unfortunately, a package was added recently that depends on Qt 4
>> (telegram-desktop). Hopefully its dependency graph can be updated to use
>> Qt 5.
>
> IIRC, telegram-desktop uses Qt5.
>
> Was it any of its dependencies? If so how can I narrow-it down using
> `guix graph`? I'll try to update it.
Just saw your message in IRC. For nimf, can you merge attached patches
to master?
Regards,
RG.
[-- Attachment #1.1.2: 0001-gnu-nimf-Use-separate-outputs-for-gtk-and-qt-modules.patch --]
[-- Type: text/x-patch, Size: 2213 bytes --]
From c544f794b41d5120d1749cc864a5175abddab052 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
Date: Sat, 6 Mar 2021 23:50:37 -0500
Subject: [PATCH 1/2] gnu: nimf: Use separate outputs for gtk and qt modules.
* 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"
--
2.30.1
[-- Attachment #1.1.3: 0002-gnu-nimf-Disable-qt4-support.patch --]
[-- Type: text/x-patch, Size: 2027 bytes --]
From 93fda7fa66b7c6697a428ab628872fc86b9b09e1 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
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-qt4
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)
--
2.30.1
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
next prev parent reply other threads:[~2021-03-07 5:39 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-02 14:51 Release on April 18th? zimoun
2021-03-02 16:00 ` Julien Lepiller
2021-03-02 20:03 ` Leo Famulari
2021-03-05 14:31 ` Andreas Enge
2021-03-05 19:27 ` Leo Famulari
2021-03-05 20:20 ` zimoun
2021-03-05 20:58 ` Leo Famulari
2021-03-05 23:57 ` zimoun
2021-03-06 20:14 ` Tobias Geerinckx-Rice
2021-03-03 14:16 ` Ludovic Courtès
2021-03-03 18:51 ` Leo Famulari
2021-03-04 9:41 ` zimoun
2021-03-04 19:07 ` Leo Famulari
2021-03-04 22:18 ` zimoun
2021-03-04 22:43 ` Leo Famulari
2021-03-05 20:19 ` Leo Famulari
2021-03-05 23:58 ` zimoun
2021-03-06 18:56 ` Leo Famulari
2021-03-06 19:06 ` Leo Famulari
2021-03-06 23:22 ` Leo Famulari
2021-03-07 3:51 ` Raghav Gururajan
2021-03-07 5:39 ` Raghav Gururajan [this message]
2021-03-07 20:44 ` Leo Famulari
2021-03-07 20:56 ` Raghav Gururajan
2021-03-07 20:50 ` Leo Famulari
2021-03-08 9:38 ` zimoun
2021-03-05 20:21 ` Leo Famulari
2021-03-09 18:17 ` Chris Marusich
2021-03-09 21:32 ` Vincent Legoll
2021-03-10 8:30 ` Release on April 18th? (ppc64le support specifically) Efraim Flashner
2021-03-11 9:10 ` Release on April 18th? Chris Marusich
2021-03-12 8:02 ` Vincent Legoll
2021-03-12 18:42 ` Chris Marusich
2021-03-12 18:52 ` Chris Marusich
2021-03-14 12:31 ` Vincent Legoll
2021-03-15 16:36 ` Ludovic Courtès
2021-03-16 4:03 ` Let's include powerpc64le-linux in the next release (was: Re: Release on April 18th?) Chris Marusich
2021-03-16 7:08 ` Efraim Flashner
2021-03-16 8:10 ` Léo Le Bouter
2021-03-23 13:42 ` Let's include powerpc64le-linux in the next release Ludovic Courtès
2021-03-23 13:47 ` Léo Le Bouter
2021-03-23 14:01 ` Tobias Geerinckx-Rice
2021-03-30 8:23 ` Ludovic Courtès
2021-03-30 22:20 ` Vincent Legoll
2021-03-23 17:09 ` Let's include powerpc64le-linux in the next release, " Chris Marusich
2021-03-10 13:27 ` Release on April 18th? zimoun
2021-03-10 15:30 ` Efraim Flashner
2021-03-10 15:59 ` zimoun
2021-03-10 18:33 ` Efraim Flashner
2021-03-11 8:58 ` Chris Marusich
2021-03-11 13:30 ` Efraim Flashner
2021-03-12 8:33 ` Chris Marusich
2021-03-12 10:11 ` Andreas Enge
2021-03-12 13:43 ` Efraim Flashner
-- strict thread matches above, loose matches on Subject: below --
2021-02-28 6:53 I've rebased wip-ppc64le onto core-updates Chris Marusich
2021-02-28 20:42 ` Léo Le Bouter
2021-03-01 19:14 ` Tobias Platen
2021-03-01 21:36 ` jbranso
2021-03-10 10:17 ` Ludovic Courtès
2021-03-10 10:37 ` Efraim Flashner
2021-03-11 8:24 ` Chris Marusich
2021-03-11 8:37 ` Léo Le Bouter
2021-03-15 16:25 ` Ludovic Courtès
2021-03-16 4:26 ` I've rebased wip-ppc64le onto core-updates, Re: Release on April 18th? Chris Marusich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=13cf6e6d-a00d-4d35-04de-549119a43e1e@raghavgururajan.name \
--to=rg@raghavgururajan.name \
--cc=guix-devel@gnu.org \
--cc=leo@famulari.name \
--cc=zimon.toutoune@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).