[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#30362] [PATCH] gnu: Don't export GnuCash's webkitgtk-gtk2.
From: |
Leo Famulari |
Subject: |
[bug#30362] [PATCH] gnu: Don't export GnuCash's webkitgtk-gtk2. |
Date: |
Mon, 5 Feb 2018 17:44:58 -0500 |
* gnu/packages/webkit.scm (webkitgtk-2.4): Remove variable.
(webkitgtk/gtk+-2): Move the package to ...
* gnu/packages/gnucash.scm: ... here, and make it private.
---
gnu/packages/gnucash.scm | 40 ++++++++++++++++++++++++++++++++++++++++
gnu/packages/webkit.scm | 47 -----------------------------------------------
2 files changed, 40 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm
index 25200e3f9..ee97790e4 100644
--- a/gnu/packages/gnucash.scm
+++ b/gnu/packages/gnucash.scm
@@ -28,8 +28,10 @@
#:use-module (guix build-system glib-or-gtk)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
+ #:use-module (gnu packages flex)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages glib)
@@ -244,3 +246,41 @@ OFX DirectConnect, YellowNet, GeldKarte, and DTAUS discs
are currently
supported. AqBanking is used by GnuCash, KMyMoney, and QBankManager.")
;; AqBanking is licensed under the GPLv2 or GPLv3
(license (list license:gpl2 license:gpl3))))
+
+;; Latest release of the stable 2.4 series, with WebKit1 support. Also the last
+;; GTK+2 port. This package is unmaintained upstream and not safe to use with
+;; untrusted input. However, it is still required by GnuCash.
+;; TODO Remove this package once GnuCash has been updated.
+(define webkitgtk/gtk+-2
+ (package (inherit webkitgtk)
+ (name "webkitgtk-gtk2")
+ (version "2.4.11")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://www.webkitgtk.org/releases/"
+ "webkitgtk-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; no tests
+ ;; FIXME: Disabling parallel building is a quick hack to avoid the
+ ;; failure described in
+ ;; https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html
+ ;; A more structural fix is needed.
+ #:parallel-build? #f
+ #:configure-flags
+ '("--enable-webkit2=no"
+ "--with-gtk=2.0")
+ #:phases (modify-phases %standard-phases
+ (add-after
+ 'unpack 'set-gcc
+ (lambda _ (setenv "CC" "gcc") #t)))))
+ (native-inputs
+ `(("flex" ,flex)
+ ("which" ,which)
+ ,@(package-native-inputs webkitgtk)))
+ (propagated-inputs
+ `(("gtk+-2" ,gtk+-2)
+ ("libsoup" ,libsoup)))))
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 340221640..c08ba9176 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -142,50 +142,3 @@ HTML/CSS applications to full-fledged web browsers.")
license:lgpl2.1+
license:bsd-2
license:bsd-3))))
-
-;; Latest release of the stable 2.4 series, with WebKit1 support.
-(define-public webkitgtk-2.4
- (package (inherit webkitgtk)
- (name "webkitgtk")
- (version "2.4.11")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://www.webkitgtk.org/releases/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq"))))
- (build-system gnu-build-system)
- (arguments
- '(#:tests? #f ; no tests
- ;; FIXME: Disabling parallel building is a quick hack to avoid the
- ;; failure described in
- ;; https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html
- ;; A more structural fix is needed.
- #:parallel-build? #f
- #:phases (modify-phases %standard-phases
- (add-after
- 'unpack 'set-gcc
- (lambda _ (setenv "CC" "gcc") #t)))))
- (native-inputs
- `(("flex" ,flex)
- ("which" ,which)
- ,@(package-native-inputs webkitgtk)))))
-
-;; Last GTK+2 port, required by GnuCash.
-(define-public webkitgtk/gtk+-2
- (package (inherit webkitgtk-2.4)
- (name "webkitgtk-gtk2")
- (arguments
- `(;; FIXME: Disabling parallel building is a quick hack to avoid the
- ;; failure described in
- ;; https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html
- ;; A more structural fix is needed.
- #:parallel-build? #f
- #:configure-flags
- '("--enable-webkit2=no"
- "--with-gtk=2.0")
- ,@(package-arguments webkitgtk-2.4)))
- (propagated-inputs
- `(("gtk+-2" ,gtk+-2)
- ("libsoup" ,libsoup)))))
--
2.16.1
- [bug#30362] [PATCH] gnu: Don't export GnuCash's webkitgtk-gtk2.,
Leo Famulari <=