openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to gnome-contacts-50.0.

Browse Source
This commit is contained in:
ajacoutot
2026-05-15 07:14:27 +00:00
parent a93c95f87e
commit 31dd3f6eaf
8 changed files with 102 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/gnome/contacts/Makefile
+1 -2
View File
@@ -1,8 +1,7 @@
COMMENT= contacts manager for GNOME
GNOME_PROJECT= gnome-contacts
GNOME_VERSION= 49.0
REVISION= 0
GNOME_VERSION= 50.0
CATEGORIES= productivity
x11/gnome/contacts/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (gnome/gnome-contacts-49.0.tar.xz) = JfIcZ7wp133vLZzT4i0oRg0StH/ySKIBdzG1TbSF5K8=
SIZE (gnome/gnome-contacts-49.0.tar.xz) = 414664
SHA256 (gnome/gnome-contacts-50.0.tar.xz) = KjvqNDFxviRPErfCGkDKOOmpLeqYkDk69eisE5vA2rM=
SIZE (gnome/gnome-contacts-50.0.tar.xz) = 419416
x11/gnome/contacts/patches/patch-meson_build
+12 -11
View File
@@ -1,18 +1,19 @@
From 45cb9a2d7e8cffd17bab05e29ee38f0463743a9c Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 17 Oct 2025 11:10:09 +0200
Subject: [PATCH] vcard-export: Adapt to evolution-data-server 3.59.1 EVCard API changes
REVERT:
From 0a3104f38267aa3330437924faf415e707b3c8d0 Mon Sep 17 00:00:00 2001
From: Niels De Graef <nielsdegraef@gmail.com>
Date: Sat, 14 Jun 2025 12:48:50 +0200
Subject: [PATCH] Use glycin instead of GdkPixbuf for image loading
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -52,6 +52,9 @@ libadwaita_dep = dependency('libadwaita-1', version: '
@@ -49,9 +49,6 @@ glib = dependency('glib-2.0', version: '>=' + min_glib
gmodule_export = dependency('gmodule-export-2.0', version: '>=' + min_glib_version)
gtk4_dep = dependency('gtk4', version: '>= 4.15.3')
libadwaita_dep = dependency('libadwaita-1', version: '>= 1.8.alpha')
-# Images loading
-glycin_dep = dependency('glycin-2', version: '>= 2.0')
-glycin_gtk_dep = dependency('glycin-gtk4-2', version: '>= 2.0')
# E-D-S
libebook = dependency('libebook-1.2', version: '>=' + min_eds_version)
libedataserver = dependency('libedataserver-1.2', version: '>=' + min_eds_version)
+if libebook.version().version_compare('>=3.59.1')
+ add_project_arguments('-D', 'HAVE_EDS_3_59_1', language: 'vala')
+endif
# Camera
libportal_dep = dependency('libportal-gtk4', version: '>= 0.7')
gstreamer_dep = dependency('gstreamer-1.0')
x11/gnome/contacts/patches/patch-src_contacts-avatar-selector_vala
+37
View File
@@ -0,0 +1,37 @@
REVERT:
From 0a3104f38267aa3330437924faf415e707b3c8d0 Mon Sep 17 00:00:00 2001
From: Niels De Graef <nielsdegraef@gmail.com>
Date: Sat, 14 Jun 2025 12:48:50 +0200
Subject: [PATCH] Use glycin instead of GdkPixbuf for image loading
Index: src/contacts-avatar-selector.vala
--- src/contacts-avatar-selector.vala.orig
+++ src/contacts-avatar-selector.vala
@@ -31,23 +31,14 @@ private class Contacts.Thumbnail : Gtk.FlowBoxChild {
requires (chunk.avatar != null) {
var stream = yield chunk.avatar.load_async (MAIN_SIZE);
- return yield Thumbnail.for_stream(stream);
+ var pixbuf = yield new Gdk.Pixbuf.from_stream_async (stream);
+ return new Thumbnail (Gdk.Texture.for_pixbuf (pixbuf));
}
public static async Thumbnail? for_file (File file) throws Error {
var stream = yield file.read_async ();
- return yield Thumbnail.for_stream(stream);
- }
-
- public static async Thumbnail? for_stream (InputStream stream) throws Error {
- var loader = new Gly.Loader.for_stream (stream);
- var image = yield loader.load_async (null);
- if (image == null)
- return null;
-
- var frame = yield image.next_frame_async (null);
- var texture = GlyGtk4.frame_get_texture (frame);
- return new Thumbnail (texture);
+ var pixbuf = yield new Gdk.Pixbuf.from_stream_async (stream);
+ return new Thumbnail (Gdk.Texture.for_pixbuf (pixbuf));
}
}
x11/gnome/contacts/patches/patch-src_contacts-avatar_vala
+31
View File
@@ -0,0 +1,31 @@
REVERT:
From 0a3104f38267aa3330437924faf415e707b3c8d0 Mon Sep 17 00:00:00 2001
From: Niels De Graef <nielsdegraef@gmail.com>
Date: Sat, 14 Jun 2025 12:48:50 +0200
Subject: [PATCH] Use glycin instead of GdkPixbuf for image loading
Index: src/contacts-avatar.vala
--- src/contacts-avatar.vala.orig
+++ src/contacts-avatar.vala
@@ -124,16 +124,11 @@ public class Contacts.Avatar : Adw.Bin {
try {
var stream = yield icon.load_async (this.avatar_size, null);
- var loader = new Gly.Loader.for_stream (stream);
- var image = yield loader.load_async (null);
- if (image == null)
- return;
-
- var frame_request = new Gly.FrameRequest ();
- frame_request.set_scale (this.avatar_size, this.avatar_size);
- var frame = yield image.get_specific_frame_async (frame_request, null);
- var texture = GlyGtk4.frame_get_texture (frame);
- set_paintable (texture);
+ var pixbuf = yield new Gdk.Pixbuf.from_stream_at_scale_async (stream,
+ this.avatar_size,
+ this.avatar_size,
+ true);
+ set_paintable (Gdk.Texture.for_pixbuf (pixbuf));
} catch (Error e) {
warning ("Couldn't load avatar of '%s': %s", this.individual.display_name, e.message);
}
x11/gnome/contacts/patches/patch-src_io_contacts-io-vcard-export-operation_vala
-42
View File
@@ -1,42 +0,0 @@
From 45cb9a2d7e8cffd17bab05e29ee38f0463743a9c Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 17 Oct 2025 11:10:09 +0200
Subject: [PATCH] vcard-export: Adapt to evolution-data-server 3.59.1 EVCard API changes
Index: src/io/contacts-io-vcard-export-operation.vala
--- src/io/contacts-io-vcard-export-operation.vala.orig
+++ src/io/contacts-io-vcard-export-operation.vala
@@ -16,7 +16,9 @@ public class Contacts.Io.VCardExportOperation : Export
// We _could_ parameterize this with our own enum, but there's no need for
// that at the moment.
+#if !HAVE_EDS_3_59_1
private E.VCardFormat vcard_format = E.VCardFormat.@30;
+#endif
// This should always be on false, except for debugging/troubleshooting
// purposes. It forces E-D-S personas to use our manual serialization instead
@@ -53,7 +55,11 @@ public class Contacts.Io.VCardExportOperation : Export
// that's an E.VCard already
if (persona is Edsf.Persona && !avoid_eds) {
unowned var contact = ((Edsf.Persona) persona).contact;
+#if HAVE_EDS_3_59_1
+ return contact.to_string ();
+#else
return contact.to_string (this.vcard_format);
+#endif
}
var vcard = new E.VCard ();
@@ -104,7 +110,11 @@ public class Contacts.Io.VCardExportOperation : Export
vcard_set_webservice_details (vcard, (WebServiceDetails) persona);
*/
+#if HAVE_EDS_3_59_1
+ return vcard.to_string ();
+#else
return vcard.to_string (this.vcard_format);
+#endif
}
private void vcard_set_avatar_details (E.VCard vcard,
x11/gnome/contacts/patches/patch-src_meson_build
+18
View File
@@ -0,0 +1,18 @@
REVERT:
From 0a3104f38267aa3330437924faf415e707b3c8d0 Mon Sep 17 00:00:00 2001
From: Niels De Graef <nielsdegraef@gmail.com>
Date: Sat, 14 Jun 2025 12:48:50 +0200
Subject: [PATCH] Use glycin instead of GdkPixbuf for image loading
Index: src/meson.build
--- src/meson.build.orig
+++ src/meson.build
@@ -56,8 +56,6 @@ contacts_deps = [
gee,
gio_unix,
glib,
- glycin_dep,
- glycin_gtk_dep,
gstreamer_dep,
gtk4_dep,
libadwaita_dep,
x11/gnome/contacts/pkg/PLIST
+1
View File
@@ -56,6 +56,7 @@ share/locale/kab/LC_MESSAGES/gnome-contacts.mo
share/locale/kk/LC_MESSAGES/gnome-contacts.mo
share/locale/kn/LC_MESSAGES/gnome-contacts.mo
share/locale/ko/LC_MESSAGES/gnome-contacts.mo
share/locale/kw/LC_MESSAGES/gnome-contacts.mo
share/locale/lt/LC_MESSAGES/gnome-contacts.mo
share/locale/lv/LC_MESSAGES/gnome-contacts.mo
share/locale/mjw/LC_MESSAGES/gnome-contacts.mo