From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eodYY-0004fu-BE for guix-patches@gnu.org; Wed, 21 Feb 2018 18:13:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eodXU-0001yg-6O for guix-patches@gnu.org; Wed, 21 Feb 2018 18:12:10 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:47158) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eodXT-0001wj-ES for guix-patches@gnu.org; Wed, 21 Feb 2018 18:11:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eodXR-0007F3-S5 for guix-patches@gnu.org; Wed, 21 Feb 2018 18:11:03 -0500 Subject: [bug#30492] [PATCH v2 3/4] Revert "gnu: Remove wxwidgets@2.8." Resent-Message-ID: Date: Thu, 22 Feb 2018 00:09:59 +0100 From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= Message-ID: <20180222000959.4f915ae4@alma-ubu> In-Reply-To: <20180222000121.0f7ae767@alma-ubu> References: <20180216220913.08cc8ca0@alma-ubu> <20180216222028.586da030@alma-ubu> <87bmgmtece.fsf@fastmail.com> <20180222000121.0f7ae767@alma-ubu> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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: 30492@debbugs.gnu.org This reverts commit 6f9ba4c91c096a2fb95da111be0657d99ef2b683. --- gnu/packages/wxwidgets.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 84446d8ef..ca357ad01 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -97,6 +97,34 @@ a graphical user interface. It has language bindings for Python, Perl, Ruby and many other languages.") (license (list l:lgpl2.0+ (l:fsf-free "file://doc/license.txt"))))) +(define-public wxwidgets-2 + (package + (inherit wxwidgets) + (version "2.8.12") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/wxWidgets/wxWidgets/" + "releases/download/v" version + "/wxGTK-" version ".tar.gz")) + (sha256 + (base32 "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk")))) + (inputs + `(("gtk" ,gtk+-2) + ("libjpeg" ,libjpeg) + ("libtiff" ,libtiff) + ("libmspack" ,libmspack) + ("sdl" ,sdl) + ("unixodbc" ,unixodbc))) + (arguments + `(#:configure-flags + '("--enable-unicode" "--with-regex=sys" "--with-sdl") + #:make-flags + (list (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib")) + ;; No 'check' target. + #:tests? #f)))) + (define-public wxwidgets-gtk2 (package (inherit wxwidgets) (inputs `(("gtk+" ,gtk+-2) -- 2.16.1