Patchwork [08/31] gnu: kde-frameworks: Remove kde-frameworks-version.

login
register
mail settings
Submitter David Craven
Date Aug. 2, 2016, 11:57 a.m.
Message ID <CAL1_im=0x1=4hVHT_WxGxCpBsV+tk=1hKhd2pHgJzS8BDD3JZw@mail.gmail.com>
Download mbox | patch
Permalink /patch/14242/
State New
Headers show

Comments

David Craven - Aug. 2, 2016, 11:57 a.m.
> Ups I just realized I made a mistake on this commit.

What do you want me to do? not that I make things worse... This is
what I pushed.

commit d26e2b9f306a1170d46f7c860c81840d9d600161
Author: David Craven <david@craven.ch>
Date:   Mon Aug 1 16:39:00 2016 +0200

    gnu: kde-frameworks: Remove kde-frameworks-version.

    * gnu/packages/kde-frameworks (kde-frameworks-version): Delete variable.
      (kwindowsystem)[version]: Replace kde-frameworks-version with
version string.
      (oxygen-icons)[version]: Replace kde-frameworks-version with
version string.

         (method url-fetch)
@@ -95,7 +93,7 @@ lower level classes for interaction with the X
Windowing System.")
 (define-public oxygen-icons
   (package
     (name "oxygen-icons")
-    (version kde-frameworks-version)
+    (version "5.24.0")
     (source
       (origin
         (method url-fetch)
Andreas Enge - Aug. 2, 2016, 12:15 p.m.
On Tue, Aug 02, 2016 at 01:57:25PM +0200, David Craven wrote:
> What do you want me to do? not that I make things worse... This is
> what I pushed.
> 
>     gnu: kde-frameworks: Remove kde-frameworks-version.
>     * gnu/packages/kde-frameworks (kde-frameworks-version): Delete variable.
>       (kwindowsystem)[version]: Replace kde-frameworks-version with
> version string.
>       (oxygen-icons)[version]: Replace kde-frameworks-version with
> version string.
> -    (version kde-frameworks-version)
> +    (version "5.24.0")

Oh well... The absolutely correct fix would be to revert this commit and to
replace it by two separate ones. But honestly, I would just do nothing :-)
This is work in progress anyway, nobody can currently use the packages,
so they have just been silently updated.

Andreas

PS: I will commit my qtbase fix tomorrow after the release unless there are
    comments.
Ludovic Courtès - Aug. 2, 2016, 12:44 p.m.
David Craven <david@craven.ch> skribis:

>> Ups I just realized I made a mistake on this commit.
>
> What do you want me to do? not that I make things worse... This is
> what I pushed.
>
> commit d26e2b9f306a1170d46f7c860c81840d9d600161
> Author: David Craven <david@craven.ch>
> Date:   Mon Aug 1 16:39:00 2016 +0200
>
>     gnu: kde-frameworks: Remove kde-frameworks-version.
>
>     * gnu/packages/kde-frameworks (kde-frameworks-version): Delete variable.
>       (kwindowsystem)[version]: Replace kde-frameworks-version with
> version string.
>       (oxygen-icons)[version]: Replace kde-frameworks-version with
> version string.
>
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index 74fbac2..b60d85d 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -27,8 +27,6 @@
>    #:use-module (gnu packages qt)
>    #:use-module (gnu packages xorg))
>
> -(define kde-frameworks-version "5.21.0")

[...]

> +    (version "5.24.0")

Mistake here, fixed in 7b5fc3a320eea930e6bc85a4d65c2ddbe0c9cffa.

Now we should be all right.  :-)

Ludo’.
David Craven - Aug. 2, 2016, 12:50 p.m.
> Now we should be all right.  :-)

Thank you and sorry!

Patch

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 74fbac2..b60d85d 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -27,8 +27,6 @@ 
   #:use-module (gnu packages qt)
   #:use-module (gnu packages xorg))

-(define kde-frameworks-version "5.21.0")
-
 (define-public extra-cmake-modules
   (package
     (name "extra-cmake-modules")
@@ -57,7 +55,7 @@  common build settings used in software produced by
the KDE community.")
 (define-public kwindowsystem
   (package
     (name "kwindowsystem")
-    (version kde-frameworks-version)
+    (version "5.24.0")
     (source
       (origin