Unverified Commit cf4b2149 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

mate.libmateweather: 1.28.0 -> 1.28.1 (#457013)

parents 34c024ec ae2bb666

pkgs/desktops/mate/libmateweather/default.nix

+12 −5
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  autoconf-archive,

  autoreconfHook,

  fetchurl,

  pkg-config,

  gettext,

  glib,
@@ -12,15 +13,18 @@ 
  gtk-doc,

  libsoup_3,

  tzdata,

  mate-common,

  mateUpdateScript,

}:

stdenv.mkDerivation rec {

  pname = "libmateweather";

  version = "1.28.0";

  version = "1.28.1";



  src = fetchurl {

    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

    sha256 = "VUNz3rWzk7nYSydd0spmyaSi0ObskgRPq4qlPjAy0rU=";

  src = fetchFromGitHub {

    owner = "mate-desktop";

    repo = "libmateweather";

    tag = "v${version}";

    hash = "sha256-W0p4+OMr2sgkQP10DGjZLf2VTSGa2A+5ey+nYBr+HJQ=";

  };



  patches = [
@@ -31,12 +35,15 @@ stdenv.mkDerivation rec { 
  strictDeps = true;



  nativeBuildInputs = [

    autoconf-archive

    autoreconfHook # the libsoup patch changes the autoconf file

    pkg-config

    gettext

    glib # glib-compile-schemas

    gtk3 # gtk-update-icon-cache

    gtk-doc # required for autoconf

    libxml2 # xmllint

    mate-common # mate-compiler-flags.m4 macros

  ];



  buildInputs = [

pkgs/desktops/mate/libmateweather/libsoup_3_support.patch

+3 −3
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ index 7bc24fc..d470822 100644 
 

     loc = info->location;

 

     searchkey = g_strdup_printf ("<raw_text>%s", loc->code);

     searchkey = g_strdup_printf ("<raw_text>METAR %s", loc->code);

-    p = strstr (msg->response_body->data, searchkey);

-    g_free (searchkey);

+
@@ -398,7 +398,7 @@ index 7bc24fc..d470822 100644 
     }

 

-    msg = soup_form_request_new (

-        "GET", "https://aviationweather.gov/cgi-bin/data/dataserver.php",

-        "GET", "https://aviationweather.gov/api/data/dataserver",

+    query = soup_form_encode (

         "dataSource", "metars",

         "requestType", "retrieve",
@@ -409,7 +409,7 @@ index 7bc24fc..d470822 100644 
         NULL);

-    soup_session_queue_message (info->session, msg, metar_finish, info);

+    msg = soup_message_new_from_encoded_form (

+        "GET", "https://aviationweather.gov/cgi-bin/data/dataserver.php",

+        "GET", "https://aviationweather.gov/api/data/dataserver",

+        query);

+    soup_session_send_and_read_async (info->session, msg, G_PRIORITY_DEFAULT,

+                                      NULL, metar_finish, info);