From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eipWZ-0000wN-HT for guix-patches@gnu.org; Mon, 05 Feb 2018 17:46:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eipWU-00069R-Kv for guix-patches@gnu.org; Mon, 05 Feb 2018 17:46:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:51276) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eipWU-00069H-H7 for guix-patches@gnu.org; Mon, 05 Feb 2018 17:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eipWU-00084k-6y for guix-patches@gnu.org; Mon, 05 Feb 2018 17:46:02 -0500 Subject: [bug#30362] [PATCH] gnu: Don't export GnuCash's webkitgtk-gtk2. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eipVi-0000eJ-HS for guix-patches@gnu.org; Mon, 05 Feb 2018 17:45:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eipVd-0005Y1-9o for guix-patches@gnu.org; Mon, 05 Feb 2018 17:45:14 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:33899) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eipVd-0005Vn-42 for guix-patches@gnu.org; Mon, 05 Feb 2018 17:45:09 -0500 Received: from jasmine.lan (c-76-124-202-137.hsd1.pa.comcast.net [76.124.202.137]) by mail.messagingengine.com (Postfix) with ESMTPA id CAE9A24250 for ; Mon, 5 Feb 2018 17:45:06 -0500 (EST) From: Leo Famulari Date: Mon, 5 Feb 2018 17:44:58 -0500 Message-Id: <8e97c3ee870379f4c7ff5582b48bb814c949ccf6.1517870696.git.leo@famulari.name> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30362@debbugs.gnu.org * 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