Accepting request 922812 from GNOME:Next
OBS-URL: https://build.opensuse.org/request/show/922812 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-contacts?expand=0&rev=141
This commit is contained in:
Git OBS Bridge
parent
a857bf8c64
commit
c0019fcea5
25
281decd15546987ca1c467e090ea4abf7a4a0a3b.patch
Normal file
25
281decd15546987ca1c467e090ea4abf7a4a0a3b.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 281decd15546987ca1c467e090ea4abf7a4a0a3b Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Plazas <kekun.plazas@laposte.net>
|
||||
Date: Thu, 9 Sep 2021 13:15:39 +0200
|
||||
Subject: [PATCH] setup-window: Set a minimum width
|
||||
|
||||
No need to go below phone sizes.
|
||||
---
|
||||
data/ui/contacts-setup-window.ui | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/data/ui/contacts-setup-window.ui b/data/ui/contacts-setup-window.ui
|
||||
index ac0f1065..845c7a0f 100644
|
||||
--- a/data/ui/contacts-setup-window.ui
|
||||
+++ b/data/ui/contacts-setup-window.ui
|
||||
@@ -8,6 +8,7 @@
|
||||
<object class="GtkBox">
|
||||
<property name="visible">True</property>
|
||||
<property name="orientation">vertical</property>
|
||||
+ <property name="width_request">360</property>
|
||||
<child>
|
||||
<object class="HdyHeaderBar">
|
||||
<property name="visible">True</property>
|
||||
--
|
||||
GitLab
|
||||
|
||||
27
6883d4fa2a1b3803896a5f5737df765d8f6f6f62.patch
Normal file
27
6883d4fa2a1b3803896a5f5737df765d8f6f6f62.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From 6883d4fa2a1b3803896a5f5737df765d8f6f6f62 Mon Sep 17 00:00:00 2001
|
||||
From: Krifa75 <yahiaoui.fakhri@gmail.com>
|
||||
Date: Wed, 22 Sep 2021 23:31:35 +0200
|
||||
Subject: [PATCH] contacts-store: Check if new individual is not empty
|
||||
|
||||
When deleting a contact the changes may contains empty value which triggers a warning when deleting one
|
||||
---
|
||||
src/contacts-store.vala | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/contacts-store.vala b/src/contacts-store.vala
|
||||
index a9c6a57b..91e99e5a 100644
|
||||
--- a/src/contacts-store.vala
|
||||
+++ b/src/contacts-store.vala
|
||||
@@ -144,7 +144,8 @@ public class Contacts.Store : GLib.Object {
|
||||
if (i != null)
|
||||
to_remove.add (i);
|
||||
foreach (var new_i in changes[i]) {
|
||||
- to_add.add (new_i);
|
||||
+ if (new_i != null)
|
||||
+ to_add.add (new_i);
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
27
b92f5a5198d3a52aaf7317ba6d8e86c633e9e18d.patch
Normal file
27
b92f5a5198d3a52aaf7317ba6d8e86c633e9e18d.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From b92f5a5198d3a52aaf7317ba6d8e86c633e9e18d Mon Sep 17 00:00:00 2001
|
||||
From: Krifa75 <yahiaoui.fakhri@gmail.com>
|
||||
Date: Wed, 22 Sep 2021 23:26:12 +0200
|
||||
Subject: [PATCH] fake-persona-store: Set primary_persona only in class init
|
||||
|
||||
Trigger a warning and primary_persona was also set in the class init so it's not useful
|
||||
---
|
||||
src/contacts-fake-persona-store.vala | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/src/contacts-fake-persona-store.vala b/src/contacts-fake-persona-store.vala
|
||||
index c7e390ba..c6b8ae21 100644
|
||||
--- a/src/contacts-fake-persona-store.vala
|
||||
+++ b/src/contacts-fake-persona-store.vala
|
||||
@@ -521,9 +521,6 @@ public class Contacts.FakeIndividual : Individual {
|
||||
var fake_personas = new Gee.HashSet<FakePersona> ();
|
||||
foreach (var p in individual.personas) {
|
||||
var fake_p = new FakePersona.from_real (p);
|
||||
- // Keep track of the main persona
|
||||
- if (Contacts.Utils.persona_is_main (p) || individual.personas.size == 1)
|
||||
- primary_persona = fake_p;
|
||||
fake_personas.add (fake_p);
|
||||
}
|
||||
this (fake_personas);
|
||||
--
|
||||
GitLab
|
||||
|
||||
66
f89a9af36e4e2f0e92de62b3f6b7dc9ccc2b5ac6.patch
Normal file
66
f89a9af36e4e2f0e92de62b3f6b7dc9ccc2b5ac6.patch
Normal file
@ -0,0 +1,66 @@
|
||||
From f89a9af36e4e2f0e92de62b3f6b7dc9ccc2b5ac6 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Plazas <kekun.plazas@laposte.net>
|
||||
Date: Thu, 9 Sep 2021 13:07:39 +0200
|
||||
Subject: [PATCH] setup-window: Refine the margins
|
||||
|
||||
This makes it look a bit more like other GNOME applications.
|
||||
---
|
||||
data/ui/contacts-setup-window.ui | 15 ++++-----------
|
||||
src/contacts-setup-window.vala | 2 +-
|
||||
2 files changed, 5 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/data/ui/contacts-setup-window.ui b/data/ui/contacts-setup-window.ui
|
||||
index eadcb7ae..ac0f1065 100644
|
||||
--- a/data/ui/contacts-setup-window.ui
|
||||
+++ b/data/ui/contacts-setup-window.ui
|
||||
@@ -66,17 +66,16 @@
|
||||
<child>
|
||||
<object class="HdyClamp">
|
||||
<property name="visible">True</property>
|
||||
- <property name="margin_top">32</property>
|
||||
- <property name="margin_bottom">32</property>
|
||||
+ <property name="margin_top">24</property>
|
||||
+ <property name="margin_bottom">24</property>
|
||||
<property name="margin_start">12</property>
|
||||
<property name="margin_end">12</property>
|
||||
<child>
|
||||
- <object class="GtkGrid">
|
||||
+ <object class="GtkBox" id="content">
|
||||
<property name="visible">True</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="halign">center</property>
|
||||
- <property name="border_width">12</property>
|
||||
- <property name="row_spacing">24</property>
|
||||
+ <property name="spacing">24</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="GtkLabel">
|
||||
@@ -98,12 +97,6 @@
|
||||
<property name="label" translatable="yes">Please select your main address book: this is where new contacts will be added. If you keep your contacts in an online account, you can add them using the online accounts settings.</property>
|
||||
</object>
|
||||
</child>
|
||||
- <child>
|
||||
- <object class="HdyClamp" id="content">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="maximum_size">400</property>
|
||||
- </object>
|
||||
- </child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
diff --git a/src/contacts-setup-window.vala b/src/contacts-setup-window.vala
|
||||
index 0461fc64..9305b8a9 100644
|
||||
--- a/src/contacts-setup-window.vala
|
||||
+++ b/src/contacts-setup-window.vala
|
||||
@@ -20,7 +20,7 @@ using Folks;
|
||||
[GtkTemplate (ui = "/org/gnome/Contacts/ui/contacts-setup-window.ui")]
|
||||
public class Contacts.SetupWindow : Hdy.ApplicationWindow {
|
||||
[GtkChild]
|
||||
- private unowned Hdy.Clamp content;
|
||||
+ private unowned Gtk.Box content;
|
||||
|
||||
[GtkChild]
|
||||
private unowned Gtk.Button setup_done_button;
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 29 11:38:59 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Add check section and run meson_test macro.
|
||||
- Update options we give to meson to match what upstream currently
|
||||
expects.
|
||||
- Add b92f5a5198d3a52aaf7317ba6d8e86c633e9e18d.patch and
|
||||
6883d4fa2a1b3803896a5f5737df765d8f6f6f62.patch: Fix some
|
||||
warnings. Patches from upstream master branch.
|
||||
- Add f89a9af36e4e2f0e92de62b3f6b7dc9ccc2b5ac6.patch and
|
||||
281decd15546987ca1c467e090ea4abf7a4a0a3b.patch: setup-window:
|
||||
Refine the margins and the minimum size. Patches from upstream
|
||||
master branch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 29 09:29:59 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
@ -24,6 +24,14 @@ License: GPL-2.0-or-later
|
||||
Group: Productivity/Office/Other
|
||||
URL: https://wiki.gnome.org/Apps/Contacts
|
||||
Source0: https://download.gnome.org/sources/gnome-contacts/41/%{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM b92f5a5198d3a52aaf7317ba6d8e86c633e9e18d.patch glgo#GNOME/gnome-contacts!168
|
||||
Patch0: b92f5a5198d3a52aaf7317ba6d8e86c633e9e18d.patch
|
||||
# PATCH-FIX-UPSTREAM 6883d4fa2a1b3803896a5f5737df765d8f6f6f62.patch glgo#GNOME/gnome-contacts!168
|
||||
Patch1: 6883d4fa2a1b3803896a5f5737df765d8f6f6f62.patch
|
||||
# PATCH-FIX-UPSTREAM f89a9af36e4e2f0e92de62b3f6b7dc9ccc2b5ac6.patch glgo#GNOME/gnome-contacts!164
|
||||
Patch2: f89a9af36e4e2f0e92de62b3f6b7dc9ccc2b5ac6.patch
|
||||
# PATCH-FIX-UPSTREAM 281decd15546987ca1c467e090ea4abf7a4a0a3b.patch glgo#GNOME/gnome-contacts!164
|
||||
Patch3: 281decd15546987ca1c467e090ea4abf7a4a0a3b.patch
|
||||
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: docbook_4
|
||||
@ -91,10 +99,9 @@ search results from contacts.
|
||||
|
||||
%build
|
||||
%meson \
|
||||
-Dwith-cheese=yes \
|
||||
-Dwith-manpage=true \
|
||||
-Dmaps=true \
|
||||
-Dcheese=enabled \
|
||||
-Dtelepathy=false \
|
||||
-Dmanpage=true \
|
||||
%{nil}
|
||||
%meson_build
|
||||
|
||||
@ -102,6 +109,9 @@ search results from contacts.
|
||||
%meson_install
|
||||
%find_lang %{name} %{?no_lang_C}
|
||||
|
||||
%check
|
||||
%meson_test
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc NEWS README.md
|
||||
|
||||
Loading…
Reference in New Issue
Block a user