From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jelle Licht Subject: Re: [PATCH] gnu: wxwidgets-2: Update to upstream's re-release of 2.8.12. Date: Fri, 22 Jul 2016 16:01:47 +0200 Message-ID: References: <20160722135948.23541-1-jlicht@fsfe.org> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a11423b42279c66053839e061 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQb1b-0000Tw-Vn for guix-devel@gnu.org; Fri, 22 Jul 2016 10:02:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQb1Z-0006j1-8o for guix-devel@gnu.org; Fri, 22 Jul 2016 10:01:59 -0400 Received: from cavendish.fsfeurope.org ([2001:aa8:ffed::3:102]:40173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQb1Y-0006iY-Rd for guix-devel@gnu.org; Fri, 22 Jul 2016 10:01:57 -0400 Received: from localhost (localhost [127.0.0.1]) by cavendish.fsfeurope.org (Postfix) with ESMTP id 4603C63BA10 for ; Fri, 22 Jul 2016 16:01:54 +0200 (CEST) Received: from cavendish.fsfeurope.org ([127.0.0.1]) by localhost (cavendish.fsfeurope.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ja1FE6zs42bx for ; Fri, 22 Jul 2016 16:01:51 +0200 (CEST) Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) (Authenticated sender: jlicht) by cavendish.fsfeurope.org (Postfix) with ESMTPSA id 38A4563BA5A for ; Fri, 22 Jul 2016 16:01:51 +0200 (CEST) Received: by mail-wm0-f51.google.com with SMTP id q128so58583808wma.1 for ; Fri, 22 Jul 2016 07:01:51 -0700 (PDT) In-Reply-To: <20160722135948.23541-1-jlicht@fsfe.org> 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 --001a11423b42279c66053839e061 Content-Type: text/plain; charset=UTF-8 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 : > * 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 > > --001a11423b42279c66053839e061 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hello guix,

Shamelessly stole most = of this from Efraim, as wxwidgets had the same problem.

L= ets hope that it's just a couple of packages on SourceForge that have b= een 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 =C2=A0 to the version scheme of wxwidgets-2 to force an update.
---
=C2=A0gnu/packages/wxwidgets.scm | 54 +++++++++++++++++++++++++------------= ---------
=C2=A01 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.=C2=A0 It has language bindi= ngs for Python, Perl, Ruby
=C2=A0and many other languages.")
=C2=A0 =C2=A0 =C2=A0(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.
=C2=A0(define-public wxwidgets-2
-=C2=A0 (package
-=C2=A0 =C2=A0 (inherit wxwidgets)
-=C2=A0 =C2=A0 (version "2.8.12")
-=C2=A0 =C2=A0 (source
-=C2=A0 =C2=A0 =C2=A0(origin
-=C2=A0 =C2=A0 =C2=A0 =C2=A0(method url-fetch)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0(uri (string-append "mirror://sourceforge/= wxwindows/" version
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0"/wxWidgets-" version ".tar.bz2"= ;))
-=C2=A0 =C2=A0 =C2=A0 =C2=A0(sha256
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 (base32 "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw= 26m3asxr1jwvqbr8kkqk"))))
-=C2=A0 =C2=A0 (inputs
-=C2=A0 =C2=A0 =C2=A0`(("gtk" ,gtk+-2)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0("libjpeg" ,libjpeg)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0("libtiff" ,libtiff)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0("libmspack" ,libmspack)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0("sdl" ,sdl)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0("unixodbc" ,unixodbc)))
-=C2=A0 =C2=A0 (arguments
-=C2=A0 =C2=A0 =C2=A0`(#:configure-flags
-=C2=A0 =C2=A0 =C2=A0 =C2=A0'("--enable-unicode" "--with= -regex=3Dsys" "--with-sdl")
-=C2=A0 =C2=A0 =C2=A0 =C2=A0#:make-flags
-=C2=A0 =C2=A0 =C2=A0 =C2=A0(list (string-append "LDFLAGS=3D-Wl,-rpath= =3D"
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 (assoc-ref %outputs "out") "/lib&qu= ot;))
-=C2=A0 =C2=A0 =C2=A0 =C2=A0;; No 'check' target.
-=C2=A0 =C2=A0 =C2=A0 =C2=A0#:tests? #f))))
+=C2=A0 (let ((upstream-version "2.8.12")
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 (guix-revision "1"))
+=C2=A0 =C2=A0 (package
+=C2=A0 =C2=A0 =C2=A0 (inherit wxwidgets)
+=C2=A0 =C2=A0 =C2=A0 (version (string-append upstream-version "-"= ; guix-revision))
+=C2=A0 =C2=A0 =C2=A0 (source
+=C2=A0 =C2=A0 =C2=A0 =C2=A0(origin
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(method url-fetch)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(uri (string-append "mirror://sourc= eforge/wxwindows/" upstream-version
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"/wxWidgets-" upstream-version &qu= ot;.tar.bz2"))
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(sha256
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (base32 "01zp0h2rp031xn6nd8c4sr175= fa4nzhwh08mhi8khs0ps39c22iv"))))
+=C2=A0 =C2=A0 =C2=A0 (inputs
+=C2=A0 =C2=A0 =C2=A0 =C2=A0`(("gtk" ,gtk+-2)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0("libjpeg" ,libjpeg)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0("libtiff" ,libtiff)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0("libmspack" ,libmspack)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0("sdl" ,sdl)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0("unixodbc" ,unixodbc)))
+=C2=A0 =C2=A0 =C2=A0 (arguments
+=C2=A0 =C2=A0 =C2=A0 =C2=A0`(#:configure-flags
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'("--enable-unicode" "= ;--with-regex=3Dsys" "--with-sdl")
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0#:make-flags
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(list (string-append "LDFLAGS=3D-Wl= ,-rpath=3D"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (assoc-ref %outputs "out") "= /lib"))
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0;; No 'check' target.
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0#:tests? #f)))))
--
2.9.1


--001a11423b42279c66053839e061--