From mboxrd@z Thu Jan 1 00:00:00 1970 From: mike.rosset@gmail.com Subject: Re: qtwenengine anybody? Date: Tue, 07 Jan 2020 11:28:38 -0800 Message-ID: <871rsbxdzt.fsf@gmail.com> References: <871rt4qnp9.fsf@gmail.com> <87immgp582.fsf@gmail.com> <5955729d-ef57-ffb8-feb8-36a9f53658a2@crazy-compilers.com> <87d0clpbt6.fsf@gmail.com> <87y2v7e0g4.fsf@ambrevar.xyz> <87v9qb56gg.fsf@gmail.com> <87sglfotvj.fsf@ambrevar.xyz> <87o8w354m5.fsf@gmail.com> <87blrod2so.fsf@ambrevar.xyz> <878smsd2pe.fsf@ambrevar.xyz> <87mub7krlq.fsf@gmail.com> <87tv5e9acb.fsf@ambrevar.xyz> <87o8vmn6an.fsf@elephly.net> <87zhf2c5jy.fsf@gmail.com> <87lfql7k9w.fsf@elephly.net> <87d0bw2xtj.fsf@devup.no> <871rsccdq8.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:34699) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iouX1-0008V5-7r for guix-devel@gnu.org; Tue, 07 Jan 2020 14:28:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iouWz-0001tn-KU for guix-devel@gnu.org; Tue, 07 Jan 2020 14:28:47 -0500 In-Reply-To: (Hartmut Goebel's message of "Tue, 7 Jan 2020 11:26:20 +0100") 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+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Hartmut Goebel Cc: guix-devel@gnu.org, GNU Guix maintainers --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hartmut Goebel writes: > Am 07.01.20 um 01:27 schrieb mike.rosset@gmail.com: >> >>> With these changes, I think the package is ready to go. \o/ >> This is really great work Marius I appreciate this addition. I was >> actually just looking at this approach yesterday.=20 >> >> I've merged your two patches with one minor description addition that Ha= rtmut >> requested. > > > Great work you've done! I'm looking forward to get this merged to > master, so I can continue working on some more KDE packages. > > >> Hartmut the merged complete diff can be found here. >> https://gitlab.com/mike.rosset/guix/compare/master...merge-qtwebengine > > Fine for me. > > Just some super-nitpicky nitpicks: > > >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (base32 >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 >> "08c60nh95m98mcqk444axs76xi6m9x0wvdxrzk9c2cxwqdbz59fa")))) > > Maybe move has into `base32` line > > >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 (define (third-party? file) >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (if (string-contains file "third_party/") >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #t >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #f)) > The "if" could be omitted, I assume Hello Hartmut, I've attached a patch that resolves these suggestions. Along with patches to fix punctuation suggested by Pierre. Complete diff can still be found at. https://gitlab.com/mike.rosset/guix/compare/master...merge-qtwebengine Marius I've forgot to attach from your series in my last email. I've attached the rest of the series for you. encase you want to git am. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-gnu-qtwebengine-description-field-now-notes-source-r.patch >From 531edfc848c7253b6768ab5404773a5db54da6f2 Mon Sep 17 00:00:00 2001 From: Mike Rosset Date: Mon, 6 Jan 2020 16:16:18 -0800 Subject: [PATCH 3/5] gnu: qtwebengine: description field now notes source re base summary * gnu/packages/qt.scm (qtwebengine)[description]: Note Qt Chromium source re base details. --- gnu/packages/qt.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 38a620c90c..87f3470773 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2340,8 +2340,9 @@ time Web content can be enhanced with native controls.") (files '("lib/qt5/libexec/QtWebEngineProcess"))))) (home-page "https://www.qt.io") (synopsis "Qt WebEngine module") - (description "Qt5WebEngine provides support for web -applications using the Chromium browser project.") + (description "Qt5WebEngine provides support for web applications using the +Chromium browser project. The Chromium source base has Google services and +binaries removed along with modular support for system libraries.") (license license:lgpl2.1+))) (define-public dotherside -- 2.24.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-qtwebengine-simplify-snippet-field-third-party-f.patch >From 1dfcc7e834cf2d6c28d297e4ffa801664f0532a1 Mon Sep 17 00:00:00 2001 From: Mike Rosset Date: Tue, 7 Jan 2020 10:02:27 -0800 Subject: [PATCH 4/5] gnu: qtwebengine: simplify snippet field third-party? function * gnu/packages/qt.scm (qtwebengine)[snippet]: string-contains? returns a boolean so 'if condition is not required. Small syntax improvement. base32 field argument is now on the same line --- gnu/packages/qt.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 87f3470773..78486c3622 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2046,8 +2046,7 @@ time Web content can be enhanced with native controls.") "/submodules/" name "-everywhere-src-" version ".tar.xz")) (sha256 - (base32 - "08c60nh95m98mcqk444axs76xi6m9x0wvdxrzk9c2cxwqdbz59fa")) + (base32 "08c60nh95m98mcqk444axs76xi6m9x0wvdxrzk9c2cxwqdbz59fa")) (modules '((ice-9 ftw) (ice-9 match) (srfi srfi-1) @@ -2145,9 +2144,7 @@ time Web content can be enhanced with native controls.") (define (empty? dir) (equal? (scandir dir) '("." ".."))) (define (third-party? file) - (if (string-contains file "third_party/") - #t - #f)) + (string-contains file "third_party/")) (define (useless? file) (any (cute string-suffix? <> file) '(".zip" ".so" ".dll" ".exe" ".jar"))) -- 2.24.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-qtwebengine-improve-punctuation-within-comments.patch >From 6916f2f253e127d354be6e2a0bc2ac8af52ad159 Mon Sep 17 00:00:00 2001 From: Mike Rosset Date: Tue, 7 Jan 2020 11:17:41 -0800 Subject: [PATCH 5/5] gnu: qtwebengine: improve punctuation within comments. * gnu/packages/qt.scm (qtwebengine)[comments]: Add appropriate punctuation to input and test comments. This helps differentiate context of some warnings and errors. --- gnu/packages/qt.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 78486c3622..0d060de0c3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2257,8 +2257,8 @@ time Web content can be enhanced with native controls.") ("libxi" ,libxi) ("libxkbcommon" ,libxkbcommon) ;; FIXME: libxml2 needs to built with icu support though it links to - ;; libxml2 configure summary still states. Checking for compatible - ;; system libxml2... no + ;; libxml2 configure summary still states "Checking for compatible + ;; system libxml2... no" ("libxml2" ,libxml2) ("libxrandr" ,libxrandr) ("libxrender" ,libxrender) @@ -2325,9 +2325,9 @@ time Web content can be enhanced with native controls.") "--webengine-ffmpeg=system" "--webengine-icu=system" "--webengine-pepper-plugins=no"))))) - ;; Tests are disabled due to Could not find QtWebEngineProcess error + ;; Tests are disabled due to "Could not find QtWebEngineProcess error" ;; It's possible this can be fixed by setting QTWEBENGINEPROCESS_PATH - ;; before running tests It's also possible some tests need a network + ;; before running tests. It's also possible some tests need a network ((#:tests? _ #f) #f))) (native-search-paths (list (search-path-specification -- 2.24.1 --=-=-= Content-Type: text/plain Mike --=-=-=--