From e81c906647b64c69d116f3558321cf2a85eb8a13 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 20 Jan 2018 16:41:41 +0100
Subject: gnu: wxsvg: Update to 1.5.12.

* gnu/packages/wxwidgets.scm (wxsvg): Update to 1.5.12.
---
 gnu/packages/wxwidgets.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 4804e345c2..84446d8ef0 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
 ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -199,7 +200,7 @@ (define-public python2-wxpython
 (define-public wxsvg
   (package
     (name "wxsvg")
-    (version "1.5.11")
+    (version "1.5.12")
     (source
      (origin
        (method url-fetch)
@@ -207,7 +208,7 @@ (define-public wxsvg
                             version "/wxsvg-" version ".tar.bz2"))
        (sha256
         (base32
-         "0m3ff8mjiq4hvy8rmxyc9fkpf24xwxhvr3a6jmvr2q5zc41xhz7x"))))
+         "1hn3h9kzsjs4wimlpknzjfgn7q0n792hh7v3mshjgsjxdcrckzan"))))
     (build-system glib-or-gtk-build-system)
     (inputs
      `(("wxwidgets" ,wxwidgets-3.1)
-- 
cgit v1.2.3


From 8a58182c12193ae27359591c92febfdd602411f4 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Mon, 22 Jan 2018 17:34:13 +0100
Subject: gnu: wxwidgets: Use webkitgtk-2.4.

* gnu/packages/wxwidgets.scm (wxwidgets)[inputs]: Replace "webkitgtk" by
"webkitgtk-2.4".
---
 gnu/packages/wxwidgets.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 84446d8ef0..9a62f5cf1c 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -69,7 +69,7 @@ (define-public wxwidgets
        ("libsm" ,libsm)
        ("libtiff" ,libtiff)
        ("mesa" ,mesa)
-       ("webkitgtk" ,webkitgtk)
+       ("webkitgtk" ,webkitgtk-2.4)
        ("sdl" ,sdl)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
cgit v1.2.3


From afb7cd8e667bdf2c814e5c7ffe4cc663b3a4b8ec Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Tue, 23 Jan 2018 01:06:18 +0100
Subject: Revert "gnu: wxwidgets: Use webkitgtk-2.4."

This reverts commit 8a58182c12193ae27359591c92febfdd602411f4.
---
 gnu/packages/wxwidgets.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 9a62f5cf1c..84446d8ef0 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -69,7 +69,7 @@ (define-public wxwidgets
        ("libsm" ,libsm)
        ("libtiff" ,libtiff)
        ("mesa" ,mesa)
-       ("webkitgtk" ,webkitgtk-2.4)
+       ("webkitgtk" ,webkitgtk)
        ("sdl" ,sdl)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
cgit v1.2.3