Accepting request 962798 from GNOME:Next

GNOME 42 - here we come

OBS-URL: https://build.opensuse.org/request/show/962798
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-contacts?expand=0&rev=142

281decd15546987ca1c467e090ea4abf7a4a0a3b.patch

@@ -1,25 +0,0 @@
-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
-

6883d4fa2a1b3803896a5f5737df765d8f6f6f62.patch

@@ -1,27 +0,0 @@
-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
-

b92f5a5198d3a52aaf7317ba6d8e86c633e9e18d.patch

@@ -1,27 +0,0 @@
-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
-

f89a9af36e4e2f0e92de62b3f6b7dc9ccc2b5ac6.patch

@@ -1,66 +0,0 @@
-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
-

gnome-contacts-41.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63e3149b5d1475b7a2698005bb5f750f3c80a735717160e39df8cfdfebfccdf0
-size 275248

gnome-contacts-42.beta.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb9c3c916af85e65f373dd090199c77a8d94b9af9d94f66db7ab2a12de04fd9d
+size 342800

gnome-contacts.changes

@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Mon Mar 14 10:42:50 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 42.beta:
+  + Contact properties can be selected, which means you can also
+    copy them to paste it elsewhere.
+  + It is now possible to show and add the organisational role of a
+    contact. This is mostly useful for corporate address books, as
+    you can now see what job a colleague is performing.
+  + Some paper cuts that got introduced when porting to GTK4 have
+    been resolved.
+  + Contacts shows a little reminder when displaying someone's
+    contact information if their birthday is today.
+  + Fixed launching the Online Accounts dialog in GNOME 42.
+  + Updated translations.
+- Add desktop-file-utils BuildRequires: New dependency.
+
+-------------------------------------------------------------------
+Thu Jan 13 08:40:24 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 42.alpha:
+  + A fresh new look thanks to a port to GTK 4 and libadwaita,
+    along with a new UI design.
+  + It is now possible to open up a contact's location with your
+    default maps application (provided it supports "maps:" URIs).
+  + Fixes to the birthday editor.
+  + Updated translations.
+- Drop pkgconfig(cheese) and pkgconfig(cheese-gtk4) BuildRequires:
+  no longer needed. Stop passing -Dcheese to meson.
+- Replace pkgconfig(gtk+-3.0) BuildRequires with pkgconfig(gtk4),
+  and pkgconfig(libhandy-1) with pkgconfig(libadwaita-1): changed
+  deps for GTK4 port.
+- Add pkgconfig(libportal): Requires to securely access the camera.
+- Drop pkgconfig(libedataserverui-1.2): no longer needed.
+- Drop patches included in upstream sources:
+  + 281decd15546987ca1c467e090ea4abf7a4a0a3b.patch
+  + 6883d4fa2a1b3803896a5f5737df765d8f6f6f62.patch
+  + b92f5a5198d3a52aaf7317ba6d8e86c633e9e18d.patch
+  + f89a9af36e4e2f0e92de62b3f6b7dc9ccc2b5ac6.patch
+
 -------------------------------------------------------------------
 Wed Sep 29 11:38:59 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
 

gnome-contacts.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-contacts
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,33 +17,25 @@
 
 
 Name:           gnome-contacts
-Version:        41.0
+Version:        42.beta
 Release:        0
 Summary:        Contacts Manager for GNOME
 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
+Source0:        https://download.gnome.org/sources/gnome-contacts/42/%{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:  desktop-file-utils
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook_4
 BuildRequires:  meson >= 0.50
 BuildRequires:  pkgconfig
 BuildRequires:  vala >= 0.40.10
 BuildRequires:  xsltproc
-BuildRequires:  pkgconfig(cheese)
-BuildRequires:  pkgconfig(cheese-gtk) >= 3.3.91
 BuildRequires:  pkgconfig(clutter-gtk-1.0)
 BuildRequires:  pkgconfig(folks) >= 0.14
 BuildRequires:  pkgconfig(folks-eds) >= 0.11.4
+BuildRequires:  pkgconfig(libportal)
 # Disable telepathy by default
 #BuildRequires:  pkgconfig(folks-telepathy) >= 0.11.4
 BuildRequires:  pkgconfig(gee-0.8)
@@ -54,11 +46,10 @@ BuildRequires:  pkgconfig(gmodule-export-2.0) >= 2.44.0
 BuildRequires:  pkgconfig(gnome-desktop-3.0)
 BuildRequires:  pkgconfig(goa-1.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.22.0
+BuildRequires:  pkgconfig(gtk4) >= 4.6
+BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  pkgconfig(libebook-1.2) >= 3.13.90
 BuildRequires:  pkgconfig(libedataserver-1.2) >= 3.30
-BuildRequires:  pkgconfig(libedataserverui-1.2) >= 3.13.90
-BuildRequires:  pkgconfig(libhandy-1) >= 1.1.0
 # Disable telepathy by default, following upstream, NOTE pass -Dtelepathy=true to meson if you reenable this.
 #BuildRequires:  pkgconfig(telepathy-glib) >= 0.22.0
 
@@ -99,7 +90,6 @@ search results from contacts.
 
 %build
 %meson \
-	-Dcheese=enabled \
 	-Dtelepathy=false \
 	-Dmanpage=true \
 	%{nil}