From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jelle Licht Subject: [PATCH] gnu: wxwidgets-2: Update to upstream's re-release of 2.8.12. Date: Fri, 22 Jul 2016 15:59:48 +0200 Message-ID: <20160722135948.23541-1-jlicht@fsfe.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39489) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQazg-0007a7-1n for guix-devel@gnu.org; Fri, 22 Jul 2016 10:00:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQazc-0006Cr-Eo for guix-devel@gnu.org; Fri, 22 Jul 2016 09:59:59 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33187) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQazc-0006Ck-8U for guix-devel@gnu.org; Fri, 22 Jul 2016 09:59:56 -0400 Received: by mail-wm0-f66.google.com with SMTP id o80so6329124wme.0 for ; Fri, 22 Jul 2016 06:59:55 -0700 (PDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/wxwidgets.scm (wxwidgets-2): Add a guix revision number to the version scheme of wxwidgets-2 to force an update. --- gnu/packages/wxwidgets.scm | 54 +++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index c9eb178..f4866e1 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -81,29 +81,33 @@ 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"))))) +;; wxwidgets version 2.8.12 was updated in-place, resulting in a hash +;; mismatch. This can be removed at the next version update. (define-public wxwidgets-2 - (package - (inherit wxwidgets) - (version "2.8.12") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/wxwindows/" version - "/wxWidgets-" version ".tar.bz2")) - (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)))) + (let ((upstream-version "2.8.12") + (guix-revision "1")) + (package + (inherit wxwidgets) + (version (string-append upstream-version "-" guix-revision)) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/wxwindows/" upstream-version + "/wxWidgets-" upstream-version ".tar.bz2")) + (sha256 + (base32 "01zp0h2rp031xn6nd8c4sr175fa4nzhwh08mhi8khs0ps39c22iv")))) + (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))))) -- 2.9.1