Balló György pushed to branch main at Arch Linux / Packaging / Packages /
gnome-contacts
Commits:
40fdecfe by Balló György at 2024-11-13T23:27:12+01:00
upgpkg: 47.0-2: Apply some fixes
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + gnome-contacts-cancel-action.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = gnome-contacts
pkgdesc = Contacts Manager for GNOME
pkgver = 47.0
- pkgrel = 1
+ pkgrel = 2
url = https://apps.gnome.org/Contacts
arch = x86_64
groups = gnome
@@ -34,6 +34,8 @@ pkgbase = gnome-contacts
depends = pango
depends = qrencode
source = git+https://gitlab.gnome.org/GNOME/gnome-contacts.git#tag=47.0
+ source = gnome-contacts-cancel-action.patch
b2sums =
621ee692e7c80024fad4e311fc67304c552291163bbba083b90eb743e5807cb738ac9406fad6bbc434458e3704d77f5f8513af64f36119dc00b04e0521b9fe0a
+ b2sums =
cb810fdcbfb05cad30d7f9c539ad85a2e55e88e088baa04a1bb9ec6d140587ca29906505fa7bee195c267aaf75d86b95109e913098b6caf334646661b791c901
pkgname = gnome-contacts
=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
pkgname=gnome-contacts
pkgver=47.0
-pkgrel=1
+pkgrel=2
pkgdesc="Contacts Manager for GNOME"
url="https://apps.gnome.org/Contacts";
arch=(x86_64)
@@ -41,11 +41,27 @@ makedepends=(
vala
)
groups=(gnome)
-source=("git+https://gitlab.gnome.org/GNOME/gnome-contacts.git#tag=${pkgver/[a-z]/.&}";)
-b2sums=('621ee692e7c80024fad4e311fc67304c552291163bbba083b90eb743e5807cb738ac9406fad6bbc434458e3704d77f5f8513af64f36119dc00b04e0521b9fe0a')
+source=(
+
"git+https://gitlab.gnome.org/GNOME/gnome-contacts.git#tag=${pkgver/[a-z]/.&}";
+ gnome-contacts-cancel-action.patch
+)
+b2sums=('621ee692e7c80024fad4e311fc67304c552291163bbba083b90eb743e5807cb738ac9406fad6bbc434458e3704d77f5f8513af64f36119dc00b04e0521b9fe0a'
+
'cb810fdcbfb05cad30d7f9c539ad85a2e55e88e088baa04a1bb9ec6d140587ca29906505fa7bee195c267aaf75d86b95109e913098b6caf334646661b791c901')
prepare() {
cd $pkgname
+
+ # Support taking a picture with the camera without OpenGL
+ # https://gitlab.gnome.org/GNOME/gnome-contacts/-/merge_requests/305
+ git cherry-pick -n cfbc0c35e30f5fb4603378b89299f630808d7978
+
+ # Set application name only in the startup phase
+ # https://gitlab.gnome.org/GNOME/gnome-contacts/-/merge_requests/303
+ git cherry-pick -n d27745c29a2c25f8a5647c0496aadcc55f68570a
+
+ # Add missing action
+ # https://gitlab.gnome.org/GNOME/gnome-contacts/-/merge_requests/304
+ git apply -3 ../gnome-contacts-cancel-action.patch
}
build() {
=====================================
gnome-contacts-cancel-action.patch
=====================================
@@ -0,0 +1,45 @@
+From c91b1a6fe1c9be790f9ca1481d1651079f2763ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]>
+Date: Sat, 12 Oct 2024 23:05:07 +0200
+Subject: [PATCH] main-window: Add missing action
+
+This is needed for the Cancel button to work.
+
+It was removed accidently in commit 3e84850def40672cf22307933c75fa07c550dd31.
+---
+ src/contacts-main-window.vala | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/contacts-main-window.vala b/src/contacts-main-window.vala
+index 0b2e743e..6245ce53 100644
+--- a/src/contacts-main-window.vala
++++ b/src/contacts-main-window.vala
+@@ -14,6 +14,7 @@ public class Contacts.MainWindow : Adw.ApplicationWindow {
+ { "cancel", cancel_action },
+ { "new-contact", new_contact },
+ { "edit-contact", edit_contact },
++ { "edit-contact-cancel", edit_contact_cancel },
+ { "edit-contact-save", edit_contact_save },
+ { "focus-search", focus_search },
+ { "mark-favorite", mark_favorite },
+@@ -358,7 +359,7 @@ public class Contacts.MainWindow : Adw.ApplicationWindow {
+ switch (this.state) {
+ case UiState.CREATING:
+ case UiState.UPDATING:
+- edit_contact_cancel ();
++ edit_contact_cancel (null, null);
+ break;
+ case UiState.SELECTING:
+ cancel_selection_action (null, null);
+@@ -369,7 +370,7 @@ public class Contacts.MainWindow : Adw.ApplicationWindow {
+ }
+ }
+
+- private void edit_contact_cancel ()
++ private void edit_contact_cancel (SimpleAction? action, GLib.Variant?
parameter)
+ requires (this.state == UiState.CREATING || this.state ==
UiState.UPDATING) {
+
+ if (this.state == UiState.CREATING) {
+--
+GitLab
+
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gnome-contacts/-/commit/40fdecfe53ff21bd23fc621b85df7ba6c3ca1a8c
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gnome-contacts/-/commit/40fdecfe53ff21bd23fc621b85df7ba6c3ca1a8c
You're receiving this email because of your account on gitlab.archlinux.org.
