From 3ea0bebd9ec5fa8c63ebccfdd03a3b52fad35d20 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 29 Mar 2022 21:37:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?gnome.gnome-logs:=203.36.0=20=E2=86=92=2042?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-logs/-/compare/gnome-logs-3.36.0...gnome-logs-42.0
---
 .../gnome/apps/gnome-logs/default.nix         | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/gnome/apps/gnome-logs/default.nix b/pkgs/desktops/gnome/apps/gnome-logs/default.nix
index da06eb4404c..16d487867b8 100644
--- a/pkgs/desktops/gnome/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-logs/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchurl
-, fetchpatch
 , meson
 , ninja
 , pkg-config
@@ -10,6 +10,7 @@
 , wrapGAppsHook
 , gettext
 , itstool
+, libhandy
 , libxml2
 , libxslt
 , docbook_xsl
@@ -21,21 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-logs";
-  version = "3.36.0";
+  version = "42.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-logs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0w1nfdxbv3f0wnhmdy21ydvr4swfc108hypda561p7l9lrhnnxj4";
+    url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    sha256 = "TV5FFp1r9DkC16npoHk8kW65LaumuoWzXI629nLNq9c=";
   };
 
-  patches = [
-    # https://gitlab.gnome.org/GNOME/gnome-logs/-/issues/52
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/b42defceefc775220b525f665a3b662ab9593b81.patch";
-      sha256 = "1s0zscmhwy7r0xff17wh8ik8x9xw1vrkipw5vl5i770bxnljps8n";
-    })
-  ];
-
   nativeBuildInputs = [
     python3
     meson
@@ -53,9 +46,9 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib
     gtk3
+    libhandy
     systemd
     gsettings-desktop-schemas
-    gnome.adwaita-icon-theme
   ];
 
   mesonFlags = [
@@ -80,7 +73,7 @@ stdenv.mkDerivation rec {
     homepage = "https://wiki.gnome.org/Apps/Logs";
     description = "A log viewer for the systemd journal";
     maintainers = teams.gnome.members;
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };
 }

From 066634e509988232b435cf2e64c778ec4508a4b4 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 29 Mar 2022 21:45:34 +0800
Subject: [PATCH 2/2] maintainers: add myself (bobby285271) to the GNOME team

---
 maintainers/team-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index bf4fcc6a4a7..66cba166f2c 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -117,6 +117,7 @@ with lib.maintainers; {
 
   gnome = {
     members = [
+      bobby285271
       hedning
       jtojnar
       dasj19