From 6d512b5c4d774a9853b51dae464a10cea7e3423a Mon Sep 17 00:00:00 2001 From: Peter Rustler Date: Mon, 7 Dec 2015 11:40:05 +0000 Subject: [PATCH] Add support for new webkit version 4.0 to build system Add new configure value for option --with-webkit. Now you can add 4.0 as value to --with-webkit. Default is still 3.0. https://bugzilla.gnome.org/show_bug.cgi?id=759171 --- configure.ac | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2313c093..3d5d4823 100644 --- a/configure.ac +++ b/configure.ac @@ -77,12 +77,12 @@ dnl ==============================WebKit======================================= m4_define([webkit_default], [3.0]) AC_ARG_WITH([webkit], - [AC_HELP_STRING([--with-webkit=@<:@3.0/1.0@:>@], + [AC_HELP_STRING([--with-webkit=@<:@4.0/3.0/1.0@:>@], [Select the Webkit backend, default=3.0])], [], [with_webkit=webkit_default]) -dnl=== support both 1.0 and 3.0 (default 3.0) == +dnl=== support all 1.0, 3.0 and 4.0 (default 3.0) == AS_CASE([$with_webkit], [3.0], [ WEBKIT_PC=webkitgtk-3.0 @@ -90,6 +90,12 @@ AS_CASE([$with_webkit], AC_CHECK_LIB(webkitgtk-3.0, JSContextGroupCreate,, AC_CHECK_LIB(javascriptcoregtk-3.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-3.0)) ], + [4.0], [ + WEBKIT_PC=webkitgtk-4.0 + SEED_GTK_VERSION=-gtk4 + AC_CHECK_LIB(webkitgtk-4.0, JSContextGroupCreate,, + AC_CHECK_LIB(javascriptcoregtk-4.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-4.0)) + ], [1.0], [ AC_CHECK_LIB(webkitgtk-1.0, JSContextGroupCreate,WEBKIT_PC=webkitgtk-1.0, AC_CHECK_LIB(javascriptcoregtk-1.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-1.0, -- GitLab ange'>range
path: root/tests/grafts.scm
AgeCommit message (Expand)Author
2019-06-27Merge branch 'master' into core-updatesLudovic Courtès
2019-06-27derivations: Add 'derivation-input'....* guix/derivations.scm (derivation-input): New procedure. * tests/grafts.scm (make-derivation-input): Remove. ("graft-derivation, unused outputs not depended on"): Use 'derivation-input'. Ludovic Courtès
2019-06-14packages: Remove 'search-bootstrap-binary'....* gnu/packages.scm (%bootstrap-binaries-path, search-bootstrap-binary): Remove. * gnu/packages/bootstrap.scm (bootstrap-executable): Export. * guix/tests.scm (bootstrap-binary-file, search-bootstrap-binary): Export. * tests/derivations.scm: Remove (gnu packages) import. * tests/grafts.scm: Likewise. * tests/guix-daemon.sh: Likewise. Ludovic Courtès
2018-11-28grafts: Record metadata as derivation properties....* guix/grafts.scm (graft-derivation/shallow): Pass #:properties to 'build-expression->derivation'. * tests/grafts.scm ("graft-derivation, grafted item is a direct dependency"): Check the value returned by 'derivation-properties'. Ludovic Courtès
2017-08-24graft: Correctly replace references near the end of the scan buffer....Fixes <http://bugs.gnu.org/28212>. Reported by Leo Famulari <leo@famulari.name>. * guix/build/graft.scm (replace-store-references): When I >= END, check whether WRITTEN > END and call 'get-bytevector-n!' when it is. * tests/grafts.scm (buffer-size): New variable. ("replace-store-references, <http://bugs.gnu.org/28212>"): New test. Ludovic Courtès
2017-01-25grafts: Do not pull derivation outputs not depended on....Fixes <http://bugs.gnu.org/24886>. Previously, the grafting derivation of, say, brdf-explorer would pull in qt:doc even though brdf-explorer depends only on qt:out, not qt:doc. * guix/grafts.scm (with-cache): Use 'vhash-assoc' and 'vhash-cons' instead of 'vhash-assq' and 'vhash-consq'. (cumulative-grafts): Pass #:outputs to 'graft-derivation/shallow'. Use OUTPUTS instead of (derivation-output-names drv). (graft-derivation): Add #:outputs parameter; pass it to 'cumulative-grafts'. * tests/grafts.scm (make-derivation-input): New variable. ("graft-derivation, replaced derivation has multiple outputs"): Make sure P2:zzz is not part of the outputs of P3D. ("graft-derivation with #:outputs") ("graft-derivation, unused outputs not depended on"): New tests. Ludovic Courtès