[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#33390] [PATCH 1/4] qtwebkit: Fix pri install directory.
From: |
Christopher Baines |
Subject: |
[bug#33390] [PATCH 1/4] qtwebkit: Fix pri install directory. |
Date: |
Tue, 20 Nov 2018 17:48:55 +0000 |
User-agent: |
mu4e 1.0; emacs 26.1 |
Eric Bavier <address@hidden> writes:
>> > From: Eric Bavier <address@hidden>
>> >
>> > This lets qmake find qtwebkit components, allowing packages like
>> > python-pyqt
>> > to find qtwebkit and enable support.
>> >
>> > * gnu/packages/qt.scm (qtwebkit)[arguments]: Add "ECM_MKSPECS_INSTALL_DIR"
>> > to #:configure-flags. Link with "--no-keep-memory".
>> > ---
>> > gnu/packages/qt.scm | 11 ++++++++++-
>> > 1 file changed, 10 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
>> > index d48769982..36f8aef69 100644
>> > --- a/gnu/packages/qt.scm
>> > +++ b/gnu/packages/qt.scm
>> > @@ -10,6 +10,7 @@
>> > ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
>> > ;;; Copyright © 2018 Nicolas Goaziou <address@hidden>
>> > ;;; Copyright © 2018 Hartmut Goebel <address@hidden>
>> > +;;; Copyright © 2018 Eric Bavier <address@hidden>
>> > ;;;
>> > ;;; This file is part of GNU Guix.
>> > ;;;
>> > @@ -2171,7 +2172,15 @@ different kinds of sliders, and much more.")
>> > #:configure-flags (list ;"-DENABLE_API_TESTS=TRUE"
>> > "-DPORT=Qt"
>> > "-DUSE_LIBHYPHEN=OFF"
>> > - "-DUSE_SYSTEM_MALLOC=ON")))
>> > + "-DUSE_SYSTEM_MALLOC=ON"
>> > + ;; XXX: relative dir installs to build dir?
>> > + (string-append "-DECM_MKSPECS_INSTALL_DIR="
>> > + %output
>> > "/lib/qt5/mkspecs/modules")
>> > + ;; Sacrifice a little speed in order to
>> > link
>> > + ;; libraries and test executables in a
>> > + ;; reasonable amount of memory.
>> > +
>> > "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--no-keep-memory"
>> > +
>> > "-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-keep-memory")))
>> > (home-page "https://www.webkit.org")
>> > (synopsis "Web browser engine and classes to render and interact with
>> > web
>> > content")
>>
>> I've tested this, and this fixed the qtwebkit build for me, which
>> currently doesn't work on master. So I'm all for merging it.
>
> Thanks for testing it. I assume it was the linker flags that fixed the
> build on your machine? For clarity, I suppose that change should be
> moved to a separate patch. WDYT?
I don't mind eitherway, I'm just happy that the package builds again
with the patch :)
signature.asc
Description: PGP signature
- [bug#33392] [PATCH 0/4] Add OpenShot, ericbavier, 2018/11/14
- [bug#33391] [PATCH 4/4] gnu: Add OpenShot., ericbavier, 2018/11/14
- [bug#33392] [PATCH 3/4] gnu: Add libopenshot., ericbavier, 2018/11/14
- [bug#33392] [PATCH 2/4] gnu: Add libopenshot-audio., ericbavier, 2018/11/14
- [bug#33392] closing: [PATCH 0/4] Add OpenShot, Eric Bavier, 2018/11/26