From 048fca7b5f0e4673372e4388f3b222f934747df9 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 18 Jan 2018 18:47:10 +0100
Subject: gnu: wine: Update to 3.0.

* gnu/packages/wine.scm (wine): Update to 3.0.
---
 gnu/packages/wine.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/wine.scm')

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 655367ac33..a15a56e84e 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -61,14 +61,14 @@ (define-module (gnu packages wine)
 (define-public wine
   (package
     (name "wine")
-    (version "2.0.4")
+    (version "3.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://dl.winehq.org/wine/source/2.0"
+              (uri (string-append "https://dl.winehq.org/wine/source/3.0"
                                   "/wine-" version ".tar.xz"))
               (sha256
                (base32
-                "0nlq6apyq7hq36l3g6gw76lhi8ijz11v3v8m4vxy8d6x1qsppq5m"))))
+                "1v7vq9iinkscbq6wg85fb0d2137660fg2nk5iabxkl2wr850asil"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("gettext" ,gettext-minimal)
-- 
cgit v1.2.3


From 87d4e9b94d905316a07a9693839111119c2bd94e Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 18 Jan 2018 18:48:35 +0100
Subject: gnu: Remove wine-next.

* gnu/packages/wine.scm: Remove wine-next.
---
 gnu/packages/wine.scm | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'gnu/packages/wine.scm')

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index a15a56e84e..d0159d693d 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -210,20 +210,6 @@ (define-public wine64
     (synopsis "Implementation of the Windows API (WoW64 version)")
     (supported-systems '("x86_64-linux" "aarch64-linux"))))
 
-;; TODO: This is wine development version, provided for historical reasons.
-;; We can remove it as soon as a new stable release is out.
-(define-public wine-next
-  (package (inherit wine)
-    (name "wine-next")
-    (version "2.11")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://dl.winehq.org/wine/source/2.x"
-                                  "/wine-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0g6cwjyqwc660w33453aklh3hpc0b8rrb88dryn23ah6wannvagg"))))))
-
 (define-public wine-staging
   (package
     (inherit wine)
-- 
cgit v1.2.3


From 6f10e74fc7dbda67d049bd7e700d48470f849cf3 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Fri, 19 Jan 2018 10:59:20 +0200
Subject: gnu: wine: Parameterize version string in uri.

* gnu/packages/wine.scm (wine)[source]: Replace hard-coded version
string with parameterized version.
---
 gnu/packages/wine.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/wine.scm')

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index d0159d693d..754389979a 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -64,7 +64,8 @@ (define-public wine
     (version "3.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://dl.winehq.org/wine/source/3.0"
+              (uri (string-append "https://dl.winehq.org/wine/source/"
+                                  (version-major+minor version)
                                   "/wine-" version ".tar.xz"))
               (sha256
                (base32
-- 
cgit v1.2.3