Update to gnome-contacts-43.0.

This commit is contained in:
ajacoutot 2022-11-07 13:45:47 +00:00
parent c36fab1f37
commit 62ad2b4f60
5 changed files with 16 additions and 67 deletions

View File

@ -1,21 +1,20 @@
# $OpenBSD: Makefile,v 1.91 2022/11/04 08:49:17 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.92 2022/11/07 13:45:47 ajacoutot Exp $
COMMENT= contacts manager for GNOME COMMENT= contacts manager for GNOME
GNOME_PROJECT= gnome-contacts GNOME_PROJECT= gnome-contacts
GNOME_VERSION= 42.0 GNOME_VERSION= 43.0
REVISION= 0
CATEGORIES= productivity CATEGORIES= productivity
# GPLv2+ # GPLv2+
PERMIT_PACKAGE= Yes PERMIT_PACKAGE= Yes
WANTLIB += adwaita-1 c cairo edataserver-1.2 folks folks-eds gdk_pixbuf-2.0 WANTLIB += adwaita-1 c cairo ebook-contacts-1.2 edataserver-1.2
WANTLIB += gee-0.8 gio-2.0 glib-2.0 goa-1.0 gobject-2.0 gtk-4 WANTLIB += folks folks-eds gdk_pixbuf-2.0 gee-0.8 gio-2.0 glib-2.0
WANTLIB += intl m pango-1.0 WANTLIB += goa-1.0 gobject-2.0 gtk-4 intl m pango-1.0 portal
COMPILER = base-clang ports-gcc base-gcc COMPILER= base-clang ports-gcc base-gcc
MODULES= devel/meson \ MODULES= devel/meson \
x11/gnome \ x11/gnome \
@ -24,12 +23,13 @@ MODULES= devel/meson \
DEBUG_PACKAGES = ${BUILD_PACKAGES} DEBUG_PACKAGES = ${BUILD_PACKAGES}
LIB_DEPENDS= net/telepathy/folks \ LIB_DEPENDS= net/telepathy/folks \
sysutils/libportal \
x11/gnome/libadwaita x11/gnome/libadwaita
MODGNOME_TOOLS= desktop-file-utils docbook \ MODGNOME_TOOLS= desktop-file-utils docbook \
gobject-introspection gtk-update-icon-cache vala gobject-introspection gtk-update-icon-cache vala
# XXX needs libportal # XXX https://gitlab.gnome.org/GNOME/gnome-contacts/-/issues/275
CONFIGURE_ARGS += -Dcamera=false CFLAGS += -Wno-return-type
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (gnome/gnome-contacts-42.0.tar.xz) = iALDj9wj9SjawSj1O9zx9sow4OHGhIxCzWyEpeIsUhY= SHA256 (gnome/gnome-contacts-43.0.tar.xz) = VbYd9+k/Cr4f+kZeGOPF3k9JqQ8mjqnRHtyGrwbQceE=
SIZE (gnome/gnome-contacts-42.0.tar.xz) = 343312 SIZE (gnome/gnome-contacts-43.0.tar.xz) = 380348

View File

