[Git][archlinux/packaging/packages/contrast][main] upgpkg: 0.0.11-2: Apply some fixes

[@bgyorgy]

Balló György pushed to branch main at Arch Linux / Packaging / Packages / 
contrast


Commits:
db1ac3e3 by Balló György at 2025-07-26T18:59:48+02:00
upgpkg: 0.0.11-2: Apply some fixes

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- + contrast-fix-color-picker.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = contrast
        pkgdesc = Checks whether the contrast between two colors meet the WCAG 
requirements
        pkgver = 0.0.11
-       pkgrel = 1
+       pkgrel = 2
        url = https://gitlab.gnome.org/World/design/contrast
        arch = x86_64
        license = GPL-3.0-or-later
@@ -18,6 +18,8 @@ pkgbase = contrast
        depends = libadwaita
        depends = pango
        source = 
git+https://gitlab.gnome.org/World/design/contrast.git#tag=0.0.11
+       source = contrast-fix-color-picker.patch
        b2sums = 
f406ab497ecd6b70ca1a70a5e41df65bfd56a86b2c6ebc949d9a02f0b10d845024fcbfeaa5b3facd695e19aa9a64a62f0de352c65aaed3140e780c5f90623286
+       b2sums = 
fdc6fb57462135d81bf0f078cd836e7bc311658dc13907cc69a996ff39eca5f527de6ab6bf7aa118d4ead777da2b2e8159d91b9ad905e8c03cdaa36bd9187e16
 
 pkgname = contrast


=====================================
PKGBUILD
=====================================
@@ -2,7 +2,7 @@
 
 pkgname=contrast
 pkgver=0.0.11
-pkgrel=1
+pkgrel=2
 pkgdesc='Checks whether the contrast between two colors meet the WCAG 
requirements'
 arch=(x86_64)
 url='https://gitlab.gnome.org/World/design/contrast'
@@ -23,14 +23,29 @@ makedepends=(
   meson
   rust
 )
-source=("git+https://gitlab.gnome.org/World/design/contrast.git#tag=$pkgver";)
-b2sums=(f406ab497ecd6b70ca1a70a5e41df65bfd56a86b2c6ebc949d9a02f0b10d845024fcbfeaa5b3facd695e19aa9a64a62f0de352c65aaed3140e780c5f90623286)
+source=(
+  "git+https://gitlab.gnome.org/World/design/contrast.git#tag=$pkgver";
+  contrast-fix-color-picker.patch
+)
+b2sums=(
+  
f406ab497ecd6b70ca1a70a5e41df65bfd56a86b2c6ebc949d9a02f0b10d845024fcbfeaa5b3facd695e19aa9a64a62f0de352c65aaed3140e780c5f90623286
+  
fdc6fb57462135d81bf0f078cd836e7bc311658dc13907cc69a996ff39eca5f527de6ab6bf7aa118d4ead777da2b2e8159d91b9ad905e8c03cdaa36bd9187e16
+)
 
 prepare() {
   cd $pkgname
 
   CARGO_HOME="$srcdir/build/cargo-home" \
     cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
+
+  # https://gitlab.gnome.org/World/design/contrast/-/merge_requests/44
+  git cherry-pick -n fc520c05ff5d5fda7a9e3fba4509545cc0ba688d
+
+  # https://gitlab.gnome.org/World/design/contrast/-/merge_requests/43
+  git cherry-pick -n d4e769a73c2cc0cd0402a2a1fc3f33595dea712a
+
+  # https://gitlab.gnome.org/World/design/contrast/-/merge_requests/45
+  git apply -3 ../contrast-fix-color-picker.patch
 }
 
 build() {


=====================================
contrast-fix-color-picker.patch
=====================================
@@ -0,0 +1,28 @@
+From 0530e5646e1c51d675cb6436c94654311da5041b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
+Date: Sat, 26 Jul 2025 18:29:36 +0200
+Subject: [PATCH] Delay calling the color picker
+
+Add a 200 ms delay when calling the color picker portal. This prevents
+GtkEntry to steal the focus from the color picker.
+
+Closes: https://gitlab.gnome.org/World/design/contrast/-/issues/35
+---
+ src/colour_entry.rs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/colour_entry.rs b/src/colour_entry.rs
+index ca50d51..23def60 100644
+--- a/src/colour_entry.rs
++++ b/src/colour_entry.rs
+@@ -108,6 +108,7 @@ mod imp {
+         #[template_callback]
+         async fn icon_pressed(&self, pos: gtk::EntryIconPosition, _entry: 
&gtk::Entry) {
+             if pos == gtk::EntryIconPosition::Secondary {
++                
gtk::glib::timeout_future(std::time::Duration::from_millis(200)).await;
+                 if let Err(err) = self.pick_color().await {
+                     tracing::error!("Failed to pick a color {err}");
+                 }
+-- 
+GitLab
+



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/contrast/-/commit/db1ac3e3147f63c33afc9f9975175ffb35da1141

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/contrast/-/commit/db1ac3e3147f63c33afc9f9975175ffb35da1141
You're receiving this email because of your account on gitlab.archlinux.org.