On Mon, 28 Mar 2016 13:21:37 +0200 Ricardo Wurmus <[email protected]> wrote:
> From ceec9310992cf37c9a423a072db90f7a48120df0 Mon Sep 17 00:00:00 2001 > From: Ricardo Wurmus <[email protected]> > Date: Mon, 28 Mar 2016 13:19:18 +0200 > Subject: [PATCH] gnu: wxwidgets: Enable webview support. > > * gnu/packages/wxwidgets.scm (wxwidgets)[inputs]: Add webkitgtk-2.4. > [arguments]: Add configure flags to enable webview via the webkitgtk > backend. > --- > gnu/packages/wxwidgets.scm | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm > index b49fb2f..2c4a26a 100644 > --- a/gnu/packages/wxwidgets.scm > +++ b/gnu/packages/wxwidgets.scm > @@ -1,5 +1,6 @@ > ;;; GNU Guix --- Functional package management for GNU > ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <[email protected]> > +;;; Copyright © 2016 Ricardo Wurmus <[email protected]> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -31,6 +32,7 @@ > #:use-module (gnu packages image) > #:use-module (gnu packages pkg-config) > #:use-module (gnu packages sdl) > + #:use-module (gnu packages webkit) > #:use-module (gnu packages xorg)) > > (define-public wxwidgets > @@ -45,7 +47,6 @@ > (sha256 > (base32 "0paq27brw4lv8kspxh9iklpa415mxi8zc117vbbbhfjgapf7js1l")))) > (build-system glib-or-gtk-build-system) > - ;; TODO: add WebKit > (inputs > `(("glu" ,glu) > ;; XXX gstreamer-0.10 builds fail > @@ -56,12 +57,17 @@ > ("libsm" ,libsm) > ("libtiff" ,libtiff) > ("mesa" ,mesa) > + ("webkitgtk" ,webkitgtk-2.4) I assume you checked if it'd work with the more recent webkitgtk > ("sdl" ,sdl))) > (native-inputs > `(("pkg-config" ,pkg-config))) > (arguments > '(#:configure-flags > - '("--with-regex=sys" "--with-libmspack" "--with-sdl") > + '("--with-regex=sys" "--with-libmspack" > + "--with-sdl" > + "--enable-webview" > + "--enable-webkit" > + "--enable-webviewwebkit") > #:make-flags > (list (string-append "LDFLAGS=-Wl,-rpath=" > (assoc-ref %outputs "out") "/lib")) Looks good. How much does it change the size of wxwidgets? -- Efraim Flashner <[email protected]> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
pgp9aSmR1tDX5.pgp
Description: OpenPGP digital signature
