* [PATCH] gnu: wxwidgets-2: Update to upstream's re-release of 2.8.12.
@ 2016-07-22 13:59 Jelle Licht
2016-07-22 14:01 ` Jelle Licht
2016-07-22 16:11 ` Leo Famulari
0 siblings, 2 replies; 5+ messages in thread
From: Jelle Licht @ 2016-07-22 13:59 UTC (permalink / raw)
To: guix-devel
* 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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] gnu: wxwidgets-2: Update to upstream's re-release of 2.8.12.
2016-07-22 13:59 [PATCH] gnu: wxwidgets-2: Update to upstream's re-release of 2.8.12 Jelle Licht
@ 2016-07-22 14:01 ` Jelle Licht
2016-07-22 14:09 ` Vincent Legoll
2016-07-22 16:11 ` Leo Famulari
1 sibling, 1 reply; 5+ messages in thread
From: Jelle Licht @ 2016-07-22 14:01 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 3020 bytes --]
Hello guix,
Shamelessly stole most of this from Efraim, as wxwidgets had the same
problem.
Lets hope that it's just a couple of packages on SourceForge that have been
changed in place.
Jelle
2016-07-22 15:59 GMT+02:00 Jelle Licht <jlicht@fsfe.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
>
>
[-- Attachment #2: Type: text/html, Size: 4295 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] gnu: wxwidgets-2: Update to upstream's re-release of 2.8.12.
2016-07-22 13:59 [PATCH] gnu: wxwidgets-2: Update to upstream's re-release of 2.8.12 Jelle Licht
2016-07-22 14:01 ` Jelle Licht
@ 2016-07-22 16:11 ` Leo Famulari
2016-07-24 8:28 ` Andreas Enge
1 sibling, 1 reply; 5+ messages in thread
From: Leo Famulari @ 2016-07-22 16:11 UTC (permalink / raw)
To: Jelle Licht; +Cc: guix-devel
On Fri, Jul 22, 2016 at 03:59:48PM +0200, Jelle Licht wrote:
> * gnu/packages/wxwidgets.scm (wxwidgets-2): Add a guix revision number
> to the version scheme of wxwidgets-2 to force an update.
> - (uri (string-append "mirror://sourceforge/wxwindows/" version
> - "/wxWidgets-" version ".tar.bz2"))
> - (sha256
> - (base32 "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk"))))
> + (uri (string-append "mirror://sourceforge/wxwindows/" upstream-version
> + "/wxWidgets-" upstream-version ".tar.bz2"))
> + (sha256
> + (base32 "01zp0h2rp031xn6nd8c4sr175fa4nzhwh08mhi8khs0ps39c22iv"))))
Without noticing, I changed the wxwidgets-2.8 URL from the following while
"fixing" changed SourceForge URLs recently:
mirror://sourceforge/wxwindows/wxGTK-" version ".tar.gz
Notice that the tarball name changed from 'wxGTK' to 'wxWidgets'.
So, upstream did not change the package in place. We started fetching
something else accidentally.
Which URL is correct?
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-07-24 8:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-22 13:59 [PATCH] gnu: wxwidgets-2: Update to upstream's re-release of 2.8.12 Jelle Licht
2016-07-22 14:01 ` Jelle Licht
2016-07-22 14:09 ` Vincent Legoll
2016-07-22 16:11 ` Leo Famulari
2016-07-24 8:28 ` Andreas Enge
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).