From 3411da7c2f1091ab203e4bc3ae90fcd21c2f6fd9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 1 Feb 2023 22:36:22 +0000
Subject: [PATCH] =?UTF-8?q?libchamplain:=200.12.20=20=E2=86=92=200.12.21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/libchamplain/-/compare/LIBCHAMPLAIN_0_12_20...0.12.21

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
---
 .../libraries/libchamplain/default.nix        | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 34440d67818d..1eda49ad3f97 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -1,5 +1,4 @@
 { fetchurl
-, fetchpatch
 , lib
 , stdenv
 , meson
@@ -23,25 +22,15 @@
 
 stdenv.mkDerivation rec {
   pname = "libchamplain";
-  version = "0.12.20";
+  version = "0.12.21";
+
+  outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2";
+    sha256 = "qRXNFyoMUpRMVXn8tGg/ioeMVxv16SglS12v78cn5ac=";
   };
 
-  patches = lib.optionals withLibsoup3 [
-    # Port to libsoup3
-    # https://gitlab.gnome.org/GNOME/libchamplain/-/merge_requests/13
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/libchamplain/-/commit/1cbaf3193c2b38e447fbc383d4c455c3dcac6db8.patch";
-      excludes = [ ".gitlab-ci.yml" ];
-      sha256 = "uk38gExnUgeUKwhDsqRU77hGWhJ+8fG5dSiV2MAWLFk=";
-    })
-  ];
-
-  outputs = [ "out" "dev" "devdoc" ];
-
   nativeBuildInputs = [
     meson
     ninja
@@ -68,6 +57,7 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     "-Dgtk_doc=true"
     "-Dvapi=true"
+    (lib.mesonBool "libsoup3" withLibsoup3)
   ];
 
   passthru = {