* [bug#55295] [PATCH] gnu: gcolor3: Update to 0.2.4-28.6699c15 @ 2022-05-06 19:49 Sughosha via Guix-patches via 2022-05-07 10:00 ` Daniel Meißner via Guix-patches via ` (2 more replies) 0 siblings, 3 replies; 6+ messages in thread From: Sughosha via Guix-patches via @ 2022-05-06 19:49 UTC (permalink / raw) To: 55295 [-- Attachment #1.1: Type: text/plain, Size: 13 bytes --] Empty Message [-- Attachment #1.2: Type: text/html, Size: 24 bytes --] [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-gnu-gcolor3-Update-to-0.2.4-28.6699c15.patch --] [-- Type: text/x-patch; name=0001-gnu-gcolor3-Update-to-0.2.4-28.6699c15.patch, Size: 2806 bytes --] 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#55295] [PATCH] gnu: gcolor3: Update to 0.2.4-28.6699c15 2022-05-06 19:49 [bug#55295] [PATCH] gnu: gcolor3: Update to 0.2.4-28.6699c15 Sughosha via Guix-patches via @ 2022-05-07 10:00 ` Daniel Meißner via Guix-patches via 2022-05-08 21:21 ` [bug#55295] [PATCH] gnu: gcolor3: Fix build with libportal-0.5 Sughosha via Guix-patches via 2022-05-11 13:04 ` [bug#55295] " Daniel Meißner via Guix-patches via 2 siblings, 0 replies; 6+ messages in thread From: Daniel Meißner via Guix-patches via @ 2022-05-07 10:00 UTC (permalink / raw) To: 55295 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#55295] [PATCH] gnu: gcolor3: Fix build with libportal-0.5 2022-05-06 19:49 [bug#55295] [PATCH] gnu: gcolor3: Update to 0.2.4-28.6699c15 Sughosha via Guix-patches via 2022-05-07 10:00 ` Daniel Meißner via Guix-patches via @ 2022-05-08 21:21 ` Sughosha via Guix-patches via 2022-05-08 21:41 ` Sughosha via Guix-patches via 2022-05-11 13:04 ` [bug#55295] " Daniel Meißner via Guix-patches via 2 siblings, 1 reply; 6+ messages in thread From: Sughosha via Guix-patches via @ 2022-05-08 21:21 UTC (permalink / raw) To: 55295@debbugs.gnu.org [-- Attachment #1: Type: text/plain, Size: 2895 bytes --] --- gnu/packages/gnome.scm | 4 +- .../gcolor3-update-libportal-usage.patch | 55 +++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gcolor3-update-libportal-usage.patch diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dae6692109..53eec9336d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10321,7 +10321,9 @@ (define-public gcolor3 (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1igqmach1vhcrvbpw346pmkbb5kabbb806ssswrvkp569n700wmc")))) + (base32 "1igqmach1vhcrvbpw346pmkbb5kabbb806ssswrvkp569n700wmc")) + ;; XXX: Remove when upgrading to 42.0 + (patches (search-patches "gcolor3-update-libportal-usage.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t)) diff --git a/gnu/packages/patches/gcolor3-update-libportal-usage.patch b/gnu/packages/patches/gcolor3-update-libportal-usage.patch new file mode 100644 index 0000000000..0d19b124fd --- /dev/null +++ b/gnu/packages/patches/gcolor3-update-libportal-usage.patch @@ -0,0 +1,55 @@ +Fix gcolor3 to work with libportal-0.5 + +This patch is extracted from upstream, see here +https://gitlab.gnome.org/World/gcolor3/-/commit/1750369a3fd922aa9db6916207dc460c6f885e14 + +From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek <michal@vasilek.cz> +Date: Mon, 27 Dec 2021 13:47:14 +0100 +Subject: [PATCH] Update to libportal 0.5 + +--- + meson.build | 2 ++ + src/gcolor3-color-selection.c | 2 +- + src/meson.build | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6453679..7d6dc50 100644 +--- a/meson.build ++++ b/meson.build +@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true) + dep_libportal = dependency( + 'libportal', + required: true, ++ version: '>= 0.5', + fallback: ['libportal', 'libportal_dep'], + default_options: ['gtk_doc=false'], + ) ++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true) + cc = meson.get_compiler('c') + dep_lm = cc.find_library('m', required: true) + +diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c +index 7413850..5df9d54 100644 +--- a/src/gcolor3-color-selection.c ++++ b/src/gcolor3-color-selection.c +@@ -41,7 +41,7 @@ + #include <gtk/gtk.h> + #include <glib/gi18n.h> + #include <libportal/portal.h> +-#include <libportal/portal-gtk3.h> ++#include <libportal-gtk3/portal-gtk3.h> + + #ifdef ENABLE_NLS + #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String) +diff --git a/src/meson.build b/src/meson.build +index 3998f68..d488e51 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -42,6 +42,7 @@ executable( + dependencies: [ + dep_gtk, + dep_libportal, ++ dep_libportal_gtk3, + dep_lm + ], + install: true, +-- +GitLab + -- 2.36.0 [-- Attachment #2: Type: text/html, Size: 5703 bytes --] ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#55295] [PATCH] gnu: gcolor3: Fix build with libportal-0.5 2022-05-08 21:21 ` [bug#55295] [PATCH] gnu: gcolor3: Fix build with libportal-0.5 Sughosha via Guix-patches via @ 2022-05-08 21:41 ` Sughosha via Guix-patches via 2022-05-16 13:51 ` bug#55295: [PATCH] gnu: gcolor3: Update to 0.2.4-28.6699c15 Ludovic Courtès 0 siblings, 1 reply; 6+ messages in thread From: Sughosha via Guix-patches via @ 2022-05-08 21:41 UTC (permalink / raw) To: 55295@debbugs.gnu.org [-- Attachment #1: Type: text/plain, Size: 6162 bytes --] Sorry, one small correction to the above (a comment was containing misleading version number).. --- gnu/packages/gnome.scm | 4 +- .../gcolor3-update-libportal-usage.patch | 55 +++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gcolor3-update-libportal-usage.patch diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dae6692109..53eec9336d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10321,7 +10321,9 @@ (define-public gcolor3 (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1igqmach1vhcrvbpw346pmkbb5kabbb806ssswrvkp569n700wmc")))) + (base32 "1igqmach1vhcrvbpw346pmkbb5kabbb806ssswrvkp569n700wmc")) + ;; XXX: Remove when upgrading + (patches (search-patches "gcolor3-update-libportal-usage.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t)) diff --git a/gnu/packages/patches/gcolor3-update-libportal-usage.patch b/gnu/packages/patches/gcolor3-update-libportal-usage.patch new file mode 100644 index 0000000000..0d19b124fd --- /dev/null +++ b/gnu/packages/patches/gcolor3-update-libportal-usage.patch @@ -0,0 +1,55 @@ +Fix gcolor3 to work with libportal-0.5 + +This patch is extracted from upstream, see here +https://gitlab.gnome.org/World/gcolor3/-/commit/1750369a3fd922aa9db6916207dc460c6f885e14 + +From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek <michal@vasilek.cz> +Date: Mon, 27 Dec 2021 13:47:14 +0100 +Subject: [PATCH] Update to libportal 0.5 + +--- + meson.build | 2 ++ + src/gcolor3-color-selection.c | 2 +- + src/meson.build | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6453679..7d6dc50 100644 +--- a/meson.build ++++ b/meson.build +@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true) + dep_libportal = dependency( + 'libportal', + required: true, ++ version: '>= 0.5', + fallback: ['libportal', 'libportal_dep'], + default_options: ['gtk_doc=false'], + ) ++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true) + cc = meson.get_compiler('c') + dep_lm = cc.find_library('m', required: true) + +diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c +index 7413850..5df9d54 100644 +--- a/src/gcolor3-color-selection.c ++++ b/src/gcolor3-color-selection.c +@@ -41,7 +41,7 @@ + #include <gtk/gtk.h> + #include <glib/gi18n.h> + #include <libportal/portal.h> +-#include <libportal/portal-gtk3.h> ++#include <libportal-gtk3/portal-gtk3.h> + + #ifdef ENABLE_NLS + #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String) +diff --git a/src/meson.build b/src/meson.build +index 3998f68..d488e51 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -42,6 +42,7 @@ executable( + dependencies: [ + dep_gtk, + dep_libportal, ++ dep_libportal_gtk3, + dep_lm + ], + install: true, +-- +GitLab + --2.36.0 ------- Original Message ------- Sughosha <Sughosha@proton.me> schrieb am Sonntag, 8. Mai 2022 um 23:21: > --- > gnu/packages/gnome.scm | 4 +- > .../gcolor3-update-libportal-usage.patch | 55 +++++++++++++++++++ > 2 files changed, 58 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/gcolor3-update-libportal-usage.patch > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index dae6692109..53eec9336d 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -10321,7 +10321,9 @@ (define-public gcolor3 > (commit (string-append "v" version)))) > (file-name (git-file-name name version)) > (sha256 > - (base32 "1igqmach1vhcrvbpw346pmkbb5kabbb806ssswrvkp569n700wmc")))) > + (base32 "1igqmach1vhcrvbpw346pmkbb5kabbb806ssswrvkp569n700wmc")) > + ;; XXX: Remove when upgrading to 42.0 > + (patches (search-patches "gcolor3-update-libportal-usage.patch")))) > (build-system meson-build-system) > (arguments > `(#:glib-or-gtk? #t)) > diff --git a/gnu/packages/patches/gcolor3-update-libportal-usage.patch b/gnu/packages/patches/gcolor3-update-libportal-usage.patch > new file mode 100644 > index 0000000000..0d19b124fd > --- /dev/null > +++ b/gnu/packages/patches/gcolor3-update-libportal-usage.patch > @@ -0,0 +1,55 @@ > +Fix gcolor3 to work with libportal-0.5 > + > +This patch is extracted from upstream, see here > +https://gitlab.gnome.org/World/gcolor3/-/commit/1750369a3fd922aa9db6916207dc460c6f885e14 > + > +From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001 > +From: Michal Vasilek <michal@vasilek.cz> > +Date: Mon, 27 Dec 2021 13:47:14 +0100 > +Subject: [PATCH] Update to libportal 0.5 > + > +--- > + meson.build | 2 ++ > + src/gcolor3-color-selection.c | 2 +- > + src/meson.build | 1 + > + 3 files changed, 4 insertions(+), 1 deletion(-) > + > +diff --git a/meson.build b/meson.build > +index 6453679..7d6dc50 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true) > + dep_libportal = dependency( > + 'libportal', > + required: true, > ++ version: '>= 0.5', > + fallback: ['libportal', 'libportal_dep'], > + default_options: ['gtk_doc=false'], > + ) > ++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true) > + cc = meson.get_compiler('c') > + dep_lm = cc.find_library('m', required: true) > + > +diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c > +index 7413850..5df9d54 100644 > +--- a/src/gcolor3-color-selection.c > ++++ b/src/gcolor3-color-selection.c > +@@ -41,7 +41,7 @@ > + #include <gtk/gtk.h> > + #include <glib/gi18n.h> > + #include <libportal/portal.h> > +-#include <libportal/portal-gtk3.h> > ++#include <libportal-gtk3/portal-gtk3.h> > + > + #ifdef ENABLE_NLS > + #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String) > +diff --git a/src/meson.build b/src/meson.build > +index 3998f68..d488e51 100644 > +--- a/src/meson.build > ++++ b/src/meson.build > +@@ -42,6 +42,7 @@ executable( > + dependencies: [ > + dep_gtk, > + dep_libportal, > ++ dep_libportal_gtk3, > + dep_lm > + ], > + install: true, > +-- > +GitLab > + > -- > 2.36.0 [-- Attachment #2: Type: text/html, Size: 29966 bytes --] ^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#55295: [PATCH] gnu: gcolor3: Update to 0.2.4-28.6699c15 2022-05-08 21:41 ` Sughosha via Guix-patches via @ 2022-05-16 13:51 ` Ludovic Courtès 0 siblings, 0 replies; 6+ messages in thread From: Ludovic Courtès @ 2022-05-16 13:51 UTC (permalink / raw) To: Sughosha; +Cc: Daniel Meißner, 55295-done@debbugs.gnu.org Hi, Sughosha <Sughosha@proton.me> skribis: > Sorry, one small correction to the above (a comment was containing misleading version number).. > > --- > gnu/packages/gnome.scm | 4 +- > .../gcolor3-update-libportal-usage.patch | 55 +++++++++++++++++++ > 2 files changed, 58 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/gcolor3-update-libportal-usage.patch I added the new file to ‘gnu/local.mk’, including a conventional commit log, and pushed as commit 5ba12f0176300d154b086485ecf363f10f283a9f. Please take a look at <https://guix.gnu.org/manual/devel/en/html_node/Submitting-Patches.html> if unsure about the project conventions. I’d also encourage you to send patches with ‘git send-email’—pasting them in your mail client might mangle them. Thank you and thanks Daniel for taking a look! Ludo’. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#55295] [PATCH] gnu: gcolor3: Update to 0.2.4-28.6699c15 2022-05-06 19:49 [bug#55295] [PATCH] gnu: gcolor3: Update to 0.2.4-28.6699c15 Sughosha via Guix-patches via 2022-05-07 10:00 ` Daniel Meißner via Guix-patches via 2022-05-08 21:21 ` [bug#55295] [PATCH] gnu: gcolor3: Fix build with libportal-0.5 Sughosha via Guix-patches via @ 2022-05-11 13:04 ` Daniel Meißner via Guix-patches via 2 siblings, 0 replies; 6+ messages in thread From: Daniel Meißner via Guix-patches via @ 2022-05-11 13:04 UTC (permalink / raw) To: Sughosha; +Cc: 55295 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-05-16 13:56 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-05-06 19:49 [bug#55295] [PATCH] gnu: gcolor3: Update to 0.2.4-28.6699c15 Sughosha via Guix-patches via 2022-05-07 10:00 ` Daniel Meißner via Guix-patches via 2022-05-08 21:21 ` [bug#55295] [PATCH] gnu: gcolor3: Fix build with libportal-0.5 Sughosha via Guix-patches via 2022-05-08 21:41 ` Sughosha via Guix-patches via 2022-05-16 13:51 ` bug#55295: [PATCH] gnu: gcolor3: Update to 0.2.4-28.6699c15 Ludovic Courtès 2022-05-11 13:04 ` [bug#55295] " Daniel Meißner via Guix-patches via
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).