geocode-glib: 3.26.3 → 3.26.4

https://gitlab.gnome.org/GNOME/geocode-glib/-/compare/3.26.3...3.26.4

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>

pkgs/development/libraries/geocode-glib/default.nix

@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchurl
-, fetchpatch
 , meson
 , mesonEmulatorHook
 , ninja
@@ -19,31 +18,17 @@
 
 stdenv.mkDerivation rec {
   pname = "geocode-glib";
-  version = "3.26.3";
+  version = "3.26.4";
 
   outputs = [ "out" "dev" "devdoc" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/geocode-glib-${version}.tar.xz";
-    sha256 = "Hf6ug7kOzMobbPfc98XjsxeCjPC1YgXERx7w+RGZl2Y=";
+    sha256 = "LZpoJtFYRwRJoXOHEiFZbaD4Pr3P+YuQxwSQiQVqN6o=";
   };
 
   patches = [
     ./installed-tests-path.patch
-
-    # Install data for pi test.
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/geocode-glib/-/commit/0eb5c21cf4deb2c45aedf5a4393d4208b8dc6d58.patch";
-      sha256 = "DmaPzGEu7f+gjjb2HSZ3+ZMc4EJSsba9ufsVysB0UPA=";
-    })
-    # Fix pi test.
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/geocode-glib/-/commit/464bb3bae5525566a7f41d157f73575cc4f3b5f8.patch";
-      sha256 = "qSjXR8eKl+E38Zp7/Kgge/FxOLHYUJgRSR68okc3No0=";
-      postFetch = ''
-        substituteInPlace $out --replace "LC_MESSAGES" "LC_ALL"
-      '';
-    })
   ];
 
   nativeBuildInputs = [

pkgs/development/libraries/geocode-glib/installed-tests-path.patch

@@ -1,11 +1,17 @@
+diff --git a/geocode-glib/tests/meson.build b/geocode-glib/tests/meson.build
+index 5cd1fca..c2f9a9d 100644
 --- a/geocode-glib/tests/meson.build
 +++ b/geocode-glib/tests/meson.build
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
 -install_dir = get_option('prefix') / get_option('datadir') / 'installed-tests' / library_name
+-install_bindir = get_option('prefix') / get_option('libexecdir') / library_name
 +install_dir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / library_name
++install_bindir = get_option('installed_test_prefix') / 'libexec' / library_name
  
  e = executable('geo-uri',
                 'geo-uri.c',
+diff --git a/meson_options.txt b/meson_options.txt
+index 62b713d..1454416 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -1,6 +1,9 @@