From: Jelle Licht <jlicht@fsfe.org>
To: guix-devel@gnu.org
Subject: [PATCH] gnu: wxwidgets-2: Update to upstream's re-release of 2.8.12.
Date: Fri, 22 Jul 2016 15:59:48 +0200 [thread overview]
Message-ID: <20160722135948.23541-1-jlicht@fsfe.org> (raw)
* 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
next reply other threads:[~2016-07-22 14:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-22 13:59 Jelle Licht [this message]
2016-07-22 14:01 ` [PATCH] gnu: wxwidgets-2: Update to upstream's re-release of 2.8.12 Jelle Licht
2016-07-22 14:09 ` Vincent Legoll
2016-07-22 16:11 ` Leo Famulari
2016-07-24 8:28 ` Andreas Enge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160722135948.23541-1-jlicht@fsfe.org \
--to=jlicht@fsfe.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).