diff options
author | Christopher Baines <mail@cbaines.net> | 2023-03-02 10:37:28 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2023-03-02 10:55:08 +0000 |
commit | 7df09ee0ab3e7962ef27859ce87e06a323059284 (patch) | |
tree | d81334f742ddcb9a1ee63961ca6410922980af1c /gnu/packages/wxwidgets.scm | |
parent | 2ac51ec99b58b50c08ba719a8c7e9dba0330b065 (diff) | |
parent | af95f2d8f98eb2c8c64954bb2fd0b70838899174 (diff) | |
download | guix-7df09ee0ab3e7962ef27859ce87e06a323059284.tar.gz guix-7df09ee0ab3e7962ef27859ce87e06a323059284.zip |
Merge remote-tracking branch 'savannah/master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/autotools.scm
gnu/packages/cmake.scm
gnu/packages/gnuzilla.scm
gnu/packages/haskell.scm
gnu/packages/pdf.scm
gnu/packages/python-xyz.scm
gnu/packages/samba.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/wxwidgets.scm
Diffstat (limited to 'gnu/packages/wxwidgets.scm')
-rw-r--r-- | gnu/packages/wxwidgets.scm | 49 |
1 files changed, 37 insertions, 12 deletions
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 0eaebc1068..b226aa4e83 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2023 Andreas Enge <andreas@enge.fr> +;;; Copyright © 2023 Malte Frank Gerdes <malte.f.gerdes@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix l:) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix utils) #:use-module (gnu packages) @@ -46,13 +48,16 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) - #:use-module (gnu packages photo) - #:use-module (gnu packages video) #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) + #:use-module (gnu packages perl-check) + #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sdl) + #:use-module (gnu packages video) + #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) @@ -121,20 +126,12 @@ "--with-sdl" "--enable-gui" "--enable-mediactrl" - "--enable-webview" - "--enable-webviewwebkit") + "--enable-webview") #:make-flags #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")) #:tests? #f ;TODO #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'use-newer-webkit - (lambda _ - ;; XXX: The configure script tests only for an ancient - ;; WebKitGTK version. - (substitute* "configure" - (("webkit2gtk-4\\.0") - "webkit2gtk-4.1")))) (add-after 'unpack 'refer-to-inputs (lambda* (#:key inputs #:allow-other-keys) (let ((catch (search-input-file inputs "include/catch.hpp")) @@ -342,8 +339,36 @@ provide a 100% native look and feel for the application.") (synopsis "C++ library to create, manipulate and render SVG files") (description "wxSVG is a C++ library to create, manipulate and render @dfn{Scalable Vector Graphics} (SVG) files with the wxWidgets toolkit.") - (home-page "http://wxsvg.sourceforge.net") + (home-page "https://wxsvg.sourceforge.net") ;; wxSVG is licenced under the "wxWindows library licence", which is ;; the LGPL2.0+, with a few extra permissions. (license (list l:lgpl2.0+ (l:fsf-free "file://COPYING"))))) + +(define-public perl-alien-wxwidgets + (package + (name "perl-alien-wxwidgets") + (version "0.69") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-" + version + ".tar.gz")) + (sha256 + (base32 + "0jg2dmkzhj03f6b0vmv597yryfw9cclsdn9ynvvlrzzgpd5lw8jk")))) + (build-system perl-build-system) + (native-inputs + (list perl-lwp-protocol-https + perl-module-build + perl-test-pod + perl-test-pod-coverage + wxwidgets)) + (propagated-inputs (list perl-module-pluggable)) + (home-page "https://metacpan.org/release/Alien-wxWidgets") + (synopsis "Perl module for wxWidgets binaries") + (description "Alien::wxWidgets is a Perl module for detecting and +getting configuration settings from an installed wxWidgets package.") + (license l:perl-license))) |