diff mbox series

[bug#55295] gnu: gcolor3: Update to 0.2.4-28.6699c15

Message ID AUaLSdU7dwxst4BC5CtGYIoscLTI_q_srKpbWpiGBcNMe4_Vb9l9tEXwdnnf75S6rlGgjdw1o8VmZvK8K8oGpkARtiL4MvfyRL4yHQ8t1V0=@proton.me
State Accepted
Headers show
Series [bug#55295] gnu: gcolor3: Update to 0.2.4-28.6699c15 | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Sughosha May 6, 2022, 7:49 p.m. UTC 
Empty Message

Comments

Daniel Meißner May 7, 2022, 10 a.m. UTC | #1 
Hi,

IMHO it's cleaner to just extract commit https://gitlab.gnome.org/World/gcolor3/-/commit/1750369a3fd922aa9db6916207dc460c6f885e14 from upstream in a patch file and apply it to the package instead of packaging an unreleased version. I have done something similar for eog in https://issues.guix.gnu.org/53161#2

Thanks
Daniel Meißner May 11, 2022, 1:04 p.m. UTC | #2 
Hi,

Thanks, I applied your patches to my local checkout and the package
builds.  Unfortunately, I do not have commit access, so I cannot push
your changes :-(

You would have to wait for someone with commit access.

Best

--
Daniel
diff mbox series

Patch

From b40884620fff660ec7ea0b27cae47078645da7d2 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Fri, 6 May 2022 21:23:53 +0200
Subject: [PATCH] gnu: gcolor3: Update to 0.2.4-28.6699c15

* This commit fixes build with recent libportal
---
 gnu/packages/gnome.scm | 55 +++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index dae6692109..0c28731829 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10310,34 +10310,35 @@  (define-public gucharmap
       (license license:gpl3+))))
 
 (define-public gcolor3
-  (package
-    (name "gcolor3")
-    (version "2.4.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.gnome.org/World/gcolor3")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1igqmach1vhcrvbpw346pmkbb5kabbb806ssswrvkp569n700wmc"))))
-    (build-system meson-build-system)
-    (arguments
-     `(#:glib-or-gtk? #t))
-    (native-inputs
-     `(("desktop-file-utils" ,desktop-file-utils)
-       ("gettext" ,gettext-minimal)
-       ("glib:bin" ,glib "bin")
-       ("gtk+:bin" ,gtk+ "bin")
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     (list gsettings-desktop-schemas gtk+ libportal))
-    (home-page "https://www.hjdskes.nl/projects/gcolor3/")
-    (synopsis "Simple color chooser written in GTK3")
-    (description "Color Picker is a simple color chooser written in GTK3.  It
+  (let ((revision "28")
+        (commit "6699c150468e3af14c6a6d411abe6b83b44b4304"))
+    (package
+      (name "gcolor3")
+      (version (git-version "2.4.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.gnome.org/World/gcolor3")
+               (commit commit)))
+         (sha256
+          (base32 "1d07jbbbnic7i4n9azw8yjnbp7sny9dk5ihffcjjxvknk63fsny4"))))
+      (build-system meson-build-system)
+      (arguments
+       `(#:glib-or-gtk? #t))
+      (native-inputs
+       `(("desktop-file-utils" ,desktop-file-utils)
+         ("gettext" ,gettext-minimal)
+         ("glib:bin" ,glib "bin")
+         ("gtk+:bin" ,gtk+ "bin")
+         ("pkg-config" ,pkg-config)))
+      (inputs
+       (list gsettings-desktop-schemas gtk+ libportal))
+      (home-page "https://www.hjdskes.nl/projects/gcolor3/")
+      (synopsis "Simple color chooser written in GTK3")
+      (description "Color Picker is a simple color chooser written in GTK3.  It
 supports both X and Wayland display servers.")
-    (license license:gpl2+)))
+      (license license:gpl2+))))
 
 (define-public bluefish
   (package
-- 
2.36.0