@ -1,15 +0,0 @@
XXX should obey the value of "camera" in meson_options.txt
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -56,7 +56,8 @@ libebook = dependency('libebook-1.2', version: '>=' +
libedataserver = dependency('libedataserver-1.2', version: '>=' + min_eds_version)
# libedataserverui = dependency('libedataserverui-1.2', version: '>=' + min_eds_version)
# Portals (needed for camera access)
-libportal_dep = dependency('libportal', version: '>= 0.5')
+# libportal_dep = dependency('libportal', version: '>= 0.5')
+libportal_dep = []
# Cheese
# cheese_dep = dependency('cheese', required: get_option('cheese'))
# cheese_gtk_dep = dependency('cheese-gtk', version: '>= 3.3.91', required: get_option('cheese'))

View File

@ -1,41 +0,0 @@
XXX should obey the value of "camera" in meson_options.txt
Index: src/contacts-avatar-selector.vala
--- src/contacts-avatar-selector.vala.orig
+++ src/contacts-avatar-selector.vala
@@ -81,8 +81,6 @@ public class Contacts.AvatarSelector : Gtk.Dialog {
[GtkChild]
private unowned Gtk.Button camera_button;
- private Xdp.Portal? portal = null;
-
private Gdk.Pixbuf? _selected_avatar = null;
public Gdk.Pixbuf? selected_avatar {
owned get { return scale_pixbuf_for_avatar_use (this._selected_avatar); }
@@ -96,8 +94,6 @@ public class Contacts.AvatarSelector : Gtk.Dialog {
this.thumbnail_grid.selected_children_changed.connect (on_thumbnails_selected);
this.thumbnail_grid.child_activated.connect (on_thumbnail_activated);
update_thumbnail_grid ();
-
- this.setup_camera_portal.begin ();
}
private void on_thumbnails_selected (Gtk.FlowBox thumbnail_grid) {
@@ -115,17 +111,6 @@ public class Contacts.AvatarSelector : Gtk.Dialog {
unowned var thumbnail = (Thumbnail) child;
this.selected_avatar = thumbnail.source_pixbuf;
this.response (Gtk.ResponseType.ACCEPT);
- }
-
- private async void setup_camera_portal () {
- this.portal = new Xdp.Portal ();
-
- if (portal.is_camera_present ()) {
- this.camera_button.sensitive = true;
- } else {
- this.camera_button.tooltip_text = _("No Camera Detected");
- this.camera_button.sensitive = false;
- }
}
private Gdk.Pixbuf? scale_pixbuf_for_avatar_use (Gdk.Pixbuf? pixbuf) {

View File

@ -1,5 +1,7 @@
@bin bin/gnome-contacts @bin bin/gnome-contacts
libexec/gnome-contacts/
@bin libexec/gnome-contacts-search-provider @bin libexec/gnome-contacts-search-provider
@bin libexec/gnome-contacts/gnome-contacts-parser
@man man/man1/gnome-contacts.1 @man man/man1/gnome-contacts.1
share/applications/org.gnome.Contacts.desktop share/applications/org.gnome.Contacts.desktop
share/dbus-1/services/org.gnome.Contacts.SearchProvider.service share/dbus-1/services/org.gnome.Contacts.SearchProvider.service
@ -11,6 +13,7 @@ share/gnome-shell/search-providers/org.gnome.Contacts.search-provider.ini
share/icons/hicolor/scalable/apps/org.gnome.Contacts.Devel.svg share/icons/hicolor/scalable/apps/org.gnome.Contacts.Devel.svg
share/icons/hicolor/scalable/apps/org.gnome.Contacts.svg share/icons/hicolor/scalable/apps/org.gnome.Contacts.svg
share/icons/hicolor/symbolic/apps/org.gnome.Contacts-symbolic.svg share/icons/hicolor/symbolic/apps/org.gnome.Contacts-symbolic.svg
share/locale/ab/LC_MESSAGES/gnome-contacts.mo
share/locale/af/LC_MESSAGES/gnome-contacts.mo share/locale/af/LC_MESSAGES/gnome-contacts.mo
share/locale/ar/LC_MESSAGES/gnome-contacts.mo share/locale/ar/LC_MESSAGES/gnome-contacts.mo
share/locale/as/LC_MESSAGES/gnome-contacts.mo share/locale/as/LC_MESSAGES/gnome-contacts.mo
@ -35,6 +38,7 @@ share/locale/fa/LC_MESSAGES/gnome-contacts.mo
share/locale/fi/LC_MESSAGES/gnome-contacts.mo share/locale/fi/LC_MESSAGES/gnome-contacts.mo
share/locale/fr/LC_MESSAGES/gnome-contacts.mo share/locale/fr/LC_MESSAGES/gnome-contacts.mo
share/locale/fur/LC_MESSAGES/gnome-contacts.mo share/locale/fur/LC_MESSAGES/gnome-contacts.mo
share/locale/fy/LC_MESSAGES/gnome-contacts.mo
share/locale/ga/LC_MESSAGES/gnome-contacts.mo share/locale/ga/LC_MESSAGES/gnome-contacts.mo
share/locale/gd/LC_MESSAGES/gnome-contacts.mo share/locale/gd/LC_MESSAGES/gnome-contacts.mo
share/locale/gl/LC_MESSAGES/gnome-contacts.mo share/locale/gl/LC_MESSAGES/gnome-contacts.mo
@ -47,6 +51,7 @@ share/locale/id/LC_MESSAGES/gnome-contacts.mo
share/locale/is/LC_MESSAGES/gnome-contacts.mo share/locale/is/LC_MESSAGES/gnome-contacts.mo
share/locale/it/LC_MESSAGES/gnome-contacts.mo share/locale/it/LC_MESSAGES/gnome-contacts.mo
share/locale/ja/LC_MESSAGES/gnome-contacts.mo share/locale/ja/LC_MESSAGES/gnome-contacts.mo
share/locale/ka/LC_MESSAGES/gnome-contacts.mo
share/locale/kk/LC_MESSAGES/gnome-contacts.mo share/locale/kk/LC_MESSAGES/gnome-contacts.mo
share/locale/kn/LC_MESSAGES/gnome-contacts.mo share/locale/kn/LC_MESSAGES/gnome-contacts.mo
share/locale/ko/LC_MESSAGES/gnome-contacts.mo share/locale/ko/LC_MESSAGES/gnome-contacts.mo