all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Brendan Tildesley <mail@brendan.scot>
To: Leo Famulari <leo@famulari.name>
Cc: 42885@debbugs.gnu.org
Subject: [bug#42885] [PATCH 23/27] gnu: calibre: Update to 5.13.0.
Date: Thu, 8 Apr 2021 13:17:43 +0200 (CEST)	[thread overview]
Message-ID: <1216030188.59802.1617880663286@office.mailbox.org> (raw)
In-Reply-To: <YG6GXzZqd73Os+9w@jasmine.lan>

[-- Attachment #1: Type: text/plain, Size: 507 bytes --]


> On 04/08/2021 6:28 AM Leo Famulari <leo@famulari.name> wrote:
> 
>  
> On Thu, Apr 08, 2021 at 06:11:55AM +0200, Brendan Tildesley wrote:
> > Well, using a python-pyqt with the python-sip input set back to python-sip-4 fixes it. Do we want to commit to getting it working with python-sip@5. I'm still playing around with it trying to get it to build
> 
> I think it's okay to use python-sip-4, unless you want to hunt down this
> bug.

Fixed I think.
Also I deleted the unused python2-sip (in my notabug)

[-- Attachment #2: 0001-gnu-qgis-Fix-build.patch --]
[-- Type: text/x-patch, Size: 1813 bytes --]

From 6143e197e1caf55d4c0a29aad01f07ca6c73bec8 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Thu, 8 Apr 2021 20:49:57 +1000
Subject: [PATCH] gnu: qgis: Fix build.

* gnu/packages/geo.scm (qgis):[arguments]: Add another hack in the
'configure-pyqt5-sip-path phase to fix build failure caused by the
upgrade to python-sip@5.

The reason for this is that python-sip@5 introduces some changes such as
a new build system 'sip-build' as well as the use of the path
"/lib/pythonX.X/site-packages/*/bindings/" instead of "/share/sip/" for
.sip files. However, we do not actually use that those yet. Qgis detects
SIP5 and assumes we are, messing up the build. The long term solution is
to fully upgrade SIP, use sip-build and fix all failing packages, but
for now I just want to get the build working.
---
 gnu/packages/geo.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index bc5e6820f3..baa95f3cc3 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2082,7 +2082,11 @@ growing set of geoscientific methods.")
                (("sip_dir = cfg.default_sip_dir")
                 (string-append "sip_dir = \""
                                (assoc-ref inputs "python-pyqt+qscintilla")
-                               "/share/sip\"")))
+                               "/share/sip\""))
+               ((".pyqt_sip_dir...os.path.join.*,")
+                (string-append "'pyqt_sip_dir': \""
+                               (assoc-ref inputs "python-pyqt+qscintilla")
+                               "/share/sip"  "\",")))
              (substitute* (list "scripts/prepare_commit.sh"
                                 "scripts/qstringfixup.sh"
                                 "scripts/release.pl"
-- 
2.31.1


  reply	other threads:[~2021-04-08 11:18 UTC|newest]

Thread overview: 89+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-16  6:55 [bug#42885] [PATCH 0/4] gnu: calibre: Update to 4.22.0 Brendan Tildesley
2020-08-21  9:20 ` [bug#42885] [PATCH] gnu: calibre: Update to 4.23.0 Brendan Tildesley
2020-08-22 17:30   ` Leo Famulari
     [not found] ` <handler.42885.B.159756092810548.ack@debbugs.gnu.org>
2020-08-16  7:03   ` [bug#42885] [PATCH 1/4] gnu: ebook.scm: remove duplicate module import Brendan Tildesley
2020-08-16  7:03     ` [bug#42885] [PATCH 2/4] gnu: Add mathjax-bin (MathJax 3) Brendan Tildesley
2020-08-24  1:05       ` Leo Famulari
2020-08-24  4:25         ` Arun Isaac
2020-08-24  5:12           ` Brendan Tildesley
2020-08-24  6:44             ` Arun Isaac
2020-08-24  7:27               ` Brendan Tildesley
2020-08-24  7:41               ` Brendan Tildesley
2020-09-04  9:02                 ` Ludovic Courtès
2020-09-04 11:59                   ` Andreas Enge
2020-09-04 18:13                   ` Arun Isaac
2020-09-04 19:43                     ` Ricardo Wurmus
2020-09-09  6:36                       ` Arun Isaac
2020-09-09  7:19                         ` Ricardo Wurmus
2020-09-09 19:48                           ` Arun Isaac
2020-09-17 10:14                             ` Arun Isaac
2020-09-17 11:24                               ` Ricardo Wurmus
2020-09-21 10:36                                 ` Arun Isaac
2020-09-21 11:08                                   ` Brendan Tildesley
2020-09-22  5:39                                     ` Arun Isaac
2020-09-29 23:56                                       ` [bug#42885] Merge wip-swc Brendan Tildesley
2020-09-30  5:38                                         ` Arun Isaac
2020-10-12  7:23                                           ` Arun Isaac
2020-10-12 22:17                                             ` Brendan Tildesley
2020-10-13 18:44                                               ` Arun Isaac
2020-10-13 21:22                                                 ` Ricardo Wurmus
2020-10-19 18:45                                                   ` Arun Isaac
2021-01-13 15:00                                                     ` [bug#42885] [PATCH 0/4] gnu: calibre: Update to 4.22.0 Ludovic Courtès
2021-01-14 14:59                                                       ` Arun Isaac
2021-01-14 20:49                                                         ` Ricardo Wurmus
2021-02-17  2:47                                                       ` Brendan Tildesley
2020-09-04 13:10               ` [bug#42885] [PATCH 2/4] gnu: Add mathjax-bin (MathJax 3) Ricardo Wurmus
2020-08-16  7:03     ` [bug#42885] [PATCH 3/4] gnu: calibre: Update to 4.22.0 Brendan Tildesley
2020-08-16  7:03     ` [bug#42885] [PATCH 4/4] gnu: calibre: Add wrap phase for qtwebengine Brendan Tildesley
2020-08-24  1:01     ` [bug#42885] [PATCH 1/4] gnu: ebook.scm: remove duplicate module import Leo Famulari
2020-08-22 23:24   ` [bug#42885] ([PATCH 2/4] gnu: calibre: Update to 4.23.0 (new release) Brendan Tildesley
2020-08-25  1:59   ` [bug#42885] [PATCH 2/4] gnu: Add mathjax-3 Brendan Tildesley
2020-09-07  3:11 ` [bug#42885] Regarding Patch 4 Prafulla Giri
2020-09-07  3:40   ` Prafulla Giri
2021-03-10  9:00 ` [bug#42885] [PATCH 01/27] gnu: python-sip: Update to 5.5.0. Add python-sip-4 Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 02/27] gnu: python2-sip: Fix build Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 03/27] gnu: veusz: " Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 04/27] gnu: Add python-pyqt-builder Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 05/27] gnu: Add python-pyqt5-sip Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 06/27] gnu: python-pyqt: Fix build for new python-sip Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 07/27] gnu: Add python-ifaddr Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 08/27] gnu: Add python-zeroconf Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 09/27] gnu: Add python-pyannotate Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 10/27] gnu: Add python-multivolumefile Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 11/27] gnu: Add python-ppmd-cffi Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 12/27] gnu: python-zstandard: Update to 0.15.2 Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 13/27] gnu: Add python-pyzstd Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 14/27] gnu: Add python-bcj-cffi Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 15/27] gnu: Add python-py7zr Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 16/27] gnu: python-markdown: Update to 3.3.4 Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 17/27] gnu: python-feedparser: Update to 6.0.2 Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 18/27] gnu: python-poppler-qt5: Fix build Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 19/27] gnu: python-poppler-qt5: Update to 21.1.0 Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 20/27] gnu: Add python-pychm Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 21/27] gnu: Add python-cchardet Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 22/27] gnu: python-html5lib: Add python-chardet input Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 23/27] gnu: calibre: Update to 5.13.0 Brendan Tildesley
2021-03-23 18:25     ` Leo Famulari
2021-03-23 18:36     ` Leo Famulari
2021-03-24  2:13       ` Brendan Tildesley
2021-03-29 20:12         ` Leo Famulari
2021-03-29 23:05         ` Leo Famulari
2021-03-30  6:23           ` Brendan Tildesley
2021-04-05 19:58             ` Leo Famulari
2021-04-06  1:30               ` Brendan Tildesley
2021-04-06 17:11                 ` Leo Famulari
2021-04-07  3:57                   ` Brendan Tildesley
2021-04-08  0:05                     ` Leo Famulari
2021-04-08  1:14                       ` Leo Famulari
2021-04-08  3:59                       ` Leo Famulari
2021-04-08  4:11                         ` Brendan Tildesley
2021-04-08  4:28                           ` Leo Famulari
2021-04-08 11:17                             ` Brendan Tildesley [this message]
2021-04-09 20:12                               ` bug#42885: " Leo Famulari
2021-03-30 10:45           ` [bug#42885] " Brendan Tildesley
2021-04-04 17:46             ` Leo Famulari
2021-03-10  9:00   ` [bug#42885] [PATCH 24/27] gnu: calibre: Patch some paths Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 25/27] gnu: calibre: Add qtsvg as input Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 26/27] gnu: Remove python2-pyqtwebengine Brendan Tildesley
2021-03-10  9:00   ` [bug#42885] [PATCH 27/27] gnu: Remove python2-pyqt Brendan Tildesley
2021-03-21  7:00 ` [bug#42885] [PATCHES] 2 more fixes Brendan Tildesley via Guix-patches via

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1216030188.59802.1617880663286@office.mailbox.org \
    --to=mail@brendan.scot \
    --cc=42885@debbugs.gnu.org \
    --cc=leo@famulari.name \
    /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 external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.