From a29cb611a5357470c0fd241cd56e3fc1a0a28dba Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 18 Jan 2025 02:17:33 +0000
Subject: [PATCH] =?UTF-8?q?xdg-user-dirs-gtk:=200.11=20=E2=86=92=200.14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Port to Meson.
- Correct license according to `meson.build` file.
- Clarify the comment that the `bindtextdomain` replacement is to find translations for `dgettext("xdg-user-dirs", …)`.

https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk/-/compare/0.11...0.14
---
 pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix b/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix
index f0ac6e12eb08..0e0b7669919a 100644
--- a/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix
+++ b/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix
@@ -2,9 +2,8 @@
   stdenv,
   lib,
   fetchurl,
-  fetchpatch,
-  autoreconfHook,
-  intltool,
+  meson,
+  ninja,
   pkg-config,
   xdg-user-dirs,
   wrapGAppsHook3,
@@ -14,36 +13,30 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-user-dirs-gtk";
-  version = "0.11";
+  version = "0.14";
 
   src = fetchurl {
     url = "mirror://gnome/sources/xdg-user-dirs-gtk/${lib.versions.majorMinor finalAttrs.version}/xdg-user-dirs-gtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-U0vVY9PA4/jcvzV4y4qw5J07pByWbUd8ivlDg2QSHn0=";
+    hash = "sha256-U3++FCskc27XiU5KAfaf11jLbHpnejgoeVKdIX9KKHM=";
   };
 
-  patches = [
-    # Fix cross: ./configure: line 7633: no: command not found
-    (fetchpatch {
-      url = "https://salsa.debian.org/gnome-team/xdg-user-dirs-gtk/-/raw/b047b613d5f18aebe8e9bca4e0a82b75b2d1f8c4/debian/patches/fix-pkg-config-cross-compilation.patch";
-      hash = "sha256-QHq8hlX0SS+T6jtagMs9qApJCWFG1PHxftzoID2Nag4=";
-    })
-  ];
-
   nativeBuildInputs = [
-    autoreconfHook
-    intltool
+    meson
+    ninja
     pkg-config
-    xdg-user-dirs # for AC_PATH_PROG
+    xdg-user-dirs
     wrapGAppsHook3
   ];
 
   buildInputs = [ gtk3 ];
 
   postPatch = ''
-    # Fetch translations from correct localedir.
+    # Fetch “xdg-user-dirs” translations from correct localedir.
     substituteInPlace update.c --replace-fail \
       'bindtextdomain ("xdg-user-dirs", GLIBLOCALEDIR);' \
       'bindtextdomain ("xdg-user-dirs", "${xdg-user-dirs}/share/locale");'
+
+    patchShebangs meson_custom_install_desktop_file.sh
   '';
 
   preFixup = ''
@@ -57,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk";
     description = "Companion to xdg-user-dirs that integrates it into the GNOME desktop and GTK applications";
-    license = lib.licenses.gpl2Only;
+    license = lib.licenses.gpl2Plus;
     maintainers = lib.teams.gnome.members;
     platforms = lib.platforms.unix;
     mainProgram = "xdg-user-dirs-gtk-update";