aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/file-roller/Makefile1
-rw-r--r--databases/evolution-data-server/Makefile9
-rw-r--r--databases/evolution-data-server/distinfo6
-rw-r--r--databases/evolution-data-server/pkg-plist100
-rw-r--r--deskutils/bijiben/Makefile9
-rw-r--r--deskutils/bijiben/distinfo6
-rw-r--r--deskutils/bijiben/pkg-plist122
-rw-r--r--deskutils/gnome-calendar/Makefile6
-rw-r--r--deskutils/gnome-calendar/distinfo6
-rw-r--r--deskutils/gnome-calendar/pkg-plist14
-rw-r--r--deskutils/gnome-clocks/Makefile2
-rw-r--r--deskutils/gnome-contacts/Makefile4
-rw-r--r--deskutils/gnome-contacts/distinfo6
-rw-r--r--deskutils/gnome-contacts/files/patch-src_contacts-window.vala14
-rw-r--r--deskutils/gnome-contacts/pkg-plist3
-rw-r--r--deskutils/gnome-documents/Makefile1
-rw-r--r--deskutils/gnome-font-viewer/Makefile1
-rw-r--r--deskutils/gnome-initial-setup/Makefile2
-rw-r--r--deskutils/gnome-maps/Makefile7
-rw-r--r--deskutils/gnome-maps/distinfo6
-rw-r--r--deskutils/gnome-maps/pkg-plist25
-rw-r--r--deskutils/gnome-photos/Makefile2
-rw-r--r--deskutils/gnome-todo/Makefile2
-rw-r--r--deskutils/gnome-todo/files/patch-plugins_eds_gtd-eds-autoptr_h15
-rw-r--r--deskutils/gnome-todo/files/patch-plugins_eds_gtd-provider-eds_c36
-rw-r--r--deskutils/gnome-todo/files/patch-plugins_eds_gtd-task-eds_c441
-rw-r--r--deskutils/gnome-todo/files/patch-plugins_eds_gtd-task-list-eds_c71
-rw-r--r--deskutils/gnome-todo/files/patch-plugins_eds_meson_build19
-rw-r--r--deskutils/gnome-tweaks/Makefile1
-rw-r--r--deskutils/nautilus-actions/Makefile2
-rw-r--r--games/aisleriot/Makefile3
-rw-r--r--games/aisleriot/distinfo6
-rw-r--r--games/five-or-more/Makefile16
-rw-r--r--games/five-or-more/distinfo6
-rw-r--r--games/five-or-more/pkg-plist384
-rw-r--r--graphics/eog/Makefile2
-rw-r--r--graphics/evince/Makefile1
-rw-r--r--mail/evolution-ews/Makefile8
-rw-r--r--mail/evolution-ews/distinfo6
-rw-r--r--mail/evolution-ews/pkg-plist11
-rw-r--r--mail/evolution/Makefile8
-rw-r--r--mail/evolution/distinfo6
-rw-r--r--mail/evolution/pkg-plist389
-rw-r--r--mail/mailagent/pkg-plist4
-rw-r--r--multimedia/cheese/Makefile31
-rw-r--r--multimedia/cheese/distinfo6
-rw-r--r--multimedia/cheese/files/patch-config.h.in12
-rw-r--r--multimedia/cheese/pkg-plist87
-rw-r--r--multimedia/totem/Makefile2
-rw-r--r--net-im/farstream/Makefile3
-rw-r--r--net-im/farstream/distinfo8
-rw-r--r--net-im/farstream/files/patch-11dde55cbaf5179e8e1885cf1483e538a8d5a4a956
-rw-r--r--net-im/farstream/pkg-plist42
-rw-r--r--net-im/folks/Makefile26
-rw-r--r--net-im/folks/distinfo6
-rw-r--r--net-im/folks/pkg-plist21
-rw-r--r--net-mgmt/arpwatch/pkg-plist4
-rw-r--r--sysutils/brasero/Makefile1
-rw-r--r--sysutils/gnome-control-center/Makefile16
-rw-r--r--sysutils/gnome-control-center/distinfo6
-rw-r--r--sysutils/gnome-control-center/files/patch-panels_info_info-overview.ui11
-rw-r--r--sysutils/gnome-control-center/files/patch-panels_keyboard_meson.build6
-rw-r--r--sysutils/gnome-control-center/files/patch-panels_user-accounts_cc-realm-manager.c (renamed from sysutils/gnome-control-center/files/patch-panels_user-accounts_um-realm-manager.c)10
-rw-r--r--sysutils/gnome-control-center/files/patch-panels_user-accounts_meson.build6
-rw-r--r--sysutils/gnome-control-center/files/patch-panels_user-accounts_um-utils.c19
-rw-r--r--sysutils/gnome-control-center/files/patch-shell_meson.build20
-rw-r--r--sysutils/gnome-control-center/pkg-plist75
-rw-r--r--sysutils/gnome-settings-daemon/Makefile28
-rw-r--r--sysutils/gnome-settings-daemon/distinfo6
-rw-r--r--sysutils/gnome-settings-daemon/pkg-plist18
-rw-r--r--textproc/meld/Makefile4
-rw-r--r--textproc/meld/distinfo6
-rw-r--r--textproc/meld/files/patch-setup.py17
-rw-r--r--textproc/meld/pkg-plist87
-rw-r--r--www/epiphany/Makefile2
-rw-r--r--www/gnome-user-share/Makefile2
-rw-r--r--x11-fm/nautilus-python/Makefile1
-rw-r--r--x11-fm/nautilus/Makefile2
-rw-r--r--x11-fm/nemo/Makefile2
-rw-r--r--x11-wm/mutter/Makefile42
-rw-r--r--x11-wm/mutter/distinfo6
-rw-r--r--x11-wm/mutter/files/patch-meson.build25
-rw-r--r--x11-wm/mutter/files/patch-src_backends_meta-egl.c8
-rw-r--r--x11-wm/mutter/files/patch-src_compositor_compositor.c23
-rw-r--r--x11-wm/mutter/files/patch-src_core_main.c23
-rw-r--r--x11-wm/mutter/pkg-plist548
-rw-r--r--x11-wm/phoc/Makefile2
-rw-r--r--x11/cinnamon-screensaver/Makefile2
-rw-r--r--x11/cinnamon/Makefile2
-rw-r--r--x11/gdm/Makefile3
-rw-r--r--x11/gnome-desktop/Makefile20
-rw-r--r--x11/gnome-desktop/distinfo6
-rw-r--r--x11/gnome-desktop/pkg-plist41
-rw-r--r--x11/gnome-session/Makefile6
-rw-r--r--x11/gnome-session/distinfo6
-rw-r--r--x11/gnome-session/pkg-plist3
-rw-r--r--x11/gnome-shell-extensions/Makefile14
-rw-r--r--x11/gnome-shell-extensions/distinfo6
-rw-r--r--x11/gnome-shell-extensions/pkg-plist27
-rw-r--r--x11/gnome-shell/Makefile35
-rw-r--r--x11/gnome-shell/distinfo6
-rw-r--r--x11/gnome-shell/files/patch-js_misc_loginManager.js134
-rw-r--r--x11/gnome-shell/files/patch-js_ui_screenShield.js21
-rw-r--r--x11/gnome-shell/pkg-plist36
-rw-r--r--x11/gnome-terminal/Makefile1
-rw-r--r--x11/phosh/Makefile2
-rw-r--r--x11/squeekboard/Makefile2
107 files changed, 1820 insertions, 1668 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index b7074b79368c..7df5451fe5d9 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,6 +3,7 @@
PORTNAME= file-roller
PORTVERSION= 3.38.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= GNOME
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index a911bfebb70f..d12855aa8158 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= evolution-data-server
-PORTVERSION= 3.28.5
-PORTREVISION= 8
+PORTVERSION= 3.38.0
CATEGORIES= databases gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Data backends for the Evolution integrated mail/PIM suite
@@ -27,7 +26,9 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libjson-glib-1.0.so:devel/json-glib \
libp11-kit.so:security/p11-kit \
libnspr4.so:devel/nspr \
- libsecret-1.so:security/libsecret
+ libsecret-1.so:security/libsecret \
+ libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+ libcanberra.so:audio/libcanberra
PORTSCOUT= limitw:1,even
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index de1bba3e39bd..bfcf46a2b86c 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538599385
-SHA256 (gnome3/evolution-data-server-3.28.5.tar.xz) = d95348d27207cde4ff3209d16c9336fd2a97d958f4c563450ccdf2f7c07e8788
-SIZE (gnome3/evolution-data-server-3.28.5.tar.xz) = 4455136
+TIMESTAMP = 1601284904
+SHA256 (gnome/evolution-data-server-3.38.0.tar.xz) = 13689a7b55765806c4d5f3b05ef6c24b0bf9957b9ed9240c2dd09a2cdb13b0af
+SIZE (gnome/evolution-data-server-3.38.0.tar.xz) = 4652520
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 0b0d425602dd..b3b38154177f 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -1,5 +1,7 @@
+etc/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop
include/evolution-data-server/camel/camel-address.h
include/evolution-data-server/camel/camel-async-closure.h
+include/evolution-data-server/camel/camel-autocleanups.h
include/evolution-data-server/camel/camel-block-file.h
include/evolution-data-server/camel/camel-certdb.h
include/evolution-data-server/camel/camel-charset-map.h
@@ -123,6 +125,7 @@ include/evolution-data-server/camel/camel-vee-summary.h
include/evolution-data-server/camel/camel-vtrash-folder.h
include/evolution-data-server/camel/camel-weak-ref-group.h
include/evolution-data-server/camel/camel.h
+include/evolution-data-server/libebackend/e-backend-autocleanups.h
include/evolution-data-server/libebackend/e-backend-enums.h
include/evolution-data-server/libebackend/e-backend-enumtypes.h
include/evolution-data-server/libebackend/e-backend-factory.h
@@ -149,8 +152,9 @@ include/evolution-data-server/libebackend/e-user-prompter.h
include/evolution-data-server/libebackend/e-webdav-collection-backend.h
include/evolution-data-server/libebackend/libebackend.h
include/evolution-data-server/libebook-contacts/e-address-western.h
+include/evolution-data-server/libebook-contacts/e-book-contacts-enums.h
include/evolution-data-server/libebook-contacts/e-book-contacts-enumtypes.h
-include/evolution-data-server/libebook-contacts/e-book-contacts-types.h
+include/evolution-data-server/libebook-contacts/e-book-contacts-utils.h
include/evolution-data-server/libebook-contacts/e-book-query.h
include/evolution-data-server/libebook-contacts/e-contact.h
include/evolution-data-server/libebook-contacts/e-name-western.h
@@ -163,6 +167,7 @@ include/evolution-data-server/libebook/e-book-client-view.h
include/evolution-data-server/libebook/e-book-client.h
include/evolution-data-server/libebook/e-book-enumtypes.h
include/evolution-data-server/libebook/e-book-types.h
+include/evolution-data-server/libebook/e-book-utils.h
include/evolution-data-server/libebook/e-book-view.h
include/evolution-data-server/libebook/e-book.h
include/evolution-data-server/libebook/e-destination.h
@@ -170,15 +175,28 @@ include/evolution-data-server/libebook/libebook.h
include/evolution-data-server/libecal/e-cal-check-timezones.h
include/evolution-data-server/libecal/e-cal-client-view.h
include/evolution-data-server/libecal/e-cal-client.h
+include/evolution-data-server/libecal/e-cal-component-alarm-instance.h
+include/evolution-data-server/libecal/e-cal-component-alarm-repeat.h
+include/evolution-data-server/libecal/e-cal-component-alarm-trigger.h
+include/evolution-data-server/libecal/e-cal-component-alarm.h
+include/evolution-data-server/libecal/e-cal-component-alarms.h
+include/evolution-data-server/libecal/e-cal-component-attendee.h
+include/evolution-data-server/libecal/e-cal-component-datetime.h
+include/evolution-data-server/libecal/e-cal-component-id.h
+include/evolution-data-server/libecal/e-cal-component-organizer.h
+include/evolution-data-server/libecal/e-cal-component-parameter-bag.h
+include/evolution-data-server/libecal/e-cal-component-period.h
+include/evolution-data-server/libecal/e-cal-component-property-bag.h
+include/evolution-data-server/libecal/e-cal-component-range.h
+include/evolution-data-server/libecal/e-cal-component-text.h
include/evolution-data-server/libecal/e-cal-component.h
+include/evolution-data-server/libecal/e-cal-enums.h
include/evolution-data-server/libecal/e-cal-enumtypes.h
include/evolution-data-server/libecal/e-cal-recur.h
include/evolution-data-server/libecal/e-cal-system-timezone.h
include/evolution-data-server/libecal/e-cal-time-util.h
-include/evolution-data-server/libecal/e-cal-types.h
include/evolution-data-server/libecal/e-cal-util.h
-include/evolution-data-server/libecal/e-cal-view.h
-include/evolution-data-server/libecal/e-cal.h
+include/evolution-data-server/libecal/e-reminder-watcher.h
include/evolution-data-server/libecal/e-timezone-cache.h
include/evolution-data-server/libecal/libecal.h
include/evolution-data-server/libedata-book/e-book-backend-cache.h
@@ -187,6 +205,7 @@ include/evolution-data-server/libedata-book/e-book-backend-factory.h
include/evolution-data-server/libedata-book/e-book-backend-sexp.h
include/evolution-data-server/libedata-book/e-book-backend-sqlitedb.h
include/evolution-data-server/libedata-book/e-book-backend-summary.h
+include/evolution-data-server/libedata-book/e-book-backend-sync.h
include/evolution-data-server/libedata-book/e-book-backend.h
include/evolution-data-server/libedata-book/e-book-cache.h
include/evolution-data-server/libedata-book/e-book-meta-backend.h
@@ -199,12 +218,11 @@ include/evolution-data-server/libedata-book/e-data-book-factory.h
include/evolution-data-server/libedata-book/e-data-book-view.h
include/evolution-data-server/libedata-book/e-data-book.h
include/evolution-data-server/libedata-book/e-subprocess-book-factory.h
+include/evolution-data-server/libedata-book/e-system-locale-watcher.h
include/evolution-data-server/libedata-book/libedata-book.h
-include/evolution-data-server/libedata-cal/e-cal-backend-cache.h
include/evolution-data-server/libedata-cal/e-cal-backend-factory.h
include/evolution-data-server/libedata-cal/e-cal-backend-intervaltree.h
include/evolution-data-server/libedata-cal/e-cal-backend-sexp.h
-include/evolution-data-server/libedata-cal/e-cal-backend-store.h
include/evolution-data-server/libedata-cal/e-cal-backend-sync.h
include/evolution-data-server/libedata-cal/e-cal-backend-util.h
include/evolution-data-server/libedata-cal/e-cal-backend.h
@@ -221,13 +239,13 @@ include/evolution-data-server/libedataserver/e-client.h
include/evolution-data-server/libedataserver/e-collator.h
include/evolution-data-server/libedataserver/e-credentials.h
include/evolution-data-server/libedataserver/e-data-server-util.h
+include/evolution-data-server/libedataserver/e-dataserver-autocleanups.h
include/evolution-data-server/libedataserver/e-debug-log.h
include/evolution-data-server/libedataserver/e-extensible.h
include/evolution-data-server/libedataserver/e-extension.h
include/evolution-data-server/libedataserver/e-flag.h
include/evolution-data-server/libedataserver/e-free-form-exp.h
include/evolution-data-server/libedataserver/e-gdata-oauth2-authorizer.h
-include/evolution-data-server/libedataserver/e-gdbus-templates.h
include/evolution-data-server/libedataserver/e-iterator.h
include/evolution-data-server/libedataserver/e-list-iterator.h
include/evolution-data-server/libedataserver/e-list.h
@@ -244,6 +262,7 @@ include/evolution-data-server/libedataserver/e-proxy.h
include/evolution-data-server/libedataserver/e-secret-store.h
include/evolution-data-server/libedataserver/e-sexp.h
include/evolution-data-server/libedataserver/e-soup-auth-bearer.h
+include/evolution-data-server/libedataserver/e-soup-logger.h
include/evolution-data-server/libedataserver/e-soup-session.h
include/evolution-data-server/libedataserver/e-soup-ssl-trust.h
include/evolution-data-server/libedataserver/e-source-address-book.h
@@ -300,24 +319,27 @@ include/evolution-data-server/libedataserver/e-xml-hash-utils.h
include/evolution-data-server/libedataserver/e-xml-utils.h
include/evolution-data-server/libedataserver/eds-version.h
include/evolution-data-server/libedataserver/libedataserver.h
+include/evolution-data-server/libedataserverui/e-buffer-tagger.h
include/evolution-data-server/libedataserverui/e-cell-renderer-color.h
include/evolution-data-server/libedataserverui/e-credentials-prompter-impl-oauth2.h
include/evolution-data-server/libedataserverui/e-credentials-prompter-impl-password.h
include/evolution-data-server/libedataserverui/e-credentials-prompter-impl.h
include/evolution-data-server/libedataserverui/e-credentials-prompter.h
+include/evolution-data-server/libedataserverui/e-reminders-widget.h
include/evolution-data-server/libedataserverui/e-trust-prompt.h
include/evolution-data-server/libedataserverui/e-webdav-discover-widget.h
include/evolution-data-server/libedataserverui/libedataserverui.h
+lib/evolution-data-server/addressbook-backends/libebookbackendcarddav.so
lib/evolution-data-server/addressbook-backends/libebookbackendfile.so
lib/evolution-data-server/addressbook-backends/libebookbackendgoogle.so
%%LDAP%%lib/evolution-data-server/addressbook-backends/libebookbackendldap.so
-lib/evolution-data-server/addressbook-backends/libebookbackendwebdav.so
lib/evolution-data-server/calendar-backends/libecalbackendcaldav.so
lib/evolution-data-server/calendar-backends/libecalbackendcontacts.so
lib/evolution-data-server/calendar-backends/libecalbackendfile.so
lib/evolution-data-server/calendar-backends/libecalbackendgtasks.so
lib/evolution-data-server/calendar-backends/libecalbackendhttp.so
%%WEATHER%%lib/evolution-data-server/calendar-backends/libecalbackendweather.so
+lib/evolution-data-server/calendar-backends/libecalbackendwebdavnotes.so
lib/evolution-data-server/camel-providers/libcamelimapx.so
lib/evolution-data-server/camel-providers/libcamelimapx.urls
lib/evolution-data-server/camel-providers/libcamellocal.so
@@ -342,34 +364,38 @@ lib/evolution-data-server/registry-modules/module-trust-prompt.so
lib/evolution-data-server/registry-modules/module-webdav-backend.so
lib/evolution-data-server/registry-modules/module-yahoo-backend.so
lib/girepository-1.0/Camel-%%EVO_VERSION%%.typelib
+lib/girepository-1.0/EBackend-%%EVO_VERSION%%.typelib
lib/girepository-1.0/EBook-%%EVO_VERSION%%.typelib
lib/girepository-1.0/EBookContacts-%%EVO_VERSION%%.typelib
+lib/girepository-1.0/ECal-2.0.typelib
+lib/girepository-1.0/EDataBook-%%EVO_VERSION%%.typelib
+lib/girepository-1.0/EDataCal-2.0.typelib
lib/girepository-1.0/EDataServer-%%EVO_VERSION%%.typelib
lib/girepository-1.0/EDataServerUI-%%EVO_VERSION%%.typelib
lib/libcamel-%%EVO_VERSION%%.so
-lib/libcamel-%%EVO_VERSION%%.so.61
-lib/libcamel-%%EVO_VERSION%%.so.61.0.0
+lib/libcamel-%%EVO_VERSION%%.so.62
+lib/libcamel-%%EVO_VERSION%%.so.62.0.0
lib/libebackend-%%EVO_VERSION%%.so
lib/libebackend-%%EVO_VERSION%%.so.10
lib/libebackend-%%EVO_VERSION%%.so.10.0.0
lib/libebook-%%EVO_VERSION%%.so
-lib/libebook-%%EVO_VERSION%%.so.19
-lib/libebook-%%EVO_VERSION%%.so.19.1.3
+lib/libebook-%%EVO_VERSION%%.so.20
+lib/libebook-%%EVO_VERSION%%.so.20.1.3
lib/libebook-contacts-%%EVO_VERSION%%.so
-lib/libebook-contacts-%%EVO_VERSION%%.so.2
-lib/libebook-contacts-%%EVO_VERSION%%.so.2.0.0
-lib/libecal-%%EVO_VERSION%%.so
-lib/libecal-%%EVO_VERSION%%.so.19
-lib/libecal-%%EVO_VERSION%%.so.19.0.0
+lib/libebook-contacts-%%EVO_VERSION%%.so.3
+lib/libebook-contacts-%%EVO_VERSION%%.so.3.0.0
+lib/libecal-2.0.so
+lib/libecal-2.0.so.1
+lib/libecal-2.0.so.1.0.0
lib/libedata-book-%%EVO_VERSION%%.so
-lib/libedata-book-%%EVO_VERSION%%.so.25
-lib/libedata-book-%%EVO_VERSION%%.so.25.0.0
-lib/libedata-cal-%%EVO_VERSION%%.so
-lib/libedata-cal-%%EVO_VERSION%%.so.28
-lib/libedata-cal-%%EVO_VERSION%%.so.28.0.0
+lib/libedata-book-%%EVO_VERSION%%.so.26
+lib/libedata-book-%%EVO_VERSION%%.so.26.0.0
+lib/libedata-cal-2.0.so
+lib/libedata-cal-2.0.so.1
+lib/libedata-cal-2.0.so.1.0.0
lib/libedataserver-%%EVO_VERSION%%.so
-lib/libedataserver-%%EVO_VERSION%%.so.23
-lib/libedataserver-%%EVO_VERSION%%.so.23.0.0
+lib/libedataserver-%%EVO_VERSION%%.so.25
+lib/libedataserver-%%EVO_VERSION%%.so.25.0.0
lib/libedataserverui-%%EVO_VERSION%%.so
lib/libedataserverui-%%EVO_VERSION%%.so.2
lib/libedataserverui-%%EVO_VERSION%%.so.2.0.0
@@ -378,9 +404,9 @@ libdata/pkgconfig/evolution-data-server-%%EVO_VERSION%%.pc
libdata/pkgconfig/libebackend-%%EVO_VERSION%%.pc
libdata/pkgconfig/libebook-%%EVO_VERSION%%.pc
libdata/pkgconfig/libebook-contacts-%%EVO_VERSION%%.pc
-libdata/pkgconfig/libecal-%%EVO_VERSION%%.pc
+libdata/pkgconfig/libecal-2.0.pc
libdata/pkgconfig/libedata-book-%%EVO_VERSION%%.pc
-libdata/pkgconfig/libedata-cal-%%EVO_VERSION%%.pc
+libdata/pkgconfig/libedata-cal-2.0.pc
libdata/pkgconfig/libedataserver-%%EVO_VERSION%%.pc
libdata/pkgconfig/libedataserverui-%%EVO_VERSION%%.pc
libexec/camel-gpg-photo-saver
@@ -392,19 +418,25 @@ libexec/evolution-calendar-factory
libexec/evolution-calendar-factory-subprocess
libexec/evolution-data-server/addressbook-export
libexec/evolution-data-server/csv2vcard
+libexec/evolution-data-server/evolution-alarm-notify
libexec/evolution-data-server/list-sources
libexec/evolution-scan-gconf-tree-xml
libexec/evolution-source-registry
libexec/evolution-user-prompter
share/GConf/gsettings/evolution-data-server.convert
-share/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
-share/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
-share/dbus-1/services/org.gnome.evolution.dataserver.Sources.service
-share/dbus-1/services/org.gnome.evolution.dataserver.UserPrompter.service
+share/applications/org.gnome.Evolution-alarm-notify.desktop
+share/dbus-1/services/org.gnome.evolution.dataserver.AddressBook10.service
+share/dbus-1/services/org.gnome.evolution.dataserver.Calendar8.service
+share/dbus-1/services/org.gnome.evolution.dataserver.Sources5.service
+share/dbus-1/services/org.gnome.evolution.dataserver.UserPrompter0.service
%%LDAP%%%%DATADIR%%/evolutionperson.schema
share/gir-1.0/Camel-%%EVO_VERSION%%.gir
+share/gir-1.0/EBackend-%%EVO_VERSION%%.gir
share/gir-1.0/EBook-%%EVO_VERSION%%.gir
share/gir-1.0/EBookContacts-%%EVO_VERSION%%.gir
+share/gir-1.0/ECal-2.0.gir
+share/gir-1.0/EDataBook-%%EVO_VERSION%%.gir
+share/gir-1.0/EDataCal-2.0.gir
share/gir-1.0/EDataServer-%%EVO_VERSION%%.gir
share/gir-1.0/EDataServerUI-%%EVO_VERSION%%.gir
share/locale/am/LC_MESSAGES/evolution-data-server.mo
@@ -515,10 +547,18 @@ share/pixmaps/evolution-data-server/category_suppliers_16.png
share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
share/vala/vapi/camel-%%EVO_VERSION%%.deps
share/vala/vapi/camel-%%EVO_VERSION%%.vapi
+share/vala/vapi/libebackend-%%EVO_VERSION%%.deps
+share/vala/vapi/libebackend-%%EVO_VERSION%%.vapi
share/vala/vapi/libebook-%%EVO_VERSION%%.deps
share/vala/vapi/libebook-%%EVO_VERSION%%.vapi
share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.deps
share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.vapi
+share/vala/vapi/libecal-2.0.deps
+share/vala/vapi/libecal-2.0.vapi
+share/vala/vapi/libedata-book-%%EVO_VERSION%%.deps
+share/vala/vapi/libedata-book-%%EVO_VERSION%%.vapi
+share/vala/vapi/libedata-cal-2.0.deps
+share/vala/vapi/libedata-cal-2.0.vapi
share/vala/vapi/libedataserver-%%EVO_VERSION%%.deps
share/vala/vapi/libedataserver-%%EVO_VERSION%%.vapi
share/vala/vapi/libedataserverui-%%EVO_VERSION%%.deps
diff --git a/deskutils/bijiben/Makefile b/deskutils/bijiben/Makefile
index b043dfb98394..173eef9ad583 100644
--- a/deskutils/bijiben/Makefile
+++ b/deskutils/bijiben/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= bijiben
-PORTVERSION= 3.28.3
-PORTREVISION= 2
+PORTVERSION= 3.38.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -20,7 +19,8 @@ LIB_DEPENDS= libtracker-control-2.0.so:sysutils/tracker \
libgoa-1.0.so:net/gnome-online-accounts \
libical.so:devel/libical \
libzeitgeist-2.0.so:sysutils/zeitgeist \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/e2fsprogs-libuuid \
+ libhandy-0.0.so:x11-toolkits/libhandy0
PORTSCOUT= limitw:1,even
@@ -33,7 +33,6 @@ INSTALLS_ICONS= yes
MESON_ARGS= -Dzeitgeist=true
SHEBANG_FILES= ${WRKSRC}/build-aux/meson_post_install.py
-GLIB_SCHEMAS= org.gnome.bijiben.gschema.xml \
- org.gnome.bijiben.enums.xml
+GLIB_SCHEMAS= org.gnome.Notes.gschema.xml
.include <bsd.port.mk>
diff --git a/deskutils/bijiben/distinfo b/deskutils/bijiben/distinfo
index 0e8680fe448c..4c10fc0956c9 100644
--- a/deskutils/bijiben/distinfo
+++ b/deskutils/bijiben/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529614643
-SHA256 (gnome/bijiben-3.28.3.tar.xz) = 22d2a5f03dbaa9e8c5d186863289f185249c51f610bfa1fb5c3ed766a813e951
-SIZE (gnome/bijiben-3.28.3.tar.xz) = 683372
+TIMESTAMP = 1601294321
+SHA256 (gnome/bijiben-3.38.0.tar.xz) = 1ff6cc0ac6c62907bf2a09a17215edd2f17b74dacab3a5c89a29c3049172be2b
+SIZE (gnome/bijiben-3.38.0.tar.xz) = 602164
diff --git a/deskutils/bijiben/pkg-plist b/deskutils/bijiben/pkg-plist
index b81786bb08a3..92f2e58cd5af 100644
--- a/deskutils/bijiben/pkg-plist
+++ b/deskutils/bijiben/pkg-plist
@@ -1,14 +1,14 @@
bin/bijiben
libexec/bijiben-shell-search-provider
-share/applications/org.gnome.bijiben.desktop
+share/applications/org.gnome.Notes.desktop
%%DATADIR%%/Default.css
%%DATADIR%%/bijiben.js
%%DATADIR%%/icons/hicolor/16x16/actions/note.png
%%DATADIR%%/icons/hicolor/24x24/actions/note.png
%%DATADIR%%/icons/hicolor/48x48/actions/note.png
-%%DATADIR%%/icons/hicolor/scalable/actions/link.svg
-share/dbus-1/services/org.gnome.bijiben.SearchProvider.service
-share/gnome-shell/search-providers/org.gnome.bijiben-search-provider.ini
+%%DATADIR%%/icons/hicolor/symbolic/actions/link-symbolic.svg
+share/dbus-1/services/org.gnome.Notes.SearchProvider.service
+share/gnome-shell/search-providers/org.gnome.Notes-search-provider.ini
share/help/C/bijiben/colors.page
share/help/C/bijiben/create.page
share/help/C/bijiben/cut-copy-paste.page
@@ -17,7 +17,7 @@ share/help/C/bijiben/delete-restore.page
share/help/C/bijiben/delete.page
share/help/C/bijiben/figures/hicolor_apps_16x16_bijiben.png
share/help/C/bijiben/figures/hicolor_apps_48x48_bijiben.png
-share/help/C/bijiben/figures/notes-3-12.png
+share/help/C/bijiben/figures/notes-3-36.png
share/help/C/bijiben/format-list.page
share/help/C/bijiben/format-text.page
share/help/C/bijiben/index.page
@@ -28,6 +28,25 @@ share/help/C/bijiben/notebooks.page
share/help/C/bijiben/rename.page
share/help/C/bijiben/search.page
share/help/C/bijiben/share.page
+share/help/ca/bijiben/colors.page
+share/help/ca/bijiben/create.page
+share/help/ca/bijiben/cut-copy-paste.page
+share/help/ca/bijiben/delete-permanent.page
+share/help/ca/bijiben/delete-restore.page
+share/help/ca/bijiben/delete.page
+share/help/ca/bijiben/figures/hicolor_apps_16x16_bijiben.png
+share/help/ca/bijiben/figures/hicolor_apps_48x48_bijiben.png
+share/help/ca/bijiben/figures/notes-3-36.png
+share/help/ca/bijiben/format-list.page
+share/help/ca/bijiben/format-text.page
+share/help/ca/bijiben/index.page
+share/help/ca/bijiben/introduction.page
+share/help/ca/bijiben/legal.xml
+share/help/ca/bijiben/new-window.page
+share/help/ca/bijiben/notebooks.page
+share/help/ca/bijiben/rename.page
+share/help/ca/bijiben/search.page
+share/help/ca/bijiben/share.page
share/help/cs/bijiben/colors.page
share/help/cs/bijiben/create.page
share/help/cs/bijiben/cut-copy-paste.page
@@ -36,7 +55,7 @@ share/help/cs/bijiben/delete-restore.page
share/help/cs/bijiben/delete.page
share/help/cs/bijiben/figures/hicolor_apps_16x16_bijiben.png
share/help/cs/bijiben/figures/hicolor_apps_48x48_bijiben.png
-share/help/cs/bijiben/figures/notes-3-12.png
+share/help/cs/bijiben/figures/notes-3-36.png
share/help/cs/bijiben/format-list.page
share/help/cs/bijiben/format-text.page
share/help/cs/bijiben/index.page
@@ -55,7 +74,7 @@ share/help/de/bijiben/delete-restore.page
share/help/de/bijiben/delete.page
share/help/de/bijiben/figures/hicolor_apps_16x16_bijiben.png
share/help/de/bijiben/figures/hicolor_apps_48x48_bijiben.png
-share/help/de/bijiben/figures/notes-3-12.png
+share/help/de/bijiben/figures/notes-3-36.png
share/help/de/bijiben/format-list.page
share/help/de/bijiben/format-text.page
share/help/de/bijiben/index.page
@@ -74,7 +93,7 @@ share/help/el/bijiben/delete-restore.page
share/help/el/bijiben/delete.page
share/help/el/bijiben/figures/hicolor_apps_16x16_bijiben.png
share/help/el/bijiben/figures/hicolor_apps_48x48_bijiben.png
-share/help/el/bijiben/figures/notes-3-12.png
+share/help/el/bijiben/figures/notes-3-36.png
share/help/el/bijiben/format-list.page
share/help/el/bijiben/format-text.page
share/help/el/bijiben/index.page
@@ -93,7 +112,7 @@ share/help/es/bijiben/delete-restore.page
share/help/es/bijiben/delete.page
share/help/es/bijiben/figures/hicolor_apps_16x16_bijiben.png
share/help/es/bijiben/figures/hicolor_apps_48x48_bijiben.png
-share/help/es/bijiben/figures/notes-3-12.png
+share/help/es/bijiben/figures/notes-3-36.png
share/help/es/bijiben/format-list.page
share/help/es/bijiben/format-text.page
share/help/es/bijiben/index.page
@@ -112,7 +131,7 @@ share/help/fr/bijiben/delete-restore.page
share/help/fr/bijiben/delete.page
share/help/fr/bijiben/figures/hicolor_apps_16x16_bijiben.png
share/help/fr/bijiben/figures/hicolor_apps_48x48_bijiben.png
-share/help/fr/bijiben/figures/notes-3-12.png
+share/help/fr/bijiben/figures/notes-3-36.png
share/help/fr/bijiben/format-list.page
share/help/fr/bijiben/format-text.page
share/help/fr/bijiben/index.page
@@ -123,6 +142,25 @@ share/help/fr/bijiben/notebooks.page
share/help/fr/bijiben/rename.page
share/help/fr/bijiben/search.page
share/help/fr/bijiben/share.page
+share/help/fur/bijiben/colors.page
+share/help/fur/bijiben/create.page
+share/help/fur/bijiben/cut-copy-paste.page
+share/help/fur/bijiben/delete-permanent.page
+share/help/fur/bijiben/delete-restore.page
+share/help/fur/bijiben/delete.page
+share/help/fur/bijiben/figures/hicolor_apps_16x16_bijiben.png
+share/help/fur/bijiben/figures/hicolor_apps_48x48_bijiben.png
+share/help/fur/bijiben/figures/notes-3-36.png
+share/help/fur/bijiben/format-list.page
+share/help/fur/bijiben/format-text.page
+share/help/fur/bijiben/index.page
+share/help/fur/bijiben/introduction.page
+share/help/fur/bijiben/legal.xml
+share/help/fur/bijiben/new-window.page
+share/help/fur/bijiben/notebooks.page
+share/help/fur/bijiben/rename.page
+share/help/fur/bijiben/search.page
+share/help/fur/bijiben/share.page
share/help/hu/bijiben/colors.page
share/help/hu/bijiben/create.page
share/help/hu/bijiben/cut-copy-paste.page
@@ -131,7 +169,7 @@ share/help/hu/bijiben/delete-restore.page
share/help/hu/bijiben/delete.page
share/help/hu/bijiben/figures/hicolor_apps_16x16_bijiben.png
share/help/hu/bijiben/figures/hicolor_apps_48x48_bijiben.png
-share/help/hu/bijiben/figures/notes-3-12.png
+share/help/hu/bijiben/figures/notes-3-36.png
share/help/hu/bijiben/format-list.page
share/help/hu/bijiben/format-text.page
share/help/hu/bijiben/index.page
@@ -142,6 +180,25 @@ share/help/hu/bijiben/notebooks.page
share/help/hu/bijiben/rename.page
share/help/hu/bijiben/search.page
share/help/hu/bijiben/share.page
+share/help/id/bijiben/colors.page
+share/help/id/bijiben/create.page
+share/help/id/bijiben/cut-copy-paste.page
+share/help/id/bijiben/delete-permanent.page
+share/help/id/bijiben/delete-restore.page
+share/help/id/bijiben/delete.page
+share/help/id/bijiben/figures/hicolor_apps_16x16_bijiben.png
+share/help/id/bijiben/figures/hicolor_apps_48x48_bijiben.png
+share/help/id/bijiben/figures/notes-3-36.png
+share/help/id/bijiben/format-list.page
+share/help/id/bijiben/format-text.page
+share/help/id/bijiben/index.page
+share/help/id/bijiben/introduction.page
+share/help/id/bijiben/legal.xml
+share/help/id/bijiben/new-window.page
+share/help/id/bijiben/notebooks.page
+share/help/id/bijiben/rename.page
+share/help/id/bijiben/search.page
+share/help/id/bijiben/share.page
share/help/ko/bijiben/colors.page
share/help/ko/bijiben/create.page
share/help/ko/bijiben/cut-copy-paste.page
@@ -150,7 +207,7 @@ share/help/ko/bijiben/delete-restore.page
share/help/ko/bijiben/delete.page
share/help/ko/bijiben/figures/hicolor_apps_16x16_bijiben.png
share/help/ko/bijiben/figures/hicolor_apps_48x48_bijiben.png
-share/help/ko/bijiben/figures/notes-3-12.png
+share/help/ko/bijiben/figures/notes-3-36.png
share/help/ko/bijiben/format-list.page
share/help/ko/bijiben/format-text.page
share/help/ko/bijiben/index.page
@@ -169,7 +226,7 @@ share/help/pl/bijiben/delete-restore.page
share/help/pl/bijiben/delete.page
share/help/pl/bijiben/figures/hicolor_apps_16x16_bijiben.png
share/help/pl/bijiben/figures/hicolor_apps_48x48_bijiben.png
-share/help/pl/bijiben/figures/notes-3-12.png
+share/help/pl/bijiben/figures/notes-3-36.png
share/help/pl/bijiben/format-list.page
share/help/pl/bijiben/format-text.page
share/help/pl/bijiben/index.page
@@ -188,7 +245,7 @@ share/help/pt_BR/bijiben/delete-restore.page
share/help/pt_BR/bijiben/delete.page
share/help/pt_BR/bijiben/figures/hicolor_apps_16x16_bijiben.png
share/help/pt_BR/bijiben/figures/hicolor_apps_48x48_bijiben.png
-share/help/pt_BR/bijiben/figures/notes-3-12.png
+share/help/pt_BR/bijiben/figures/notes-3-36.png
share/help/pt_BR/bijiben/format-list.page
share/help/pt_BR/bijiben/format-text.page
share/help/pt_BR/bijiben/index.page
@@ -207,7 +264,7 @@ share/help/sv/bijiben/delete-restore.page
share/help/sv/bijiben/delete.page
share/help/sv/bijiben/figures/hicolor_apps_16x16_bijiben.png
share/help/sv/bijiben/figures/hicolor_apps_48x48_bijiben.png
-share/help/sv/bijiben/figures/notes-3-12.png
+share/help/sv/bijiben/figures/notes-3-36.png
share/help/sv/bijiben/format-list.page
share/help/sv/bijiben/format-text.page
share/help/sv/bijiben/index.page
@@ -218,13 +275,27 @@ share/help/sv/bijiben/notebooks.page
share/help/sv/bijiben/rename.page
share/help/sv/bijiben/search.page
share/help/sv/bijiben/share.page
-share/icons/hicolor/16x16/apps/org.gnome.bijiben.png
-share/icons/hicolor/22x22/apps/org.gnome.bijiben.png
-share/icons/hicolor/24x24/apps/org.gnome.bijiben.png
-share/icons/hicolor/256x256/apps/org.gnome.bijiben.png
-share/icons/hicolor/32x32/apps/org.gnome.bijiben.png
-share/icons/hicolor/48x48/apps/org.gnome.bijiben.png
-share/icons/hicolor/scalable/apps/org.gnome.bijiben-symbolic.svg
+share/help/uk/bijiben/colors.page
+share/help/uk/bijiben/create.page
+share/help/uk/bijiben/cut-copy-paste.page
+share/help/uk/bijiben/delete-permanent.page
+share/help/uk/bijiben/delete-restore.page
+share/help/uk/bijiben/delete.page
+share/help/uk/bijiben/figures/hicolor_apps_16x16_bijiben.png
+share/help/uk/bijiben/figures/hicolor_apps_48x48_bijiben.png
+share/help/uk/bijiben/figures/notes-3-36.png
+share/help/uk/bijiben/format-list.page
+share/help/uk/bijiben/format-text.page
+share/help/uk/bijiben/index.page
+share/help/uk/bijiben/introduction.page
+share/help/uk/bijiben/legal.xml
+share/help/uk/bijiben/new-window.page
+share/help/uk/bijiben/notebooks.page
+share/help/uk/bijiben/rename.page
+share/help/uk/bijiben/search.page
+share/help/uk/bijiben/share.page
+share/icons/hicolor/scalable/apps/org.gnome.Notes.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Notes-symbolic.svg
share/locale/af/LC_MESSAGES/bijiben.mo
share/locale/ar/LC_MESSAGES/bijiben.mo
share/locale/as/LC_MESSAGES/bijiben.mo
@@ -232,6 +303,7 @@ share/locale/be/LC_MESSAGES/bijiben.mo
share/locale/bs/LC_MESSAGES/bijiben.mo
share/locale/ca/LC_MESSAGES/bijiben.mo
share/locale/ca@valencia/LC_MESSAGES/bijiben.mo
+share/locale/ckb/LC_MESSAGES/bijiben.mo
share/locale/cs/LC_MESSAGES/bijiben.mo
share/locale/da/LC_MESSAGES/bijiben.mo
share/locale/de/LC_MESSAGES/bijiben.mo
@@ -260,6 +332,7 @@ share/locale/ko/LC_MESSAGES/bijiben.mo
share/locale/lt/LC_MESSAGES/bijiben.mo
share/locale/lv/LC_MESSAGES/bijiben.mo
share/locale/ml/LC_MESSAGES/bijiben.mo
+share/locale/ms/LC_MESSAGES/bijiben.mo
share/locale/nb/LC_MESSAGES/bijiben.mo
share/locale/ne/LC_MESSAGES/bijiben.mo
share/locale/nl/LC_MESSAGES/bijiben.mo
@@ -276,6 +349,7 @@ share/locale/sl/LC_MESSAGES/bijiben.mo
share/locale/sr/LC_MESSAGES/bijiben.mo
share/locale/sr@latin/LC_MESSAGES/bijiben.mo
share/locale/sv/LC_MESSAGES/bijiben.mo
+share/locale/ta/LC_MESSAGES/bijiben.mo
share/locale/te/LC_MESSAGES/bijiben.mo
share/locale/tg/LC_MESSAGES/bijiben.mo
share/locale/tr/LC_MESSAGES/bijiben.mo
@@ -284,5 +358,5 @@ share/locale/vi/LC_MESSAGES/bijiben.mo
share/locale/zh_CN/LC_MESSAGES/bijiben.mo
share/locale/zh_HK/LC_MESSAGES/bijiben.mo
share/locale/zh_TW/LC_MESSAGES/bijiben.mo
-share/metainfo/org.gnome.bijiben.appdata.xml
-share/mime/packages/org.gnome.bijiben.xml
+share/metainfo/org.gnome.Notes.appdata.xml
+share/mime/packages/org.gnome.Notes.xml
diff --git a/deskutils/gnome-calendar/Makefile b/deskutils/gnome-calendar/Makefile
index ccd374637a22..849db20c13eb 100644
--- a/deskutils/gnome-calendar/Makefile
+++ b/deskutils/gnome-calendar/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-calendar
-PORTVERSION= 3.28.2
-PORTREVISION= 2
+PORTVERSION= 3.38.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -21,7 +20,8 @@ LIB_DEPENDS= libical.so:devel/libical \
libgweather-3.so:net/libgweather \
libgeoclue-2.so:net/geoclue \
libgeocode-glib.so:net/geocode-glib \
- libgoa-1.0.so:net/gnome-online-accounts
+ libgoa-1.0.so:net/gnome-online-accounts \
+ libhandy-0.0.so:x11-toolkits/libhandy0
RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
PORTSCOUT= limitw:1,even
diff --git a/deskutils/gnome-calendar/distinfo b/deskutils/gnome-calendar/distinfo
index b78847beb34e..d82f5fcd8ba8 100644
--- a/deskutils/gnome-calendar/distinfo
+++ b/deskutils/gnome-calendar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525503444
-SHA256 (gnome/gnome-calendar-3.28.2.tar.xz) = dcf72dd7850a8a29dd16ebd2594acd83ac9c35b83f9f6ee87a7c3ae49eeddc74
-SIZE (gnome/gnome-calendar-3.28.2.tar.xz) = 2440592
+TIMESTAMP = 1601304188
+SHA256 (gnome/gnome-calendar-3.38.0.tar.xz) = c3684252a72bb59089d071514458a4aeba417f9551ff5d548e1a5984e47b4733
+SIZE (gnome/gnome-calendar-3.38.0.tar.xz) = 547516
diff --git a/deskutils/gnome-calendar/pkg-plist b/deskutils/gnome-calendar/pkg-plist
index a608d22050b0..300134299cdc 100644
--- a/deskutils/gnome-calendar/pkg-plist
+++ b/deskutils/gnome-calendar/pkg-plist
@@ -2,14 +2,10 @@ bin/gnome-calendar
share/applications/org.gnome.Calendar.desktop
share/dbus-1/services/org.gnome.Calendar.service
share/gnome-shell/search-providers/org.gnome.Calendar.search-provider.ini
-share/icons/hicolor/16x16/apps/org.gnome.Calendar.png
-share/icons/hicolor/22x22/apps/org.gnome.Calendar.png
-share/icons/hicolor/24x24/apps/org.gnome.Calendar.png
-share/icons/hicolor/256x256/apps/org.gnome.Calendar.png
-share/icons/hicolor/32x32/apps/org.gnome.Calendar.png
-share/icons/hicolor/48x48/apps/org.gnome.Calendar.png
-share/icons/hicolor/512x512/apps/org.gnome.Calendar.png
+share/icons/hicolor/scalable/apps/org.gnome.Calendar.Devel.svg
+share/icons/hicolor/scalable/apps/org.gnome.Calendar.svg
share/icons/hicolor/symbolic/apps/org.gnome.Calendar-symbolic.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Calendar.Devel-symbolic.svg
share/locale/af/LC_MESSAGES/gnome-calendar.mo
share/locale/an/LC_MESSAGES/gnome-calendar.mo
share/locale/ar/LC_MESSAGES/gnome-calendar.mo
@@ -17,6 +13,7 @@ share/locale/be/LC_MESSAGES/gnome-calendar.mo
share/locale/bs/LC_MESSAGES/gnome-calendar.mo
share/locale/ca/LC_MESSAGES/gnome-calendar.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-calendar.mo
+share/locale/ckb/LC_MESSAGES/gnome-calendar.mo
share/locale/cs/LC_MESSAGES/gnome-calendar.mo
share/locale/da/LC_MESSAGES/gnome-calendar.mo
share/locale/de/LC_MESSAGES/gnome-calendar.mo
@@ -44,7 +41,9 @@ share/locale/kk/LC_MESSAGES/gnome-calendar.mo
share/locale/ko/LC_MESSAGES/gnome-calendar.mo
share/locale/lt/LC_MESSAGES/gnome-calendar.mo
share/locale/lv/LC_MESSAGES/gnome-calendar.mo
+share/locale/mjw/LC_MESSAGES/gnome-calendar.mo
share/locale/ml/LC_MESSAGES/gnome-calendar.mo
+share/locale/ms/LC_MESSAGES/gnome-calendar.mo
share/locale/nb/LC_MESSAGES/gnome-calendar.mo
share/locale/ne/LC_MESSAGES/gnome-calendar.mo
share/locale/nl/LC_MESSAGES/gnome-calendar.mo
@@ -60,6 +59,7 @@ share/locale/sl/LC_MESSAGES/gnome-calendar.mo
share/locale/sr/LC_MESSAGES/gnome-calendar.mo
share/locale/sr@latin/LC_MESSAGES/gnome-calendar.mo
share/locale/sv/LC_MESSAGES/gnome-calendar.mo
+share/locale/ta/LC_MESSAGES/gnome-calendar.mo
share/locale/tg/LC_MESSAGES/gnome-calendar.mo
share/locale/th/LC_MESSAGES/gnome-calendar.mo
share/locale/tr/LC_MESSAGES/gnome-calendar.mo
diff --git a/deskutils/gnome-clocks/Makefile b/deskutils/gnome-clocks/Makefile
index 901020693cf9..3218794fd9da 100644
--- a/deskutils/gnome-clocks/Makefile
+++ b/deskutils/gnome-clocks/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnome-clocks
PORTVERSION= 3.28.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/deskutils/gnome-contacts/Makefile b/deskutils/gnome-contacts/Makefile
index 195961b14c3a..2c7060a110d9 100644
--- a/deskutils/gnome-contacts/Makefile
+++ b/deskutils/gnome-contacts/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-contacts
-PORTVERSION= 3.32.1
+PORTVERSION= 3.38
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
@@ -30,7 +30,7 @@ LIB_DEPENDS= libchamplain-0.12.so:graphics/libchamplain \
libsecret-1.so:security/libsecret \
libsoup-2.4.so:devel/libsoup \
libtelepathy-glib.so:net-im/telepathy-glib \
- libhandy-0.0.so:x11-toolkits/libhandy0
+ libhandy-1.so:x11-toolkits/libhandy
PORTSCOUT= limitw:1,even
diff --git a/deskutils/gnome-contacts/distinfo b/deskutils/gnome-contacts/distinfo
index 84c6395bc994..7896f8e7b0e3 100644
--- a/deskutils/gnome-contacts/distinfo
+++ b/deskutils/gnome-contacts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601040282
-SHA256 (gnome-contacts-3.32.1.tar.xz) = de0bfd81e4ab4400e7b4b04e81d2de4f2ebae3d70226d3db750c15e9117ce19d
-SIZE (gnome-contacts-3.32.1.tar.xz) = 358800
+TIMESTAMP = 1601293849
+SHA256 (gnome-contacts-3.38.tar.xz) = 7fc2ee689c1f39c2e6375eb760b94e1651ce4a828ad408206d3a03e133da19af
+SIZE (gnome-contacts-3.38.tar.xz) = 656880
diff --git a/deskutils/gnome-contacts/files/patch-src_contacts-window.vala b/deskutils/gnome-contacts/files/patch-src_contacts-window.vala
deleted file mode 100644
index 2dcea49d845d..000000000000
--- a/deskutils/gnome-contacts/files/patch-src_contacts-window.vala
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/contacts-window.vala.orig 2019-04-24 11:12:58 UTC
-+++ src/contacts-window.vala
-@@ -35,9 +35,9 @@ public class Contacts.Window : Gtk.ApplicationWindow {
- [GtkChild]
- private TitleBar titlebar;
- [GtkChild]
-- private HeaderBar left_header;
-+ private Gtk.HeaderBar left_header;
- [GtkChild]
-- private HeaderBar right_header;
-+ private Gtk.HeaderBar right_header;
- [GtkChild]
- private Overlay notification_overlay;
- [GtkChild]
diff --git a/deskutils/gnome-contacts/pkg-plist b/deskutils/gnome-contacts/pkg-plist
index 621e844f5bcf..6e8b8c91fd9c 100644
--- a/deskutils/gnome-contacts/pkg-plist
+++ b/deskutils/gnome-contacts/pkg-plist
@@ -5,6 +5,7 @@ share/applications/org.gnome.Contacts.desktop
share/dbus-1/services/org.gnome.Contacts.SearchProvider.service
share/dbus-1/services/org.gnome.Contacts.service
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.svg
share/icons/hicolor/symbolic/apps/org.gnome.Contacts-symbolic.svg
share/locale/af/LC_MESSAGES/gnome-contacts.mo
@@ -48,9 +49,11 @@ share/locale/kn/LC_MESSAGES/gnome-contacts.mo
share/locale/ko/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
share/locale/mk/LC_MESSAGES/gnome-contacts.mo
share/locale/ml/LC_MESSAGES/gnome-contacts.mo
share/locale/mr/LC_MESSAGES/gnome-contacts.mo
+share/locale/ms/LC_MESSAGES/gnome-contacts.mo
share/locale/nb/LC_MESSAGES/gnome-contacts.mo
share/locale/ne/LC_MESSAGES/gnome-contacts.mo
share/locale/nl/LC_MESSAGES/gnome-contacts.mo
diff --git a/deskutils/gnome-documents/Makefile b/deskutils/gnome-documents/Makefile
index 3effd471334e..cc9586d4bdd1 100644
--- a/deskutils/gnome-documents/Makefile
+++ b/deskutils/gnome-documents/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gnome-documents
PORTVERSION= 3.34.0
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/deskutils/gnome-font-viewer/Makefile b/deskutils/gnome-font-viewer/Makefile
index a73a702bd1b2..890b73b9c83b 100644
--- a/deskutils/gnome-font-viewer/Makefile
+++ b/deskutils/gnome-font-viewer/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gnome-font-viewer
PORTVERSION= 3.34.0
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/deskutils/gnome-initial-setup/Makefile b/deskutils/gnome-initial-setup/Makefile
index 578bdd57bea1..51ef62aeb266 100644
--- a/deskutils/gnome-initial-setup/Makefile
+++ b/deskutils/gnome-initial-setup/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnome-initial-setup
PORTVERSION= 3.18.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/deskutils/gnome-maps/Makefile b/deskutils/gnome-maps/Makefile
index 592e18ab93b5..484d03a0e1a8 100644
--- a/deskutils/gnome-maps/Makefile
+++ b/deskutils/gnome-maps/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-maps
-PORTVERSION= 3.28.2
+PORTVERSION= 3.38.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -31,13 +31,12 @@ RUN_DEPENDS= geoclue>=0:net/geoclue
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gl gmake gnome libtool \
- localbase pathfix pkgconfig tar:xz xorg
+USES= desktop-file-utils gettext gl gnome meson \
+ pkgconfig tar:xz xorg
USE_GNOME= cairo gtk30 intltool libxml2
USE_GL= egl
USE_LDCONFIG= yes
USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr
-GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
diff --git a/deskutils/gnome-maps/distinfo b/deskutils/gnome-maps/distinfo
index ec64864b1860..fc99625f4c3d 100644
--- a/deskutils/gnome-maps/distinfo
+++ b/deskutils/gnome-maps/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525958477
-SHA256 (gnome/gnome-maps-3.28.2.tar.xz) = e787d92bb151314e5234156c2819f6f0c18ee9c7e00baa1fbdd284911402f1fb
-SIZE (gnome/gnome-maps-3.28.2.tar.xz) = 1195508
+TIMESTAMP = 1600337313
+SHA256 (gnome/gnome-maps-3.38.0.tar.xz) = 55758340ebd084610283bf1f6fec6c042559a186eb8699c056a22dfef1d97f99
+SIZE (gnome/gnome-maps-3.38.0.tar.xz) = 4027352
diff --git a/deskutils/gnome-maps/pkg-plist b/deskutils/gnome-maps/pkg-plist
index d438356e111c..81159535e136 100644
--- a/deskutils/gnome-maps/pkg-plist
+++ b/deskutils/gnome-maps/pkg-plist
@@ -5,7 +5,7 @@ lib/gnome-maps/libgnome-maps.so.0
lib/gnome-maps/libgnome-maps.so.0.0.0
share/applications/org.gnome.Maps.desktop
share/dbus-1/services/org.gnome.Maps.service
-share/gir-1.0/GnomeMaps-1.0.gir
+%%DATADIR%%/gir-1.0/GnomeMaps-1.0.gir
%%DATADIR%%/icons/hicolor/16x16/apps/layer-not-visible-symbolic.svg
%%DATADIR%%/icons/hicolor/16x16/apps/layer-visible-symbolic.svg
%%DATADIR%%/icons/hicolor/16x16/apps/layers-button-symbolic.svg
@@ -18,6 +18,7 @@ share/gir-1.0/GnomeMaps-1.0.gir
%%DATADIR%%/icons/hicolor/16x16/apps/route-car-symbolic.svg
%%DATADIR%%/icons/hicolor/16x16/apps/route-pedestrian-symbolic.svg
%%DATADIR%%/icons/hicolor/16x16/apps/route-reverse-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/apps/route-transit-airplane-symbolic.svg
%%DATADIR%%/icons/hicolor/16x16/apps/route-transit-bus-symbolic.svg
%%DATADIR%%/icons/hicolor/16x16/apps/route-transit-cablecar-symbolic.svg
%%DATADIR%%/icons/hicolor/16x16/apps/route-transit-ferry-symbolic.svg
@@ -30,31 +31,38 @@ share/gir-1.0/GnomeMaps-1.0.gir
%%DATADIR%%/icons/hicolor/24x24/apps/user-location-compass.png
%%DATADIR%%/icons/hicolor/24x24/apps/user-location.png
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-continue-symbolic.svg
+%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-elevator-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-left-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-right-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-0-symbolic.svg
+%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-135-lht-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-135-symbolic.svg
+%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-180-lht-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-180-symbolic.svg
+%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-225-lht-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-225-symbolic.svg
+%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-270-lht-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-270-symbolic.svg
+%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-315-lht-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-315-symbolic.svg
+%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-45-lht-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-45-symbolic.svg
+%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-90-lht-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-90-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-roundabout-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-sharpleft-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-sharpright-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-slightleft-symbolic.svg
%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-slightright-symbolic.svg
+%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-u-turn-left-symbolic.svg
+%%DATADIR%%/icons/hicolor/32x32/apps/maps-direction-u-turn-right-symbolic.svg
+%%DATADIR%%/icons/hicolor/32x32/apps/mark-location.png
%%DATADIR%%/maps-service.json
%%DATADIR%%/org.gnome.Maps
%%DATADIR%%/org.gnome.Maps.data.gresource
%%DATADIR%%/org.gnome.Maps.src.gresource
-share/icons/hicolor/16x16/apps/org.gnome.Maps.png
-share/icons/hicolor/22x22/apps/org.gnome.Maps.png
-share/icons/hicolor/24x24/apps/org.gnome.Maps.png
-share/icons/hicolor/256x256/apps/org.gnome.Maps.png
-share/icons/hicolor/32x32/apps/org.gnome.Maps.png
-share/icons/hicolor/48x48/apps/org.gnome.Maps.png
+share/icons/hicolor/scalable/apps/org.gnome.Maps.Devel.svg
+share/icons/hicolor/scalable/apps/org.gnome.Maps.svg
share/icons/hicolor/symbolic/apps/org.gnome.Maps-symbolic.svg
share/locale/af/LC_MESSAGES/gnome-maps.mo
share/locale/an/LC_MESSAGES/gnome-maps.mo
@@ -93,7 +101,9 @@ share/locale/kn/LC_MESSAGES/gnome-maps.mo
share/locale/ko/LC_MESSAGES/gnome-maps.mo
share/locale/lt/LC_MESSAGES/gnome-maps.mo
share/locale/lv/LC_MESSAGES/gnome-maps.mo
+share/locale/mjw/LC_MESSAGES/gnome-maps.mo
share/locale/ml/LC_MESSAGES/gnome-maps.mo
+share/locale/ms/LC_MESSAGES/gnome-maps.mo
share/locale/nb/LC_MESSAGES/gnome-maps.mo
share/locale/ne/LC_MESSAGES/gnome-maps.mo
share/locale/nl/LC_MESSAGES/gnome-maps.mo
@@ -109,6 +119,7 @@ share/locale/sl/LC_MESSAGES/gnome-maps.mo
share/locale/sr/LC_MESSAGES/gnome-maps.mo
share/locale/sr@latin/LC_MESSAGES/gnome-maps.mo
share/locale/sv/LC_MESSAGES/gnome-maps.mo
+share/locale/ta/LC_MESSAGES/gnome-maps.mo
share/locale/te/LC_MESSAGES/gnome-maps.mo
share/locale/tg/LC_MESSAGES/gnome-maps.mo
share/locale/tr/LC_MESSAGES/gnome-maps.mo
diff --git a/deskutils/gnome-photos/Makefile b/deskutils/gnome-photos/Makefile
index db3bf5fdda26..1abbde086e8a 100644
--- a/deskutils/gnome-photos/Makefile
+++ b/deskutils/gnome-photos/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnome-photos
PORTVERSION= 3.28.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/deskutils/gnome-todo/Makefile b/deskutils/gnome-todo/Makefile
index f7e9cbce4f0a..bd6bb0eed4e0 100644
--- a/deskutils/gnome-todo/Makefile
+++ b/deskutils/gnome-todo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnome-todo
PORTVERSION= 3.28.1
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/deskutils/gnome-todo/files/patch-plugins_eds_gtd-eds-autoptr_h b/deskutils/gnome-todo/files/patch-plugins_eds_gtd-eds-autoptr_h
new file mode 100644
index 000000000000..a7d65cdbceeb
--- /dev/null
+++ b/deskutils/gnome-todo/files/patch-plugins_eds_gtd-eds-autoptr_h
@@ -0,0 +1,15 @@
+$OpenBSD: patch-plugins_eds_gtd-eds-autoptr_h,v 1.2 2019/11/02 10:04:20 ajacoutot Exp $
+
+Fix for evolution-data-server >= 3.34 (From upstream via Arch Linux).
+
+Index: plugins/eds/gtd-eds-autoptr.h
+--- plugins/eds/gtd-eds-autoptr.h.orig
++++ plugins/eds/gtd-eds-autoptr.h
+@@ -23,6 +23,5 @@
+ #include <libecal/libecal.h>
+
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponent, g_object_unref);
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_free_id);
++G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_id_free);
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref);
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref);
diff --git a/deskutils/gnome-todo/files/patch-plugins_eds_gtd-provider-eds_c b/deskutils/gnome-todo/files/patch-plugins_eds_gtd-provider-eds_c
new file mode 100644
index 000000000000..f1ac8ea3dc08
--- /dev/null
+++ b/deskutils/gnome-todo/files/patch-plugins_eds_gtd-provider-eds_c
@@ -0,0 +1,36 @@
+$OpenBSD: patch-plugins_eds_gtd-provider-eds_c,v 1.1 2019/11/02 10:04:20 ajacoutot Exp $
+
+Fix for evolution-data-server >= 3.34 (From upstream via Arch Linux).
+
+Index: plugins/eds/gtd-provider-eds.c
+--- plugins/eds/gtd-provider-eds.c.orig
++++ plugins/eds/gtd-provider-eds.c
+@@ -554,6 +554,7 @@ gtd_provider_eds_create_task (GtdProvider *provider,
+
+ e_cal_client_create_object (client,
+ e_cal_component_get_icalcomponent (component),
++ E_CAL_OPERATION_FLAG_NONE,
+ NULL,
+ (GAsyncReadyCallback) on_task_created_cb,
+ new_task);
+@@ -587,6 +588,7 @@ gtd_provider_eds_update_task (GtdProvider *provider,
+ e_cal_client_modify_object (client,
+ e_cal_component_get_icalcomponent (component),
+ E_CAL_OBJ_MOD_THIS,
++ E_CAL_OPERATION_FLAG_NONE,
+ NULL,
+ (GAsyncReadyCallback) on_task_modified_cb,
+ task);
+@@ -616,9 +618,10 @@ gtd_provider_eds_remove_task (GtdProvider *provider,
+ gtd_object_push_loading (GTD_OBJECT (provider));
+
+ e_cal_client_remove_object (client,
+- id->uid,
+- id->rid,
++ e_cal_component_id_get_uid (id),
++ e_cal_component_id_get_rid (id),
+ E_CAL_OBJ_MOD_THIS,
++ E_CAL_OPERATION_FLAG_NONE,
+ NULL,
+ (GAsyncReadyCallback) on_task_removed_cb,
+ provider);
diff --git a/deskutils/gnome-todo/files/patch-plugins_eds_gtd-task-eds_c b/deskutils/gnome-todo/files/patch-plugins_eds_gtd-task-eds_c
new file mode 100644
index 000000000000..8099ceefdafc
--- /dev/null
+++ b/deskutils/gnome-todo/files/patch-plugins_eds_gtd-task-eds_c
@@ -0,0 +1,441 @@
+$OpenBSD: patch-plugins_eds_gtd-task-eds_c,v 1.1 2019/11/02 10:04:20 ajacoutot Exp $
+
+Fix for evolution-data-server >= 3.34 (From upstream via Arch Linux).
+
+Index: plugins/eds/gtd-task-eds.c
+--- plugins/eds/gtd-task-eds.c.orig
++++ plugins/eds/gtd-task-eds.c
+@@ -46,19 +46,19 @@ static GParamSpec *properties [N_PROPS];
+ */
+
+ static GDateTime*
+-convert_icaltime (const icaltimetype *date)
++convert_icaltime (const ICalTime *date)
+ {
+ GDateTime *dt;
+
+ if (!date)
+ return NULL;
+
+- dt = g_date_time_new_utc (date->year,
+- date->month,
+- date->day,
+- date->is_date ? 0 : date->hour,
+- date->is_date ? 0 : date->minute,
+- date->is_date ? 0 : date->second);
++ dt = g_date_time_new_utc (i_cal_time_get_year (date),
++ i_cal_time_get_month (date),
++ i_cal_time_get_day (date),
++ i_cal_time_is_date (date) ? 0 : i_cal_time_get_hour (date),
++ i_cal_time_is_date (date) ? 0 : i_cal_time_get_minute (date),
++ i_cal_time_is_date (date) ? 0 : i_cal_time_get_second (date));
+
+ return dt;
+ }
+@@ -67,19 +67,20 @@ static void
+ set_description (GtdTaskEds *self,
+ const gchar *description)
+ {
+- ECalComponentText text;
++ ECalComponentText *text;
+ GSList note;
+
+- text.value = description && *description ? description : "";
+- text.altrep = NULL;
++ text = e_cal_component_text_new (description ? description : "", NULL);
+
+- note.data = &text;
++ note.data = text;
+ note.next = NULL;
+
+ g_clear_pointer (&self->description, g_free);
+ self->description = g_strdup (description);
+
+- e_cal_component_set_description_list (self->component, &note);
++ e_cal_component_set_descriptions (self->component, (description && *description) ? &note : NULL);
++
++ e_cal_component_text_free (text);
+ }
+
+ static void
+@@ -90,7 +91,7 @@ setup_description (GtdTaskEds *self)
+ GSList *l;
+
+ /* concatenates the multiple descriptions a task may have */
+- e_cal_component_get_description_list (self->component, &text_list);
++ text_list = e_cal_component_get_descriptions (self->component);
+
+ for (l = text_list; l != NULL; l = l->next)
+ {
+@@ -105,21 +106,21 @@ setup_description (GtdTaskEds *self)
+ {
+ carrier = g_strconcat (desc,
+ "\n",
+- text->value,
++ e_cal_component_text_get_value (text),
+ NULL);
+ g_free (desc);
+ desc = carrier;
+ }
+ else
+ {
+- desc = g_strdup (text->value);
++ desc = g_strdup (e_cal_component_text_get_value (text));
+ }
+ }
+ }
+
+ set_description (self, desc);
+
+- e_cal_component_free_text_list (text_list);
++ g_slist_free_full (text_list, e_cal_component_text_free);
+ }
+
+
+@@ -138,7 +139,7 @@ gtd_task_eds_get_uid (GtdObject *object)
+ self = GTD_TASK_EDS (object);
+
+ if (self->component)
+- e_cal_component_get_uid (self->component, &uid);
++ uid = e_cal_component_get_uid (self->component);
+ else
+ uid = NULL;
+
+@@ -159,7 +160,7 @@ gtd_task_eds_set_uid (GtdObject *object,
+ if (!self->component)
+ return;
+
+- e_cal_component_get_uid (self->component, &current_uid);
++ current_uid = e_cal_component_get_uid (self->component);
+
+ if (g_strcmp0 (current_uid, uid) != 0)
+ {
+@@ -177,7 +178,7 @@ gtd_task_eds_set_uid (GtdObject *object,
+ static gboolean
+ gtd_task_eds_get_complete (GtdTask *task)
+ {
+- icalproperty_status status;
++ ICalPropertyStatus status;
+ GtdTaskEds *self;
+ gboolean completed;
+
+@@ -185,8 +186,8 @@ gtd_task_eds_get_complete (GtdTask *task)
+
+ self = GTD_TASK_EDS (task);
+
+- e_cal_component_get_status (self->component, &status);
+- completed = status == ICAL_STATUS_COMPLETED;
++ status = e_cal_component_get_status (self->component);
++ completed = status == I_CAL_STATUS_COMPLETED;
+
+ return completed;
+ }
+@@ -195,8 +196,8 @@ static void
+ gtd_task_eds_set_complete (GtdTask *task,
+ gboolean complete)
+ {
+- icalproperty_status status;
+- icaltimetype *dt;
++ ICalPropertyStatus status;
++ ICalTime *dt;
+ GtdTaskEds *self;
+ gint percent;
+
+@@ -209,54 +210,54 @@ gtd_task_eds_set_complete (GtdTask *task,
+ percent = 100;
+ status = ICAL_STATUS_COMPLETED;
+
+- dt = g_new0 (icaltimetype, 1);
+- dt->year = g_date_time_get_year (now);
+- dt->month = g_date_time_get_month (now);
+- dt->day = g_date_time_get_day_of_month (now);
+- dt->hour = g_date_time_get_hour (now);
+- dt->minute = g_date_time_get_minute (now);
+- dt->second = g_date_time_get_seconds (now);
+- dt->zone = icaltimezone_get_utc_timezone ();
++ dt = i_cal_time_new_null_time ();
++ i_cal_time_set_date (dt,
++ g_date_time_get_year (now),
++ g_date_time_get_month (now),
++ g_date_time_get_day_of_month (now));
++ i_cal_time_set_time (dt,
++ g_date_time_get_hour (now),
++ g_date_time_get_minute (now),
++ g_date_time_get_seconds (now));
++ i_cal_time_set_timezone (dt, i_cal_timezone_get_utc_timezone ());
+
+ /* convert timezone
+ *
+ * FIXME: This does not do anything until we have an ical
+ * timezone associated with the task
+ */
+- icaltimezone_convert_time (dt, NULL, icaltimezone_get_utc_timezone ());
++ i_cal_time_convert_timezone (dt, NULL, i_cal_timezone_get_utc_timezone ());
+ }
+ else
+ {
+ dt = NULL;
+ percent = 0;
+- status = ICAL_STATUS_NEEDSACTION;
++ status = I_CAL_STATUS_NEEDSACTION;
+ }
+
+- e_cal_component_set_percent_as_int (self->component, percent);
++ e_cal_component_set_percent_complete (self->component, percent);
+ e_cal_component_set_status (self->component, status);
+ e_cal_component_set_completed (self->component, dt);
+
+- if (dt)
+- e_cal_component_free_icaltimetype (dt);
++ g_clear_object (&dt);
+ }
+
+ static GDateTime*
+ gtd_task_eds_get_creation_date (GtdTask *task)
+ {
+- icaltimetype *idt;
++ ICalTime *idt;
+ GtdTaskEds *self;
+ GDateTime *dt;
+
+ self = GTD_TASK_EDS (task);
+- idt = NULL;
+ dt = NULL;
+
+- e_cal_component_get_created (self->component, &idt);
++ idt = e_cal_component_get_created (self->component);
+
+ if (idt)
+ dt = convert_icaltime (idt);
+
+- g_clear_pointer (&idt, e_cal_component_free_icaltimetype);
++ g_clear_object (&idt);
+
+ return dt;
+ }
+@@ -286,7 +287,7 @@ gtd_task_eds_set_description (GtdTask *task,
+ static GDateTime*
+ gtd_task_eds_get_due_date (GtdTask *task)
+ {
+- ECalComponentDateTime comp_dt;
++ ECalComponentDateTime *comp_dt;
+ GtdTaskEds *self;
+ GDateTime *date;
+
+@@ -294,10 +295,12 @@ gtd_task_eds_get_due_date (GtdTask *task)
+
+ self = GTD_TASK_EDS (task);
+
+- e_cal_component_get_due (self->component, &comp_dt);
++ comp_dt = e_cal_component_get_due (self->component);
++ if (!comp_dt)
++ return NULL;
+
+- date = convert_icaltime (comp_dt.value);
+- e_cal_component_free_datetime (&comp_dt);
++ date = convert_icaltime (e_cal_component_datetime_get_value (comp_dt));
++ e_cal_component_datetime_free (comp_dt);
+
+ return date;
+ }
+@@ -317,11 +320,10 @@ gtd_task_eds_set_due_date (GtdTask *task,
+
+ if (dt != current_dt)
+ {
+- ECalComponentDateTime comp_dt;
+- icaltimetype *idt;
++ ECalComponentDateTime *comp_dt;
++ ICalTime *idt;
+
+- comp_dt.value = NULL;
+- comp_dt.tzid = NULL;
++ comp_dt = NULL;
+ idt = NULL;
+
+ if (!current_dt ||
+@@ -329,36 +331,34 @@ gtd_task_eds_set_due_date (GtdTask *task,
+ dt &&
+ g_date_time_compare (current_dt, dt) != 0))
+ {
+- idt = g_new0 (icaltimetype, 1);
++ idt = i_cal_time_new_null_time ();
+
+ g_date_time_ref (dt);
+
+ /* Copy the given dt */
+- idt->year = g_date_time_get_year (dt);
+- idt->month = g_date_time_get_month (dt);
+- idt->day = g_date_time_get_day_of_month (dt);
+- idt->hour = g_date_time_get_hour (dt);
+- idt->minute = g_date_time_get_minute (dt);
+- idt->second = g_date_time_get_seconds (dt);
+- idt->is_date = (idt->hour == 0 &&
+- idt->minute == 0 &&
+- idt->second == 0);
++ i_cal_time_set_date (idt,
++ g_date_time_get_year (dt),
++ g_date_time_get_month (dt),
++ g_date_time_get_day_of_month (dt));
++ i_cal_time_set_time (idt,
++ g_date_time_get_hour (dt),
++ g_date_time_get_minute (dt),
++ g_date_time_get_seconds (dt));
++ i_cal_time_set_is_date (idt,
++ i_cal_time_get_hour (idt) == 0 &&
++ i_cal_time_get_minute (idt) == 0 &&
++ i_cal_time_get_second (idt) == 0);
+
+- comp_dt.tzid = g_strdup ("UTC");
++ comp_dt = e_cal_component_datetime_new_take (idt, g_strdup ("UTC"));
+
+- comp_dt.value = idt;
++ e_cal_component_set_due (self->component, comp_dt);
+
+- e_cal_component_set_due (self->component, &comp_dt);
++ e_cal_component_datetime_free (comp_dt);
+
+- e_cal_component_free_datetime (&comp_dt);
+-
+ g_date_time_unref (dt);
+ }
+ else if (!dt)
+ {
+- idt = NULL;
+- comp_dt.tzid = NULL;
+-
+ e_cal_component_set_due (self->component, NULL);
+ }
+ }
+@@ -369,19 +369,13 @@ gtd_task_eds_set_due_date (GtdTask *task,
+ static gint32
+ gtd_task_eds_get_priority (GtdTask *task)
+ {
+- g_autofree gint *priority = NULL;
+ GtdTaskEds *self;
+
+ g_assert (GTD_IS_TASK_EDS (task));
+
+ self = GTD_TASK_EDS (task);
+
+- e_cal_component_get_priority (self->component, &priority);
+-
+- if (!priority)
+- return -1;
+-
+- return *priority;
++ return e_cal_component_get_priority (self->component);
+ }
+
+ static void
+@@ -394,29 +388,26 @@ gtd_task_eds_set_priority (GtdTask *task,
+
+ self = GTD_TASK_EDS (task);
+
+- e_cal_component_set_priority (self->component, &priority);
++ e_cal_component_set_priority (self->component, priority);
+ }
+
+ static const gchar*
+ gtd_task_eds_get_title (GtdTask *task)
+ {
+- ECalComponentText summary;
+ GtdTaskEds *self;
+
+ g_return_val_if_fail (GTD_IS_TASK_EDS (task), NULL);
+
+ self = GTD_TASK_EDS (task);
+
+- e_cal_component_get_summary (self->component, &summary);
+-
+- return summary.value;
++ return i_cal_component_get_summary (e_cal_component_get_icalcomponent (self->component));
+ }
+
+ static void
+ gtd_task_eds_set_title (GtdTask *task,
+ const gchar *title)
+ {
+- ECalComponentText new_summary;
++ ECalComponentText *new_summary;
+ GtdTaskEds *self;
+
+ g_return_if_fail (GTD_IS_TASK_EDS (task));
+@@ -424,10 +415,11 @@ gtd_task_eds_set_title (GtdTask *task,
+
+ self = GTD_TASK_EDS (task);
+
+- new_summary.value = title;
+- new_summary.altrep = NULL;
++ new_summary = e_cal_component_text_new (title, NULL);
+
+- e_cal_component_set_summary (self->component, &new_summary);
++ e_cal_component_set_summary (self->component, new_summary);
++
++ e_cal_component_text_free (new_summary);
+ }
+
+
+@@ -436,10 +428,10 @@ gtd_task_eds_subtask_added (GtdTask *task,
+ GtdTask *subtask)
+ {
+ g_autoptr (GList) subtasks = NULL;
+- ECalComponentId *id;
++ const gchar *uid;
+ ECalComponent *comp;
+- icalcomponent *ical_comp;
+- icalproperty *property;
++ ICalComponent *ical_comp;
++ ICalProperty *property;
+ GtdTaskEds *subtask_self;
+ GtdTaskEds *self;
+
+@@ -450,17 +442,17 @@ gtd_task_eds_subtask_added (GtdTask *task,
+ /* Hook with parent's :subtask_added */
+ GTD_TASK_CLASS (gtd_task_eds_parent_class)->subtask_added (task, subtask);
+
+- id = e_cal_component_get_id (self->component);
++ uid = e_cal_component_get_uid (self->component);
+ comp = subtask_self->component;
+ ical_comp = e_cal_component_get_icalcomponent (comp);
+- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
++ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
+
+ if (property)
+- icalproperty_set_relatedto (property, id->uid);
++ i_cal_property_set_relatedto (property, uid);
+ else
+- icalcomponent_add_property (ical_comp, icalproperty_new_relatedto (id->uid));
++ i_cal_component_take_property (ical_comp, i_cal_property_new_relatedto (uid));
+
+- e_cal_component_free_id (id);
++ g_clear_object (&property);
+ }
+
+ static void
+@@ -468,8 +460,8 @@ gtd_task_eds_subtask_removed (GtdTask *task,
+ GtdTask *subtask)
+ {
+ g_autoptr (GList) subtasks = NULL;
+- icalcomponent *ical_comp;
+- icalproperty *property;
++ ICalComponent *ical_comp;
++ ICalProperty *property;
+ GtdTaskEds *subtask_self;
+
+ subtask_self = GTD_TASK_EDS (subtask);
+@@ -480,12 +472,13 @@ gtd_task_eds_subtask_removed (GtdTask *task,
+
+ /* Remove the parent link from the subtask's component */
+ ical_comp = e_cal_component_get_icalcomponent (subtask_self->component);
+- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
++ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
+
+ if (!property)
+ return;
+
+- icalcomponent_remove_property (ical_comp, property);
++ i_cal_component_remove_property (ical_comp, property);
++ g_object_unref (property);
+ }
+
+
diff --git a/deskutils/gnome-todo/files/patch-plugins_eds_gtd-task-list-eds_c b/deskutils/gnome-todo/files/patch-plugins_eds_gtd-task-list-eds_c
new file mode 100644
index 000000000000..33f83c583305
--- /dev/null
+++ b/deskutils/gnome-todo/files/patch-plugins_eds_gtd-task-list-eds_c
@@ -0,0 +1,71 @@
+$OpenBSD: patch-plugins_eds_gtd-task-list-eds_c,v 1.1 2019/11/02 10:04:20 ajacoutot Exp $
+
+Fix for evolution-data-server >= 3.34 (From upstream via Arch Linux).
+
+Index: plugins/eds/gtd-task-list-eds.c
+--- plugins/eds/gtd-task-list-eds.c.orig
++++ plugins/eds/gtd-task-list-eds.c
+@@ -85,19 +85,19 @@ setup_parent_task (GtdTaskListEds *self,
+ GtdTask *task)
+ {
+ ECalComponent *component;
+- icalcomponent *ical_comp;
+- icalproperty *property;
++ ICalComponent *ical_comp;
++ ICalProperty *property;
+ GtdTask *parent_task;
+ const gchar *parent_uid;
+
+ component = gtd_task_eds_get_component (GTD_TASK_EDS (task));
+ ical_comp = e_cal_component_get_icalcomponent (component);
+- property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
++ property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
+
+ if (!property)
+ return;
+
+- parent_uid = icalproperty_get_relatedto (property);
++ parent_uid = i_cal_property_get_relatedto (property);
+ parent_task = gtd_task_list_get_task_by_id (GTD_TASK_LIST (self), parent_uid);
+
+ if (parent_task)
+@@ -112,6 +112,8 @@ setup_parent_task (GtdTaskListEds *self,
+
+ g_ptr_array_add (self->pending_subtasks, data);
+ }
++
++ g_object_unref (property);
+ }
+
+ static void
+@@ -161,8 +163,8 @@ on_view_objects_added_cb (ECalClientView *view,
+ GtdTask *task;
+ const gchar *uid;
+
+- component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data));
+- e_cal_component_get_uid (component, &uid);
++ component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data));
++ uid = e_cal_component_get_uid (component);
+
+ task = gtd_task_list_get_task_by_id (self, uid);
+
+@@ -211,8 +213,8 @@ on_view_objects_modified_cb (ECalClientView *view,
+ GtdTask *task;
+ const gchar *uid;
+
+- component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data));
+- e_cal_component_get_uid (component, &uid);
++ component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data));
++ uid = e_cal_component_get_uid (component);
+
+ task = gtd_task_list_get_task_by_id (self, uid);
+
+@@ -244,7 +246,7 @@ on_view_objects_removed_cb (ECalClientView *view,
+ GtdTask *task;
+
+ id = l->data;
+- task = gtd_task_list_get_task_by_id (self, id->uid);
++ task = gtd_task_list_get_task_by_id (self, e_cal_component_id_get_uid (id));
+
+ if (!task)
+ continue;
diff --git a/deskutils/gnome-todo/files/patch-plugins_eds_meson_build b/deskutils/gnome-todo/files/patch-plugins_eds_meson_build
new file mode 100644
index 000000000000..7645b10090b3
--- /dev/null
+++ b/deskutils/gnome-todo/files/patch-plugins_eds_meson_build
@@ -0,0 +1,19 @@
+$OpenBSD: patch-plugins_eds_meson_build,v 1.1 2019/11/02 10:04:20 ajacoutot Exp $
+
+Fix for evolution-data-server >= 3.34 (From upstream via Arch Linux).
+
+Index: plugins/eds/meson.build
+--- plugins/eds/meson.build.orig
++++ plugins/eds/meson.build
+@@ -8,10 +8,9 @@ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_eds_re
+ ################
+
+ eds_plugin_deps = [
+- dependency('libecal-1.2', version: '>= 3.13.90'),
++ dependency('libecal-2.0', version: '>= 3.33.1'),
+ dependency('libedataserver-1.2', version: '>= 3.17.1'),
+ dependency('libedataserverui-1.2', version: '>= 3.17.1'),
+- dependency('libical', version: '>= 0.43'),
+ ]
+
+ eds_plugin_deps += gnome_todo_deps
diff --git a/deskutils/gnome-tweaks/Makefile b/deskutils/gnome-tweaks/Makefile
index 0fb8e1b7bbf8..56b527d30d97 100644
--- a/deskutils/gnome-tweaks/Makefile
+++ b/deskutils/gnome-tweaks/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gnome-tweaks
PORTVERSION= 3.34.0
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index 7a9fb17f8d8d..68f8c3205237 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nautilus-actions
PORTVERSION= 3.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= GNOME
diff --git a/games/aisleriot/Makefile b/games/aisleriot/Makefile
index 3f8690cece77..a14a793bf5ce 100644
--- a/games/aisleriot/Makefile
+++ b/games/aisleriot/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= aisleriot
-PORTVERSION= 3.22.5
-PORTREVISION= 1
+PORTVERSION= 3.22.9
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/games/aisleriot/distinfo b/games/aisleriot/distinfo
index 9ee9a07181e1..4709128b9597 100644
--- a/games/aisleriot/distinfo
+++ b/games/aisleriot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526109122
-SHA256 (gnome3/aisleriot-3.22.5.tar.xz) = f0c3d9c21e6a701442c1a18aec8fe524da68067fd95f10064125f692f54d8366
-SIZE (gnome3/aisleriot-3.22.5.tar.xz) = 5730172
+TIMESTAMP = 1592254230
+SHA256 (gnome3/aisleriot-3.22.9.tar.xz) = 51f2ffe4dd4f23349b033fd87aab7bf433641285719503dd7e52b2c25982ed7b
+SIZE (gnome3/aisleriot-3.22.9.tar.xz) = 5744276
diff --git a/games/five-or-more/Makefile b/games/five-or-more/Makefile
index b6d9ff259024..c0d45fdaa4b4 100644
--- a/games/five-or-more/Makefile
+++ b/games/five-or-more/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= five-or-more
-PORTVERSION= 3.28.0
+PORTVERSION= 3.32.2
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -13,19 +13,17 @@ COMMENT= Form a line of 5 or more colored balls
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= itstool:textproc/itstool
+BUILD_DEPENDS= itstool:textproc/itstool \
+ valac:lang/vala
+LIB_DEPENDS= libgnome-games-support-1.so:games/libgnome-games-support \
+ libgee-0.8.so:devel/libgee
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome localbase pathfix pkgconfig tar:xz
-USE_GNOME= cairo gtk30 intlhack librsvg2
-GNU_CONFIGURE= yes
+USES= gettext gnome meson pkgconfig tar:xz
+USE_GNOME= cairo gtk30 librsvg2
INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share
GLIB_SCHEMAS= org.gnome.five-or-more.gschema.xml
-post-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/games
-
.include <bsd.port.mk>
diff --git a/games/five-or-more/distinfo b/games/five-or-more/distinfo
index 01e333d56845..9a6498b2b49d 100644
--- a/games/five-or-more/distinfo
+++ b/games/five-or-more/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526108705
-SHA256 (gnome/five-or-more-3.28.0.tar.xz) = ac3450045de338e7a2ba6281babbbac443d36937ad10ca405d6a63d9f051c4bb
-SIZE (gnome/five-or-more-3.28.0.tar.xz) = 1507188
+TIMESTAMP = 1600366776
+SHA256 (gnome/five-or-more-3.32.2.tar.xz) = 311a2693dd04226d32b6d7a02e4c739341bf5bd3492e3285c3910db73e47eea6
+SIZE (gnome/five-or-more-3.32.2.tar.xz) = 1238468
diff --git a/games/five-or-more/pkg-plist b/games/five-or-more/pkg-plist
index 81b80a5493fd..e4b472b8810a 100644
--- a/games/five-or-more/pkg-plist
+++ b/games/five-or-more/pkg-plist
@@ -1,25 +1,16 @@
bin/five-or-more
man/man6/five-or-more.6.gz
-share/appdata/five-or-more.appdata.xml
-share/applications/five-or-more.desktop
+share/applications/org.gnome.five-or-more.desktop
%%DATADIR%%/five-or-more-preferences.ui
%%DATADIR%%/five-or-more.ui
-%%DATADIR%%/menu.ui
%%DATADIR%%/themes/balls.svg
-%%DATADIR%%/themes/dots.png
-%%DATADIR%%/themes/gumball.png
%%DATADIR%%/themes/shapes.svg
-@unexec [ -s %D/share/games/glines.Large.scores ] || rm -f %D/share/games/glines.Large.scores
-@unexec [ -s %D/share/games/glines.Medium.scores ] || rm -f %D/share/games/glines.Medium.scores
-@unexec [ -s %D/share/games/glines.Small.scores ] || rm -f %D/share/games/glines.Small.scores
+%%DATADIR%%/themes/tango.svg
share/help/C/five-or-more/bug-filing.page
share/help/C/five-or-more/change-board-size.page
share/help/C/five-or-more/change-theme.page
share/help/C/five-or-more/develop.page
share/help/C/five-or-more/documentation.page
-share/help/C/five-or-more/fast-moves.page
-share/help/C/five-or-more/figures/color-balls.png
-share/help/C/five-or-more/figures/color-shapes.png
share/help/C/five-or-more/figures/diagonal.png
share/help/C/five-or-more/figures/glines-demo.ogv
share/help/C/five-or-more/figures/glines-gameover.png
@@ -28,7 +19,6 @@ share/help/C/five-or-more/figures/large.png
share/help/C/five-or-more/figures/logo.png
share/help/C/five-or-more/figures/logo32.png
share/help/C/five-or-more/figures/medium.png
-share/help/C/five-or-more/figures/pickcolor.png
share/help/C/five-or-more/figures/small.png
share/help/C/five-or-more/figures/vertical.png
share/help/C/five-or-more/index.page
@@ -40,42 +30,11 @@ share/help/C/five-or-more/scores.page
share/help/C/five-or-more/shortcuts.page
share/help/C/five-or-more/strategy.page
share/help/C/five-or-more/translate.page
-share/help/ca/five-or-more/bug-filing.page
-share/help/ca/five-or-more/change-board-size.page
-share/help/ca/five-or-more/change-theme.page
-share/help/ca/five-or-more/develop.page
-share/help/ca/five-or-more/documentation.page
-share/help/ca/five-or-more/fast-moves.page
-share/help/ca/five-or-more/figures/color-balls.png
-share/help/ca/five-or-more/figures/color-shapes.png
-share/help/ca/five-or-more/figures/diagonal.png
-share/help/ca/five-or-more/figures/glines-demo.ogv
-share/help/ca/five-or-more/figures/glines-gameover.png
-share/help/ca/five-or-more/figures/horizontal.png
-share/help/ca/five-or-more/figures/large.png
-share/help/ca/five-or-more/figures/logo.png
-share/help/ca/five-or-more/figures/logo32.png
-share/help/ca/five-or-more/figures/medium.png
-share/help/ca/five-or-more/figures/pickcolor.png
-share/help/ca/five-or-more/figures/small.png
-share/help/ca/five-or-more/figures/vertical.png
-share/help/ca/five-or-more/index.page
-share/help/ca/five-or-more/legal.xml
-share/help/ca/five-or-more/license.page
-share/help/ca/five-or-more/play.page
-share/help/ca/five-or-more/rules.page
-share/help/ca/five-or-more/scores.page
-share/help/ca/five-or-more/shortcuts.page
-share/help/ca/five-or-more/strategy.page
-share/help/ca/five-or-more/translate.page
share/help/cs/five-or-more/bug-filing.page
share/help/cs/five-or-more/change-board-size.page
share/help/cs/five-or-more/change-theme.page
share/help/cs/five-or-more/develop.page
share/help/cs/five-or-more/documentation.page
-share/help/cs/five-or-more/fast-moves.page
-share/help/cs/five-or-more/figures/color-balls.png
-share/help/cs/five-or-more/figures/color-shapes.png
share/help/cs/five-or-more/figures/diagonal.png
share/help/cs/five-or-more/figures/glines-demo.ogv
share/help/cs/five-or-more/figures/glines-gameover.png
@@ -84,7 +43,6 @@ share/help/cs/five-or-more/figures/large.png
share/help/cs/five-or-more/figures/logo.png
share/help/cs/five-or-more/figures/logo32.png
share/help/cs/five-or-more/figures/medium.png
-share/help/cs/five-or-more/figures/pickcolor.png
share/help/cs/five-or-more/figures/small.png
share/help/cs/five-or-more/figures/vertical.png
share/help/cs/five-or-more/index.page
@@ -101,9 +59,6 @@ share/help/de/five-or-more/change-board-size.page
share/help/de/five-or-more/change-theme.page
share/help/de/five-or-more/develop.page
share/help/de/five-or-more/documentation.page
-share/help/de/five-or-more/fast-moves.page
-share/help/de/five-or-more/figures/color-balls.png
-share/help/de/five-or-more/figures/color-shapes.png
share/help/de/five-or-more/figures/diagonal.png
share/help/de/five-or-more/figures/glines-demo.ogv
share/help/de/five-or-more/figures/glines-gameover.png
@@ -112,7 +67,6 @@ share/help/de/five-or-more/figures/large.png
share/help/de/five-or-more/figures/logo.png
share/help/de/five-or-more/figures/logo32.png
share/help/de/five-or-more/figures/medium.png
-share/help/de/five-or-more/figures/pickcolor.png
share/help/de/five-or-more/figures/small.png
share/help/de/five-or-more/figures/vertical.png
share/help/de/five-or-more/index.page
@@ -129,9 +83,6 @@ share/help/el/five-or-more/change-board-size.page
share/help/el/five-or-more/change-theme.page
share/help/el/five-or-more/develop.page
share/help/el/five-or-more/documentation.page
-share/help/el/five-or-more/fast-moves.page
-share/help/el/five-or-more/figures/color-balls.png
-share/help/el/five-or-more/figures/color-shapes.png
share/help/el/five-or-more/figures/diagonal.png
share/help/el/five-or-more/figures/glines-demo.ogv
share/help/el/five-or-more/figures/glines-gameover.png
@@ -140,7 +91,6 @@ share/help/el/five-or-more/figures/large.png
share/help/el/five-or-more/figures/logo.png
share/help/el/five-or-more/figures/logo32.png
share/help/el/five-or-more/figures/medium.png
-share/help/el/five-or-more/figures/pickcolor.png
share/help/el/five-or-more/figures/small.png
share/help/el/five-or-more/figures/vertical.png
share/help/el/five-or-more/index.page
@@ -152,42 +102,11 @@ share/help/el/five-or-more/scores.page
share/help/el/five-or-more/shortcuts.page
share/help/el/five-or-more/strategy.page
share/help/el/five-or-more/translate.page
-share/help/en_GB/five-or-more/bug-filing.page
-share/help/en_GB/five-or-more/change-board-size.page
-share/help/en_GB/five-or-more/change-theme.page
-share/help/en_GB/five-or-more/develop.page
-share/help/en_GB/five-or-more/documentation.page
-share/help/en_GB/five-or-more/fast-moves.page
-share/help/en_GB/five-or-more/figures/color-balls.png
-share/help/en_GB/five-or-more/figures/color-shapes.png
-share/help/en_GB/five-or-more/figures/diagonal.png
-share/help/en_GB/five-or-more/figures/glines-demo.ogv
-share/help/en_GB/five-or-more/figures/glines-gameover.png
-share/help/en_GB/five-or-more/figures/horizontal.png
-share/help/en_GB/five-or-more/figures/large.png
-share/help/en_GB/five-or-more/figures/logo.png
-share/help/en_GB/five-or-more/figures/logo32.png
-share/help/en_GB/five-or-more/figures/medium.png
-share/help/en_GB/five-or-more/figures/pickcolor.png
-share/help/en_GB/five-or-more/figures/small.png
-share/help/en_GB/five-or-more/figures/vertical.png
-share/help/en_GB/five-or-more/index.page
-share/help/en_GB/five-or-more/legal.xml
-share/help/en_GB/five-or-more/license.page
-share/help/en_GB/five-or-more/play.page
-share/help/en_GB/five-or-more/rules.page
-share/help/en_GB/five-or-more/scores.page
-share/help/en_GB/five-or-more/shortcuts.page
-share/help/en_GB/five-or-more/strategy.page
-share/help/en_GB/five-or-more/translate.page
share/help/es/five-or-more/bug-filing.page
share/help/es/five-or-more/change-board-size.page
share/help/es/five-or-more/change-theme.page
share/help/es/five-or-more/develop.page
share/help/es/five-or-more/documentation.page
-share/help/es/five-or-more/fast-moves.page
-share/help/es/five-or-more/figures/color-balls.png
-share/help/es/five-or-more/figures/color-shapes.png
share/help/es/five-or-more/figures/diagonal.png
share/help/es/five-or-more/figures/glines-demo.ogv
share/help/es/five-or-more/figures/glines-gameover.png
@@ -196,7 +115,6 @@ share/help/es/five-or-more/figures/large.png
share/help/es/five-or-more/figures/logo.png
share/help/es/five-or-more/figures/logo32.png
share/help/es/five-or-more/figures/medium.png
-share/help/es/five-or-more/figures/pickcolor.png
share/help/es/five-or-more/figures/small.png
share/help/es/five-or-more/figures/vertical.png
share/help/es/five-or-more/index.page
@@ -208,42 +126,11 @@ share/help/es/five-or-more/scores.page
share/help/es/five-or-more/shortcuts.page
share/help/es/five-or-more/strategy.page
share/help/es/five-or-more/translate.page
-share/help/eu/five-or-more/bug-filing.page
-share/help/eu/five-or-more/change-board-size.page
-share/help/eu/five-or-more/change-theme.page
-share/help/eu/five-or-more/develop.page
-share/help/eu/five-or-more/documentation.page
-share/help/eu/five-or-more/fast-moves.page
-share/help/eu/five-or-more/figures/color-balls.png
-share/help/eu/five-or-more/figures/color-shapes.png
-share/help/eu/five-or-more/figures/diagonal.png
-share/help/eu/five-or-more/figures/glines-demo.ogv
-share/help/eu/five-or-more/figures/glines-gameover.png
-share/help/eu/five-or-more/figures/horizontal.png
-share/help/eu/five-or-more/figures/large.png
-share/help/eu/five-or-more/figures/logo.png
-share/help/eu/five-or-more/figures/logo32.png
-share/help/eu/five-or-more/figures/medium.png
-share/help/eu/five-or-more/figures/pickcolor.png
-share/help/eu/five-or-more/figures/small.png
-share/help/eu/five-or-more/figures/vertical.png
-share/help/eu/five-or-more/index.page
-share/help/eu/five-or-more/legal.xml
-share/help/eu/five-or-more/license.page
-share/help/eu/five-or-more/play.page
-share/help/eu/five-or-more/rules.page
-share/help/eu/five-or-more/scores.page
-share/help/eu/five-or-more/shortcuts.page
-share/help/eu/five-or-more/strategy.page
-share/help/eu/five-or-more/translate.page
share/help/fr/five-or-more/bug-filing.page
share/help/fr/five-or-more/change-board-size.page
share/help/fr/five-or-more/change-theme.page
share/help/fr/five-or-more/develop.page
share/help/fr/five-or-more/documentation.page
-share/help/fr/five-or-more/fast-moves.page
-share/help/fr/five-or-more/figures/color-balls.png
-share/help/fr/five-or-more/figures/color-shapes.png
share/help/fr/five-or-more/figures/diagonal.png
share/help/fr/five-or-more/figures/glines-demo.ogv
share/help/fr/five-or-more/figures/glines-gameover.png
@@ -252,7 +139,6 @@ share/help/fr/five-or-more/figures/large.png
share/help/fr/five-or-more/figures/logo.png
share/help/fr/five-or-more/figures/logo32.png
share/help/fr/five-or-more/figures/medium.png
-share/help/fr/five-or-more/figures/pickcolor.png
share/help/fr/five-or-more/figures/small.png
share/help/fr/five-or-more/figures/vertical.png
share/help/fr/five-or-more/index.page
@@ -269,9 +155,6 @@ share/help/gl/five-or-more/change-board-size.page
share/help/gl/five-or-more/change-theme.page
share/help/gl/five-or-more/develop.page
share/help/gl/five-or-more/documentation.page
-share/help/gl/five-or-more/fast-moves.page
-share/help/gl/five-or-more/figures/color-balls.png
-share/help/gl/five-or-more/figures/color-shapes.png
share/help/gl/five-or-more/figures/diagonal.png
share/help/gl/five-or-more/figures/glines-demo.ogv
share/help/gl/five-or-more/figures/glines-gameover.png
@@ -280,7 +163,6 @@ share/help/gl/five-or-more/figures/large.png
share/help/gl/five-or-more/figures/logo.png
share/help/gl/five-or-more/figures/logo32.png
share/help/gl/five-or-more/figures/medium.png
-share/help/gl/five-or-more/figures/pickcolor.png
share/help/gl/five-or-more/figures/small.png
share/help/gl/five-or-more/figures/vertical.png
share/help/gl/five-or-more/index.page
@@ -297,9 +179,6 @@ share/help/hu/five-or-more/change-board-size.page
share/help/hu/five-or-more/change-theme.page
share/help/hu/five-or-more/develop.page
share/help/hu/five-or-more/documentation.page
-share/help/hu/five-or-more/fast-moves.page
-share/help/hu/five-or-more/figures/color-balls.png
-share/help/hu/five-or-more/figures/color-shapes.png
share/help/hu/five-or-more/figures/diagonal.png
share/help/hu/five-or-more/figures/glines-demo.ogv
share/help/hu/five-or-more/figures/glines-gameover.png
@@ -308,7 +187,6 @@ share/help/hu/five-or-more/figures/large.png
share/help/hu/five-or-more/figures/logo.png
share/help/hu/five-or-more/figures/logo32.png
share/help/hu/five-or-more/figures/medium.png
-share/help/hu/five-or-more/figures/pickcolor.png
share/help/hu/five-or-more/figures/small.png
share/help/hu/five-or-more/figures/vertical.png
share/help/hu/five-or-more/index.page
@@ -320,42 +198,11 @@ share/help/hu/five-or-more/scores.page
share/help/hu/five-or-more/shortcuts.page
share/help/hu/five-or-more/strategy.page
share/help/hu/five-or-more/translate.page
-share/help/it/five-or-more/bug-filing.page
-share/help/it/five-or-more/change-board-size.page
-share/help/it/five-or-more/change-theme.page
-share/help/it/five-or-more/develop.page
-share/help/it/five-or-more/documentation.page
-share/help/it/five-or-more/fast-moves.page
-share/help/it/five-or-more/figures/color-balls.png
-share/help/it/five-or-more/figures/color-shapes.png
-share/help/it/five-or-more/figures/diagonal.png
-share/help/it/five-or-more/figures/glines-demo.ogv
-share/help/it/five-or-more/figures/glines-gameover.png
-share/help/it/five-or-more/figures/horizontal.png
-share/help/it/five-or-more/figures/large.png
-share/help/it/five-or-more/figures/logo.png
-share/help/it/five-or-more/figures/logo32.png
-share/help/it/five-or-more/figures/medium.png
-share/help/it/five-or-more/figures/pickcolor.png
-share/help/it/five-or-more/figures/small.png
-share/help/it/five-or-more/figures/vertical.png
-share/help/it/five-or-more/index.page
-share/help/it/five-or-more/legal.xml
-share/help/it/five-or-more/license.page
-share/help/it/five-or-more/play.page
-share/help/it/five-or-more/rules.page
-share/help/it/five-or-more/scores.page
-share/help/it/five-or-more/shortcuts.page
-share/help/it/five-or-more/strategy.page
-share/help/it/five-or-more/translate.page
share/help/ja/five-or-more/bug-filing.page
share/help/ja/five-or-more/change-board-size.page
share/help/ja/five-or-more/change-theme.page
share/help/ja/five-or-more/develop.page
share/help/ja/five-or-more/documentation.page
-share/help/ja/five-or-more/fast-moves.page
-share/help/ja/five-or-more/figures/color-balls.png
-share/help/ja/five-or-more/figures/color-shapes.png
share/help/ja/five-or-more/figures/diagonal.png
share/help/ja/five-or-more/figures/glines-demo.ogv
share/help/ja/five-or-more/figures/glines-gameover.png
@@ -364,7 +211,6 @@ share/help/ja/five-or-more/figures/large.png
share/help/ja/five-or-more/figures/logo.png
share/help/ja/five-or-more/figures/logo32.png
share/help/ja/five-or-more/figures/medium.png
-share/help/ja/five-or-more/figures/pickcolor.png
share/help/ja/five-or-more/figures/small.png
share/help/ja/five-or-more/figures/vertical.png
share/help/ja/five-or-more/index.page
@@ -376,42 +222,11 @@ share/help/ja/five-or-more/scores.page
share/help/ja/five-or-more/shortcuts.page
share/help/ja/five-or-more/strategy.page
share/help/ja/five-or-more/translate.page
-share/help/oc/five-or-more/bug-filing.page
-share/help/oc/five-or-more/change-board-size.page
-share/help/oc/five-or-more/change-theme.page
-share/help/oc/five-or-more/develop.page
-share/help/oc/five-or-more/documentation.page
-share/help/oc/five-or-more/fast-moves.page
-share/help/oc/five-or-more/figures/color-balls.png
-share/help/oc/five-or-more/figures/color-shapes.png
-share/help/oc/five-or-more/figures/diagonal.png
-share/help/oc/five-or-more/figures/glines-demo.ogv
-share/help/oc/five-or-more/figures/glines-gameover.png
-share/help/oc/five-or-more/figures/horizontal.png
-share/help/oc/five-or-more/figures/large.png
-share/help/oc/five-or-more/figures/logo.png
-share/help/oc/five-or-more/figures/logo32.png
-share/help/oc/five-or-more/figures/medium.png
-share/help/oc/five-or-more/figures/pickcolor.png
-share/help/oc/five-or-more/figures/small.png
-share/help/oc/five-or-more/figures/vertical.png
-share/help/oc/five-or-more/index.page
-share/help/oc/five-or-more/legal.xml
-share/help/oc/five-or-more/license.page
-share/help/oc/five-or-more/play.page
-share/help/oc/five-or-more/rules.page
-share/help/oc/five-or-more/scores.page
-share/help/oc/five-or-more/shortcuts.page
-share/help/oc/five-or-more/strategy.page
-share/help/oc/five-or-more/translate.page
share/help/pl/five-or-more/bug-filing.page
share/help/pl/five-or-more/change-board-size.page
share/help/pl/five-or-more/change-theme.page
share/help/pl/five-or-more/develop.page
share/help/pl/five-or-more/documentation.page
-share/help/pl/five-or-more/fast-moves.page
-share/help/pl/five-or-more/figures/color-balls.png
-share/help/pl/five-or-more/figures/color-shapes.png
share/help/pl/five-or-more/figures/diagonal.png
share/help/pl/five-or-more/figures/glines-demo.ogv
share/help/pl/five-or-more/figures/glines-gameover.png
@@ -420,7 +235,6 @@ share/help/pl/five-or-more/figures/large.png
share/help/pl/five-or-more/figures/logo.png
share/help/pl/five-or-more/figures/logo32.png
share/help/pl/five-or-more/figures/medium.png
-share/help/pl/five-or-more/figures/pickcolor.png
share/help/pl/five-or-more/figures/small.png
share/help/pl/five-or-more/figures/vertical.png
share/help/pl/five-or-more/index.page
@@ -437,9 +251,6 @@ share/help/pt_BR/five-or-more/change-board-size.page
share/help/pt_BR/five-or-more/change-theme.page
share/help/pt_BR/five-or-more/develop.page
share/help/pt_BR/five-or-more/documentation.page
-share/help/pt_BR/five-or-more/fast-moves.page
-share/help/pt_BR/five-or-more/figures/color-balls.png
-share/help/pt_BR/five-or-more/figures/color-shapes.png
share/help/pt_BR/five-or-more/figures/diagonal.png
share/help/pt_BR/five-or-more/figures/glines-demo.ogv
share/help/pt_BR/five-or-more/figures/glines-gameover.png
@@ -448,7 +259,6 @@ share/help/pt_BR/five-or-more/figures/large.png
share/help/pt_BR/five-or-more/figures/logo.png
share/help/pt_BR/five-or-more/figures/logo32.png
share/help/pt_BR/five-or-more/figures/medium.png
-share/help/pt_BR/five-or-more/figures/pickcolor.png
share/help/pt_BR/five-or-more/figures/small.png
share/help/pt_BR/five-or-more/figures/vertical.png
share/help/pt_BR/five-or-more/index.page
@@ -460,126 +270,11 @@ share/help/pt_BR/five-or-more/scores.page
share/help/pt_BR/five-or-more/shortcuts.page
share/help/pt_BR/five-or-more/strategy.page
share/help/pt_BR/five-or-more/translate.page
-share/help/ru/five-or-more/bug-filing.page
-share/help/ru/five-or-more/change-board-size.page
-share/help/ru/five-or-more/change-theme.page
-share/help/ru/five-or-more/develop.page
-share/help/ru/five-or-more/documentation.page
-share/help/ru/five-or-more/fast-moves.page
-share/help/ru/five-or-more/figures/color-balls.png
-share/help/ru/five-or-more/figures/color-shapes.png
-share/help/ru/five-or-more/figures/diagonal.png
-share/help/ru/five-or-more/figures/glines-demo.ogv
-share/help/ru/five-or-more/figures/glines-gameover.png
-share/help/ru/five-or-more/figures/horizontal.png
-share/help/ru/five-or-more/figures/large.png
-share/help/ru/five-or-more/figures/logo.png
-share/help/ru/five-or-more/figures/logo32.png
-share/help/ru/five-or-more/figures/medium.png
-share/help/ru/five-or-more/figures/pickcolor.png
-share/help/ru/five-or-more/figures/small.png
-share/help/ru/five-or-more/figures/vertical.png
-share/help/ru/five-or-more/index.page
-share/help/ru/five-or-more/legal.xml
-share/help/ru/five-or-more/license.page
-share/help/ru/five-or-more/play.page
-share/help/ru/five-or-more/rules.page
-share/help/ru/five-or-more/scores.page
-share/help/ru/five-or-more/shortcuts.page
-share/help/ru/five-or-more/strategy.page
-share/help/ru/five-or-more/translate.page
-share/help/sl/five-or-more/bug-filing.page
-share/help/sl/five-or-more/change-board-size.page
-share/help/sl/five-or-more/change-theme.page
-share/help/sl/five-or-more/develop.page
-share/help/sl/five-or-more/documentation.page
-share/help/sl/five-or-more/fast-moves.page
-share/help/sl/five-or-more/figures/color-balls.png
-share/help/sl/five-or-more/figures/color-shapes.png
-share/help/sl/five-or-more/figures/diagonal.png
-share/help/sl/five-or-more/figures/glines-demo.ogv
-share/help/sl/five-or-more/figures/glines-gameover.png
-share/help/sl/five-or-more/figures/horizontal.png
-share/help/sl/five-or-more/figures/large.png
-share/help/sl/five-or-more/figures/logo.png
-share/help/sl/five-or-more/figures/logo32.png
-share/help/sl/five-or-more/figures/medium.png
-share/help/sl/five-or-more/figures/pickcolor.png
-share/help/sl/five-or-more/figures/small.png
-share/help/sl/five-or-more/figures/vertical.png
-share/help/sl/five-or-more/index.page
-share/help/sl/five-or-more/legal.xml
-share/help/sl/five-or-more/license.page
-share/help/sl/five-or-more/play.page
-share/help/sl/five-or-more/rules.page
-share/help/sl/five-or-more/scores.page
-share/help/sl/five-or-more/shortcuts.page
-share/help/sl/five-or-more/strategy.page
-share/help/sl/five-or-more/translate.page
-share/help/sr/five-or-more/bug-filing.page
-share/help/sr/five-or-more/change-board-size.page
-share/help/sr/five-or-more/change-theme.page
-share/help/sr/five-or-more/develop.page
-share/help/sr/five-or-more/documentation.page
-share/help/sr/five-or-more/fast-moves.page
-share/help/sr/five-or-more/figures/color-balls.png
-share/help/sr/five-or-more/figures/color-shapes.png
-share/help/sr/five-or-more/figures/diagonal.png
-share/help/sr/five-or-more/figures/glines-demo.ogv
-share/help/sr/five-or-more/figures/glines-gameover.png
-share/help/sr/five-or-more/figures/horizontal.png
-share/help/sr/five-or-more/figures/large.png
-share/help/sr/five-or-more/figures/logo.png
-share/help/sr/five-or-more/figures/logo32.png
-share/help/sr/five-or-more/figures/medium.png
-share/help/sr/five-or-more/figures/pickcolor.png
-share/help/sr/five-or-more/figures/small.png
-share/help/sr/five-or-more/figures/vertical.png
-share/help/sr/five-or-more/index.page
-share/help/sr/five-or-more/legal.xml
-share/help/sr/five-or-more/license.page
-share/help/sr/five-or-more/play.page
-share/help/sr/five-or-more/rules.page
-share/help/sr/five-or-more/scores.page
-share/help/sr/five-or-more/shortcuts.page
-share/help/sr/five-or-more/strategy.page
-share/help/sr/five-or-more/translate.page
-share/help/sr@latin/five-or-more/bug-filing.page
-share/help/sr@latin/five-or-more/change-board-size.page
-share/help/sr@latin/five-or-more/change-theme.page
-share/help/sr@latin/five-or-more/develop.page
-share/help/sr@latin/five-or-more/documentation.page
-share/help/sr@latin/five-or-more/fast-moves.page
-share/help/sr@latin/five-or-more/figures/color-balls.png
-share/help/sr@latin/five-or-more/figures/color-shapes.png
-share/help/sr@latin/five-or-more/figures/diagonal.png
-share/help/sr@latin/five-or-more/figures/glines-demo.ogv
-share/help/sr@latin/five-or-more/figures/glines-gameover.png
-share/help/sr@latin/five-or-more/figures/horizontal.png
-share/help/sr@latin/five-or-more/figures/large.png
-share/help/sr@latin/five-or-more/figures/logo.png
-share/help/sr@latin/five-or-more/figures/logo32.png
-share/help/sr@latin/five-or-more/figures/medium.png
-share/help/sr@latin/five-or-more/figures/pickcolor.png
-share/help/sr@latin/five-or-more/figures/small.png
-share/help/sr@latin/five-or-more/figures/vertical.png
-share/help/sr@latin/five-or-more/index.page
-share/help/sr@latin/five-or-more/legal.xml
-share/help/sr@latin/five-or-more/license.page
-share/help/sr@latin/five-or-more/play.page
-share/help/sr@latin/five-or-more/rules.page
-share/help/sr@latin/five-or-more/scores.page
-share/help/sr@latin/five-or-more/shortcuts.page
-share/help/sr@latin/five-or-more/strategy.page
-share/help/sr@latin/five-or-more/translate.page
share/help/sv/five-or-more/bug-filing.page
share/help/sv/five-or-more/change-board-size.page
share/help/sv/five-or-more/change-theme.page
share/help/sv/five-or-more/develop.page
share/help/sv/five-or-more/documentation.page
-share/help/sv/five-or-more/fast-moves.page
-share/help/sv/five-or-more/figures/color-balls.png
-share/help/sv/five-or-more/figures/color-shapes.png
share/help/sv/five-or-more/figures/diagonal.png
share/help/sv/five-or-more/figures/glines-demo.ogv
share/help/sv/five-or-more/figures/glines-gameover.png
@@ -588,7 +283,6 @@ share/help/sv/five-or-more/figures/large.png
share/help/sv/five-or-more/figures/logo.png
share/help/sv/five-or-more/figures/logo32.png
share/help/sv/five-or-more/figures/medium.png
-share/help/sv/five-or-more/figures/pickcolor.png
share/help/sv/five-or-more/figures/small.png
share/help/sv/five-or-more/figures/vertical.png
share/help/sv/five-or-more/index.page
@@ -600,70 +294,14 @@ share/help/sv/five-or-more/scores.page
share/help/sv/five-or-more/shortcuts.page
share/help/sv/five-or-more/strategy.page
share/help/sv/five-or-more/translate.page
-share/help/tr/five-or-more/bug-filing.page
-share/help/tr/five-or-more/change-board-size.page
-share/help/tr/five-or-more/change-theme.page
-share/help/tr/five-or-more/develop.page
-share/help/tr/five-or-more/documentation.page
-share/help/tr/five-or-more/fast-moves.page
-share/help/tr/five-or-more/figures/color-balls.png
-share/help/tr/five-or-more/figures/color-shapes.png
-share/help/tr/five-or-more/figures/diagonal.png
-share/help/tr/five-or-more/figures/glines-demo.ogv
-share/help/tr/five-or-more/figures/glines-gameover.png
-share/help/tr/five-or-more/figures/horizontal.png
-share/help/tr/five-or-more/figures/large.png
-share/help/tr/five-or-more/figures/logo.png
-share/help/tr/five-or-more/figures/logo32.png
-share/help/tr/five-or-more/figures/medium.png
-share/help/tr/five-or-more/figures/pickcolor.png
-share/help/tr/five-or-more/figures/small.png
-share/help/tr/five-or-more/figures/vertical.png
-share/help/tr/five-or-more/index.page
-share/help/tr/five-or-more/legal.xml
-share/help/tr/five-or-more/license.page
-share/help/tr/five-or-more/play.page
-share/help/tr/five-or-more/rules.page
-share/help/tr/five-or-more/scores.page
-share/help/tr/five-or-more/shortcuts.page
-share/help/tr/five-or-more/strategy.page
-share/help/tr/five-or-more/translate.page
-share/help/zh_CN/five-or-more/bug-filing.page
-share/help/zh_CN/five-or-more/change-board-size.page
-share/help/zh_CN/five-or-more/change-theme.page
-share/help/zh_CN/five-or-more/develop.page
-share/help/zh_CN/five-or-more/documentation.page
-share/help/zh_CN/five-or-more/fast-moves.page
-share/help/zh_CN/five-or-more/figures/color-balls.png
-share/help/zh_CN/five-or-more/figures/color-shapes.png
-share/help/zh_CN/five-or-more/figures/diagonal.png
-share/help/zh_CN/five-or-more/figures/glines-demo.ogv
-share/help/zh_CN/five-or-more/figures/glines-gameover.png
-share/help/zh_CN/five-or-more/figures/horizontal.png
-share/help/zh_CN/five-or-more/figures/large.png
-share/help/zh_CN/five-or-more/figures/logo.png
-share/help/zh_CN/five-or-more/figures/logo32.png
-share/help/zh_CN/five-or-more/figures/medium.png
-share/help/zh_CN/five-or-more/figures/pickcolor.png
-share/help/zh_CN/five-or-more/figures/small.png
-share/help/zh_CN/five-or-more/figures/vertical.png
-share/help/zh_CN/five-or-more/index.page
-share/help/zh_CN/five-or-more/legal.xml
-share/help/zh_CN/five-or-more/license.page
-share/help/zh_CN/five-or-more/play.page
-share/help/zh_CN/five-or-more/rules.page
-share/help/zh_CN/five-or-more/scores.page
-share/help/zh_CN/five-or-more/shortcuts.page
-share/help/zh_CN/five-or-more/strategy.page
-share/help/zh_CN/five-or-more/translate.page
-share/icons/hicolor/16x16/apps/five-or-more.png
-share/icons/hicolor/22x22/apps/five-or-more.png
-share/icons/hicolor/24x24/apps/five-or-more.png
-share/icons/hicolor/256x256/apps/five-or-more.png
-share/icons/hicolor/32x32/apps/five-or-more.png
-share/icons/hicolor/48x48/apps/five-or-more.png
-share/icons/hicolor/512x512/apps/five-or-more.png
-share/icons/hicolor/symbolic/apps/five-or-more-symbolic.svg
+share/icons/hicolor/16x16/apps/org.gnome.five-or-more.png
+share/icons/hicolor/22x22/apps/org.gnome.five-or-more.png
+share/icons/hicolor/24x24/apps/org.gnome.five-or-more.png
+share/icons/hicolor/256x256/apps/org.gnome.five-or-more.png
+share/icons/hicolor/32x32/apps/org.gnome.five-or-more.png
+share/icons/hicolor/48x48/apps/org.gnome.five-or-more.png
+share/icons/hicolor/512x512/apps/org.gnome.five-or-more.png
+share/icons/hicolor/symbolic/apps/org.gnome.five-or-more-symbolic.svg
share/locale/af/LC_MESSAGES/five-or-more.mo
share/locale/am/LC_MESSAGES/five-or-more.mo
share/locale/ar/LC_MESSAGES/five-or-more.mo
@@ -753,4 +391,4 @@ share/locale/xh/LC_MESSAGES/five-or-more.mo
share/locale/zh_CN/LC_MESSAGES/five-or-more.mo
share/locale/zh_HK/LC_MESSAGES/five-or-more.mo
share/locale/zh_TW/LC_MESSAGES/five-or-more.mo
-@dir share/games
+share/metainfo/org.gnome.five-or-more.appdata.xml
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index a0c730da86b3..80ca09a317eb 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,7 +3,7 @@
PORTNAME= eog
PORTVERSION= 3.28.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index deb875a9fd6c..65f7ccd7b7c9 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,6 +3,7 @@
PORTNAME= evince
PORTVERSION= 3.36.7
+PORTREVISION= 1
CATEGORIES= graphics print gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile
index 4bafdad2f179..4ecdad47c58a 100644
--- a/mail/evolution-ews/Makefile
+++ b/mail/evolution-ews/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= evolution-ews
-PORTVERSION= 3.28.5
-PORTREVISION= 5
+PORTVERSION= 3.38.0
CATEGORIES= mail gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Evolution Microsoft Exchange plugin through Exchange Web Services
@@ -23,7 +22,8 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libnspr4.so:devel/nspr \
libnss3.so:security/nss \
libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
- libical.so:devel/libical
+ libical.so:devel/libical \
+ libjson-glib-1.0.so:devel/json-glib
RUN_DEPENDS= evolution>=3.0.0:mail/evolution
PORTSCOUT= limitw:1,even
diff --git a/mail/evolution-ews/distinfo b/mail/evolution-ews/distinfo
index 8760843e82fb..16cbebc119e7 100644
--- a/mail/evolution-ews/distinfo
+++ b/mail/evolution-ews/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538600001
-SHA256 (gnome3/evolution-ews-3.28.5.tar.xz) = ccf026e40828300a0097066ae85aaaee900d15315d6af2f8aa6a39d17b827225
-SIZE (gnome3/evolution-ews-3.28.5.tar.xz) = 505764
+TIMESTAMP = 1601304473
+SHA256 (gnome/evolution-ews-3.38.0.tar.xz) = 59bf59cabb9d193d91076972dd8a6e71ebf34c7bfad01cd6954297347a3077b3
+SIZE (gnome/evolution-ews-3.38.0.tar.xz) = 646184
diff --git a/mail/evolution-ews/pkg-plist b/mail/evolution-ews/pkg-plist
index 6de5051b4737..7af2fac88623 100644
--- a/mail/evolution-ews/pkg-plist
+++ b/mail/evolution-ews/pkg-plist
@@ -1,11 +1,18 @@
lib/evolution-data-server/addressbook-backends/libebookbackendews.so
+lib/evolution-data-server/addressbook-backends/libebookbackendmicrosoft365.so
lib/evolution-data-server/calendar-backends/libecalbackendews.so
+lib/evolution-data-server/calendar-backends/libecalbackendmicrosoft365.so
lib/evolution-data-server/camel-providers/libcamelews.so
lib/evolution-data-server/camel-providers/libcamelews.urls
+lib/evolution-data-server/camel-providers/libcamelmicrosoft365.so
+lib/evolution-data-server/camel-providers/libcamelmicrosoft365.urls
lib/evolution-data-server/registry-modules/module-ews-backend.so
+lib/evolution-data-server/registry-modules/module-microsoft365-backend.so
lib/evolution-ews/libcamelews-priv.so
lib/evolution-ews/libevolution-ews.so
+lib/evolution-ews/libevolution-microsoft365.so
lib/evolution/modules/module-ews-configuration.so
+lib/evolution/modules/module-microsoft365-configuration.so
share/evolution-data-server/ews/windowsZones.xml
share/evolution/errors/module-ews-configuration.error
share/locale/as/LC_MESSAGES/evolution-ews.mo
@@ -23,6 +30,7 @@ share/locale/fr/LC_MESSAGES/evolution-ews.mo
share/locale/gl/LC_MESSAGES/evolution-ews.mo
share/locale/gu/LC_MESSAGES/evolution-ews.mo
share/locale/hi/LC_MESSAGES/evolution-ews.mo
+share/locale/hr/LC_MESSAGES/evolution-ews.mo
share/locale/hu/LC_MESSAGES/evolution-ews.mo
share/locale/id/LC_MESSAGES/evolution-ews.mo
share/locale/ja/LC_MESSAGES/evolution-ews.mo
@@ -31,11 +39,13 @@ share/locale/lt/LC_MESSAGES/evolution-ews.mo
share/locale/lv/LC_MESSAGES/evolution-ews.mo
share/locale/mr/LC_MESSAGES/evolution-ews.mo
share/locale/nb/LC_MESSAGES/evolution-ews.mo
+share/locale/nl/LC_MESSAGES/evolution-ews.mo
share/locale/oc/LC_MESSAGES/evolution-ews.mo
share/locale/or/LC_MESSAGES/evolution-ews.mo
share/locale/pl/LC_MESSAGES/evolution-ews.mo
share/locale/pt/LC_MESSAGES/evolution-ews.mo
share/locale/pt_BR/LC_MESSAGES/evolution-ews.mo
+share/locale/ro/LC_MESSAGES/evolution-ews.mo
share/locale/sk/LC_MESSAGES/evolution-ews.mo
share/locale/sl/LC_MESSAGES/evolution-ews.mo
share/locale/sr/LC_MESSAGES/evolution-ews.mo
@@ -44,5 +54,6 @@ share/locale/sv/LC_MESSAGES/evolution-ews.mo
share/locale/ta/LC_MESSAGES/evolution-ews.mo
share/locale/te/LC_MESSAGES/evolution-ews.mo
share/locale/tr/LC_MESSAGES/evolution-ews.mo
+share/locale/uk/LC_MESSAGES/evolution-ews.mo
share/locale/zh_CN/LC_MESSAGES/evolution-ews.mo
share/metainfo/org.gnome.Evolution-ews.metainfo.xml
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 99f7360dd01d..73fd0cf61bd3 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= evolution
-PORTVERSION= 3.28.5
-PORTREVISION= 8
+PORTVERSION= 3.38.0
CATEGORIES= mail gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Integrated mail, calendar and address book distributed suite
@@ -37,7 +36,8 @@ LIB_DEPENDS= libnss3.so:security/nss \
libcryptui.so:security/libcryptui \
libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
- libnotify.so:devel/libnotify
+ libnotify.so:devel/libnotify \
+ libgspell-1.so:textproc/gspell
RUN_DEPENDS= highlight:textproc/highlight \
iso-codes>=0:misc/iso-codes
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index de0697adf203..a924ce67fbfb 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538599603
-SHA256 (gnome3/evolution-3.28.5.tar.xz) = bb282ec7caf32872191c9885f3447adb190a7744b3b3cdb29d84b834d47336e0
-SIZE (gnome3/evolution-3.28.5.tar.xz) = 12151396
+TIMESTAMP = 1601303952
+SHA256 (gnome/evolution-3.38.0.tar.xz) = f81cc40f54aa2d059da4f3a94eb09362e81513306c974a41ca7895b9c8957c5d
+SIZE (gnome/evolution-3.38.0.tar.xz) = 12057496
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index bb50a2581471..98e5f8d47503 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,5 +1,4 @@
bin/evolution
-etc/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop
include/evolution/addressbook/gui/widgets/eab-config.h
include/evolution/calendar/gui/calendar-config-keys.h
include/evolution/calendar/gui/calendar-config.h
@@ -109,7 +108,6 @@ include/evolution/e-util/e-auth-combo-box.h
include/evolution/e-util/e-autocomplete-selector.h
include/evolution/e-util/e-bit-array.h
include/evolution/e-util/e-book-source-config.h
-include/evolution/e-util/e-buffer-tagger.h
include/evolution/e-util/e-cal-source-config.h
include/evolution/e-util/e-calendar-item.h
include/evolution/e-util/e-calendar.h
@@ -320,6 +318,7 @@ include/evolution/e-util/e-url-entry.h
include/evolution/e-util/e-util-enums.h
include/evolution/e-util/e-util-enumtypes.h
include/evolution/e-util/e-util.h
+include/evolution/e-util/e-web-view-jsc-utils.h
include/evolution/e-util/e-web-view-preview.h
include/evolution/e-util/e-web-view.h
include/evolution/e-util/e-webdav-browser.h
@@ -446,6 +445,8 @@ include/evolution/mail/e-mail-enums.h
include/evolution/mail/e-mail-enumtypes.h
include/evolution/mail/e-mail-folder-create-dialog.h
include/evolution/mail/e-mail-folder-pane.h
+include/evolution/mail/e-mail-folder-sort-order-dialog.h
+include/evolution/mail/e-mail-folder-tweaks.h
include/evolution/mail/e-mail-free-form-exp.h
include/evolution/mail/e-mail-junk-options.h
include/evolution/mail/e-mail-label-action.h
@@ -462,11 +463,14 @@ include/evolution/mail/e-mail-printer.h
include/evolution/mail/e-mail-properties.h
include/evolution/mail/e-mail-reader-utils.h
include/evolution/mail/e-mail-reader.h
+include/evolution/mail/e-mail-remote-content-popover.h
include/evolution/mail/e-mail-remote-content.h
include/evolution/mail/e-mail-request.h
include/evolution/mail/e-mail-send-account-override.h
include/evolution/mail/e-mail-sidebar.h
include/evolution/mail/e-mail-tag-editor.h
+include/evolution/mail/e-mail-templates-store.h
+include/evolution/mail/e-mail-templates.h
include/evolution/mail/e-mail-ui-session.h
include/evolution/mail/e-mail-view.h
include/evolution/mail/e-mail.h
@@ -507,12 +511,12 @@ include/evolution/shell/e-shell-view.h
include/evolution/shell/e-shell-window-actions.h
include/evolution/shell/e-shell-window.h
include/evolution/shell/e-shell.h
+lib/evolution-data-server/ui-modules/module-evolution-alarm-notify.so
lib/evolution/libeabutil.so
lib/evolution/libeabwidgets.so
lib/evolution/libecontacteditor.so
lib/evolution/libecontactlisteditor.so
lib/evolution/libecontactprint.so
-lib/evolution/libedomutils.so
lib/evolution/libemail-engine.so
lib/evolution/libessmime.so
lib/evolution/libevolution-addressbook-importers.so
@@ -530,16 +534,17 @@ lib/evolution/modules/module-accounts-window.so
lib/evolution/modules/module-addressbook.so
lib/evolution/modules/module-backup-restore.so
%%BOGOFILTER%%lib/evolution/modules/module-bogofilter.so
+lib/evolution/modules/module-book-config-carddav.so
lib/evolution/modules/module-book-config-google.so
%%LDAP%%lib/evolution/modules/module-book-config-ldap.so
lib/evolution/modules/module-book-config-local.so
-lib/evolution/modules/module-book-config-webdav.so
lib/evolution/modules/module-cal-config-caldav.so
lib/evolution/modules/module-cal-config-contacts.so
lib/evolution/modules/module-cal-config-google.so
lib/evolution/modules/module-cal-config-local.so
%%WEATHER%%lib/evolution/modules/module-cal-config-weather.so
lib/evolution/modules/module-cal-config-webcal.so
+lib/evolution/modules/module-cal-config-webdav-notes.so
lib/evolution/modules/module-calendar.so
lib/evolution/modules/module-composer-autosave.so
lib/evolution/modules/module-composer-to-meeting.so
@@ -592,13 +597,11 @@ lib/evolution/plugins/org-gnome-publish-calendar.eplug
lib/evolution/plugins/org-gnome-save-calendar.eplug
lib/evolution/plugins/org-gnome-templates.eplug
lib/evolution/web-extensions/libewebextension.so
-lib/evolution/web-extensions/module-itip-formatter-webextension.so
lib/evolution/web-extensions/webkit-editor/module-webkit-editor-webextension.so
libdata/pkgconfig/evolution-calendar-3.0.pc
libdata/pkgconfig/evolution-mail-3.0.pc
libdata/pkgconfig/evolution-shell-3.0.pc
libdata/pkgconfig/libemail-engine.pc
-libexec/evolution/evolution-alarm-notify
libexec/evolution/evolution-backup
libexec/evolution/killev
share/GConf/gsettings/evolution.convert
@@ -617,7 +620,6 @@ share/applications/org.gnome.Evolution.desktop
%%DATADIR%%/default/hu/mail/local/Inbox
%%DATADIR%%/default/id/mail/local/Inbox
%%DATADIR%%/default/it/mail/local/Inbox
-%%DATADIR%%/default/ja/mail/local/Inbox
%%DATADIR%%/default/ko/mail/local/Inbox
%%DATADIR%%/default/lt/mail/local/Inbox
%%DATADIR%%/default/mk/mail/local/Inbox
@@ -655,19 +657,7 @@ share/applications/org.gnome.Evolution.desktop
%%DATADIR%%/etspec/e-task-table.etspec
%%DATADIR%%/etspec/message-list.etspec
%%DATADIR%%/filtertypes.xml
-%%DATADIR%%/help/quickref/C/quickref.pdf
-%%DATADIR%%/help/quickref/ca/quickref.pdf
-%%DATADIR%%/help/quickref/cs/quickref.pdf
-%%DATADIR%%/help/quickref/de/quickref.pdf
-%%DATADIR%%/help/quickref/es/quickref.pdf
-%%DATADIR%%/help/quickref/fr/quickref.pdf
-%%DATADIR%%/help/quickref/hu/quickref.pdf
-%%DATADIR%%/help/quickref/it/quickref.pdf
-%%DATADIR%%/help/quickref/oc/quickref.pdf
-%%DATADIR%%/help/quickref/pl/quickref.pdf
-%%DATADIR%%/help/quickref/pt/quickref.pdf
-%%DATADIR%%/help/quickref/sq/quickref.pdf
-%%DATADIR%%/help/quickref/sv/quickref.pdf
+%%DATADIR%%/icons/hicolor/128x128/apps/contact-editor.png
%%DATADIR%%/icons/hicolor/16x16/actions/folder-copy.png
%%DATADIR%%/icons/hicolor/16x16/actions/folder-move.png
%%DATADIR%%/icons/hicolor/16x16/actions/go-today.png
@@ -830,9 +820,7 @@ share/applications/org.gnome.Evolution.desktop
%%DATADIR%%/images/draft-paper.png
%%DATADIR%%/images/draft-stamp.jpg
%%DATADIR%%/images/midnight-stars.jpg
-%%DATADIR%%/images/minus.png
%%DATADIR%%/images/paper.png
-%%DATADIR%%/images/plus.png
%%DATADIR%%/images/rect.png
%%DATADIR%%/images/ribbon.jpg
%%DATADIR%%/images/texture.png
@@ -842,9 +830,6 @@ share/applications/org.gnome.Evolution.desktop
%%DATADIR%%/searchtypes.xml
%%DATADIR%%/sounds/default_alarm.wav
%%DATADIR%%/tasktypes.xml
-%%DATADIR%%/theme/webview-print.css
-%%DATADIR%%/theme/webview.css
-%%DATADIR%%/ui/alarm-notify.ui
%%DATADIR%%/ui/contact-editor.ui
%%DATADIR%%/ui/contact-list-editor.ui
%%DATADIR%%/ui/e-calendar-preferences.ui
@@ -859,6 +844,7 @@ share/applications/org.gnome.Evolution.desktop
%%DATADIR%%/ui/evolution-mail.ui
%%DATADIR%%/ui/evolution-memos.ui
%%DATADIR%%/ui/evolution-shell.ui
+%%DATADIR%%/ui/evolution-shortcuts.ui
%%DATADIR%%/ui/evolution-tasks.ui
%%DATADIR%%/ui/filter.ui
%%DATADIR%%/ui/fullname.ui
@@ -890,6 +876,13 @@ share/applications/org.gnome.Evolution.desktop
%%DATADIR%%/views/tasks/With_DueDate.galview
%%DATADIR%%/views/tasks/With_Status.galview
%%DATADIR%%/views/tasks/galview.xml
+%%DATADIR%%/webkit/e-convert.js
+%%DATADIR%%/webkit/e-editor.js
+%%DATADIR%%/webkit/e-selection.js
+%%DATADIR%%/webkit/e-undo-redo.js
+%%DATADIR%%/webkit/e-web-view.js
+%%DATADIR%%/webkit/webview-print.css
+%%DATADIR%%/webkit/webview.css
share/help/C/evolution/backup-restore.page
share/help/C/evolution/calendar-alarms-and-reminders.page
share/help/C/evolution/calendar-caldav.page
@@ -959,12 +952,13 @@ share/help/C/evolution/figures/html-composer-insert-link.png
share/help/C/evolution/figures/html-composer-insert-rule.png
share/help/C/evolution/figures/html-composer-insert-table.png
share/help/C/evolution/figures/minus-icon.png
-share/help/C/evolution/figures/new-mail-notification.png
share/help/C/evolution/figures/new-mail-switcher.png
share/help/C/evolution/figures/plus-icon.png
share/help/C/evolution/figures/search-icon.png
share/help/C/evolution/figures/window-overview-layers.png
+share/help/C/evolution/flatpak-limitations.page
share/help/C/evolution/google-services.page
+share/help/C/evolution/import-apps-kmail.page
share/help/C/evolution/import-apps-mozilla.page
share/help/C/evolution/import-apps-outlook.page
share/help/C/evolution/import-data.page
@@ -1049,6 +1043,7 @@ share/help/C/evolution/mail-filters-not-working.page
share/help/C/evolution/mail-filters.page
share/help/C/evolution/mail-folders.page
share/help/C/evolution/mail-follow-up-flag.page
+share/help/C/evolution/mail-imap-change-send-method.page
share/help/C/evolution/mail-imap-subscriptions.page
share/help/C/evolution/mail-labels.page
share/help/C/evolution/mail-layout-changing.page
@@ -1081,6 +1076,7 @@ share/help/C/evolution/mail-send-and-receive-manual.page
share/help/C/evolution/mail-send-and-receive.page
share/help/C/evolution/mail-sending-options-smtp.page
share/help/C/evolution/mail-several-pop-accounts.page
+share/help/C/evolution/mail-sorting-folder-list.page
share/help/C/evolution/mail-sorting-message-list.page
share/help/C/evolution/mail-spam-marking.page
share/help/C/evolution/mail-spam-settings.page
@@ -1115,7 +1111,6 @@ share/help/C/evolution/tasks-using-several-tasklists.page
share/help/C/evolution/tasks-webdav.page
share/help/C/evolution/using-categories.page
share/help/C/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/C/evolution/xinclude-mail-account-identity.xml
share/help/C/evolution/xinclude-searching.xml
share/help/ca/evolution/backup-restore.page
share/help/ca/evolution/calendar-alarms-and-reminders.page
@@ -1186,12 +1181,13 @@ share/help/ca/evolution/figures/html-composer-insert-link.png
share/help/ca/evolution/figures/html-composer-insert-rule.png
share/help/ca/evolution/figures/html-composer-insert-table.png
share/help/ca/evolution/figures/minus-icon.png
-share/help/ca/evolution/figures/new-mail-notification.png
share/help/ca/evolution/figures/new-mail-switcher.png
share/help/ca/evolution/figures/plus-icon.png
share/help/ca/evolution/figures/search-icon.png
share/help/ca/evolution/figures/window-overview-layers.png
+share/help/ca/evolution/flatpak-limitations.page
share/help/ca/evolution/google-services.page
+share/help/ca/evolution/import-apps-kmail.page
share/help/ca/evolution/import-apps-mozilla.page
share/help/ca/evolution/import-apps-outlook.page
share/help/ca/evolution/import-data.page
@@ -1276,6 +1272,7 @@ share/help/ca/evolution/mail-filters-not-working.page
share/help/ca/evolution/mail-filters.page
share/help/ca/evolution/mail-folders.page
share/help/ca/evolution/mail-follow-up-flag.page
+share/help/ca/evolution/mail-imap-change-send-method.page
share/help/ca/evolution/mail-imap-subscriptions.page
share/help/ca/evolution/mail-labels.page
share/help/ca/evolution/mail-layout-changing.page
@@ -1308,6 +1305,7 @@ share/help/ca/evolution/mail-send-and-receive-manual.page
share/help/ca/evolution/mail-send-and-receive.page
share/help/ca/evolution/mail-sending-options-smtp.page
share/help/ca/evolution/mail-several-pop-accounts.page
+share/help/ca/evolution/mail-sorting-folder-list.page
share/help/ca/evolution/mail-sorting-message-list.page
share/help/ca/evolution/mail-spam-marking.page
share/help/ca/evolution/mail-spam-settings.page
@@ -1342,7 +1340,6 @@ share/help/ca/evolution/tasks-using-several-tasklists.page
share/help/ca/evolution/tasks-webdav.page
share/help/ca/evolution/using-categories.page
share/help/ca/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/ca/evolution/xinclude-mail-account-identity.xml
share/help/ca/evolution/xinclude-searching.xml
share/help/cs/evolution/backup-restore.page
share/help/cs/evolution/calendar-alarms-and-reminders.page
@@ -1413,12 +1410,13 @@ share/help/cs/evolution/figures/html-composer-insert-link.png
share/help/cs/evolution/figures/html-composer-insert-rule.png
share/help/cs/evolution/figures/html-composer-insert-table.png
share/help/cs/evolution/figures/minus-icon.png
-share/help/cs/evolution/figures/new-mail-notification.png
share/help/cs/evolution/figures/new-mail-switcher.png
share/help/cs/evolution/figures/plus-icon.png
share/help/cs/evolution/figures/search-icon.png
share/help/cs/evolution/figures/window-overview-layers.png
+share/help/cs/evolution/flatpak-limitations.page
share/help/cs/evolution/google-services.page
+share/help/cs/evolution/import-apps-kmail.page
share/help/cs/evolution/import-apps-mozilla.page
share/help/cs/evolution/import-apps-outlook.page
share/help/cs/evolution/import-data.page
@@ -1503,6 +1501,7 @@ share/help/cs/evolution/mail-filters-not-working.page
share/help/cs/evolution/mail-filters.page
share/help/cs/evolution/mail-folders.page
share/help/cs/evolution/mail-follow-up-flag.page
+share/help/cs/evolution/mail-imap-change-send-method.page
share/help/cs/evolution/mail-imap-subscriptions.page
share/help/cs/evolution/mail-labels.page
share/help/cs/evolution/mail-layout-changing.page
@@ -1535,6 +1534,7 @@ share/help/cs/evolution/mail-send-and-receive-manual.page
share/help/cs/evolution/mail-send-and-receive.page
share/help/cs/evolution/mail-sending-options-smtp.page
share/help/cs/evolution/mail-several-pop-accounts.page
+share/help/cs/evolution/mail-sorting-folder-list.page
share/help/cs/evolution/mail-sorting-message-list.page
share/help/cs/evolution/mail-spam-marking.page
share/help/cs/evolution/mail-spam-settings.page
@@ -1569,7 +1569,6 @@ share/help/cs/evolution/tasks-using-several-tasklists.page
share/help/cs/evolution/tasks-webdav.page
share/help/cs/evolution/using-categories.page
share/help/cs/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/cs/evolution/xinclude-mail-account-identity.xml
share/help/cs/evolution/xinclude-searching.xml
share/help/de/evolution/backup-restore.page
share/help/de/evolution/calendar-alarms-and-reminders.page
@@ -1640,12 +1639,13 @@ share/help/de/evolution/figures/html-composer-insert-link.png
share/help/de/evolution/figures/html-composer-insert-rule.png
share/help/de/evolution/figures/html-composer-insert-table.png
share/help/de/evolution/figures/minus-icon.png
-share/help/de/evolution/figures/new-mail-notification.png
share/help/de/evolution/figures/new-mail-switcher.png
share/help/de/evolution/figures/plus-icon.png
share/help/de/evolution/figures/search-icon.png
share/help/de/evolution/figures/window-overview-layers.png
+share/help/de/evolution/flatpak-limitations.page
share/help/de/evolution/google-services.page
+share/help/de/evolution/import-apps-kmail.page
share/help/de/evolution/import-apps-mozilla.page
share/help/de/evolution/import-apps-outlook.page
share/help/de/evolution/import-data.page
@@ -1730,6 +1730,7 @@ share/help/de/evolution/mail-filters-not-working.page
share/help/de/evolution/mail-filters.page
share/help/de/evolution/mail-folders.page
share/help/de/evolution/mail-follow-up-flag.page
+share/help/de/evolution/mail-imap-change-send-method.page
share/help/de/evolution/mail-imap-subscriptions.page
share/help/de/evolution/mail-labels.page
share/help/de/evolution/mail-layout-changing.page
@@ -1762,6 +1763,7 @@ share/help/de/evolution/mail-send-and-receive-manual.page
share/help/de/evolution/mail-send-and-receive.page
share/help/de/evolution/mail-sending-options-smtp.page
share/help/de/evolution/mail-several-pop-accounts.page
+share/help/de/evolution/mail-sorting-folder-list.page
share/help/de/evolution/mail-sorting-message-list.page
share/help/de/evolution/mail-spam-marking.page
share/help/de/evolution/mail-spam-settings.page
@@ -1796,7 +1798,6 @@ share/help/de/evolution/tasks-using-several-tasklists.page
share/help/de/evolution/tasks-webdav.page
share/help/de/evolution/using-categories.page
share/help/de/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/de/evolution/xinclude-mail-account-identity.xml
share/help/de/evolution/xinclude-searching.xml
share/help/el/evolution/backup-restore.page
share/help/el/evolution/calendar-alarms-and-reminders.page
@@ -1867,12 +1868,13 @@ share/help/el/evolution/figures/html-composer-insert-link.png
share/help/el/evolution/figures/html-composer-insert-rule.png
share/help/el/evolution/figures/html-composer-insert-table.png
share/help/el/evolution/figures/minus-icon.png
-share/help/el/evolution/figures/new-mail-notification.png
share/help/el/evolution/figures/new-mail-switcher.png
share/help/el/evolution/figures/plus-icon.png
share/help/el/evolution/figures/search-icon.png
share/help/el/evolution/figures/window-overview-layers.png
+share/help/el/evolution/flatpak-limitations.page
share/help/el/evolution/google-services.page
+share/help/el/evolution/import-apps-kmail.page
share/help/el/evolution/import-apps-mozilla.page
share/help/el/evolution/import-apps-outlook.page
share/help/el/evolution/import-data.page
@@ -1957,6 +1959,7 @@ share/help/el/evolution/mail-filters-not-working.page
share/help/el/evolution/mail-filters.page
share/help/el/evolution/mail-folders.page
share/help/el/evolution/mail-follow-up-flag.page
+share/help/el/evolution/mail-imap-change-send-method.page
share/help/el/evolution/mail-imap-subscriptions.page
share/help/el/evolution/mail-labels.page
share/help/el/evolution/mail-layout-changing.page
@@ -1989,6 +1992,7 @@ share/help/el/evolution/mail-send-and-receive-manual.page
share/help/el/evolution/mail-send-and-receive.page
share/help/el/evolution/mail-sending-options-smtp.page
share/help/el/evolution/mail-several-pop-accounts.page
+share/help/el/evolution/mail-sorting-folder-list.page
share/help/el/evolution/mail-sorting-message-list.page
share/help/el/evolution/mail-spam-marking.page
share/help/el/evolution/mail-spam-settings.page
@@ -2023,7 +2027,6 @@ share/help/el/evolution/tasks-using-several-tasklists.page
share/help/el/evolution/tasks-webdav.page
share/help/el/evolution/using-categories.page
share/help/el/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/el/evolution/xinclude-mail-account-identity.xml
share/help/el/evolution/xinclude-searching.xml
share/help/en_GB/evolution/backup-restore.page
share/help/en_GB/evolution/calendar-alarms-and-reminders.page
@@ -2094,12 +2097,13 @@ share/help/en_GB/evolution/figures/html-composer-insert-link.png
share/help/en_GB/evolution/figures/html-composer-insert-rule.png
share/help/en_GB/evolution/figures/html-composer-insert-table.png
share/help/en_GB/evolution/figures/minus-icon.png
-share/help/en_GB/evolution/figures/new-mail-notification.png
share/help/en_GB/evolution/figures/new-mail-switcher.png
share/help/en_GB/evolution/figures/plus-icon.png
share/help/en_GB/evolution/figures/search-icon.png
share/help/en_GB/evolution/figures/window-overview-layers.png
+share/help/en_GB/evolution/flatpak-limitations.page
share/help/en_GB/evolution/google-services.page
+share/help/en_GB/evolution/import-apps-kmail.page
share/help/en_GB/evolution/import-apps-mozilla.page
share/help/en_GB/evolution/import-apps-outlook.page
share/help/en_GB/evolution/import-data.page
@@ -2184,6 +2188,7 @@ share/help/en_GB/evolution/mail-filters-not-working.page
share/help/en_GB/evolution/mail-filters.page
share/help/en_GB/evolution/mail-folders.page
share/help/en_GB/evolution/mail-follow-up-flag.page
+share/help/en_GB/evolution/mail-imap-change-send-method.page
share/help/en_GB/evolution/mail-imap-subscriptions.page
share/help/en_GB/evolution/mail-labels.page
share/help/en_GB/evolution/mail-layout-changing.page
@@ -2216,6 +2221,7 @@ share/help/en_GB/evolution/mail-send-and-receive-manual.page
share/help/en_GB/evolution/mail-send-and-receive.page
share/help/en_GB/evolution/mail-sending-options-smtp.page
share/help/en_GB/evolution/mail-several-pop-accounts.page
+share/help/en_GB/evolution/mail-sorting-folder-list.page
share/help/en_GB/evolution/mail-sorting-message-list.page
share/help/en_GB/evolution/mail-spam-marking.page
share/help/en_GB/evolution/mail-spam-settings.page
@@ -2250,7 +2256,6 @@ share/help/en_GB/evolution/tasks-using-several-tasklists.page
share/help/en_GB/evolution/tasks-webdav.page
share/help/en_GB/evolution/using-categories.page
share/help/en_GB/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/en_GB/evolution/xinclude-mail-account-identity.xml
share/help/en_GB/evolution/xinclude-searching.xml
share/help/es/evolution/backup-restore.page
share/help/es/evolution/calendar-alarms-and-reminders.page
@@ -2321,12 +2326,13 @@ share/help/es/evolution/figures/html-composer-insert-link.png
share/help/es/evolution/figures/html-composer-insert-rule.png
share/help/es/evolution/figures/html-composer-insert-table.png
share/help/es/evolution/figures/minus-icon.png
-share/help/es/evolution/figures/new-mail-notification.png
share/help/es/evolution/figures/new-mail-switcher.png
share/help/es/evolution/figures/plus-icon.png
share/help/es/evolution/figures/search-icon.png
share/help/es/evolution/figures/window-overview-layers.png
+share/help/es/evolution/flatpak-limitations.page
share/help/es/evolution/google-services.page
+share/help/es/evolution/import-apps-kmail.page
share/help/es/evolution/import-apps-mozilla.page
share/help/es/evolution/import-apps-outlook.page
share/help/es/evolution/import-data.page
@@ -2411,6 +2417,7 @@ share/help/es/evolution/mail-filters-not-working.page
share/help/es/evolution/mail-filters.page
share/help/es/evolution/mail-folders.page
share/help/es/evolution/mail-follow-up-flag.page
+share/help/es/evolution/mail-imap-change-send-method.page
share/help/es/evolution/mail-imap-subscriptions.page
share/help/es/evolution/mail-labels.page
share/help/es/evolution/mail-layout-changing.page
@@ -2443,6 +2450,7 @@ share/help/es/evolution/mail-send-and-receive-manual.page
share/help/es/evolution/mail-send-and-receive.page
share/help/es/evolution/mail-sending-options-smtp.page
share/help/es/evolution/mail-several-pop-accounts.page
+share/help/es/evolution/mail-sorting-folder-list.page
share/help/es/evolution/mail-sorting-message-list.page
share/help/es/evolution/mail-spam-marking.page
share/help/es/evolution/mail-spam-settings.page
@@ -2477,7 +2485,6 @@ share/help/es/evolution/tasks-using-several-tasklists.page
share/help/es/evolution/tasks-webdav.page
share/help/es/evolution/using-categories.page
share/help/es/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/es/evolution/xinclude-mail-account-identity.xml
share/help/es/evolution/xinclude-searching.xml
share/help/eu/evolution/backup-restore.page
share/help/eu/evolution/calendar-alarms-and-reminders.page
@@ -2548,12 +2555,13 @@ share/help/eu/evolution/figures/html-composer-insert-link.png
share/help/eu/evolution/figures/html-composer-insert-rule.png
share/help/eu/evolution/figures/html-composer-insert-table.png
share/help/eu/evolution/figures/minus-icon.png
-share/help/eu/evolution/figures/new-mail-notification.png
share/help/eu/evolution/figures/new-mail-switcher.png
share/help/eu/evolution/figures/plus-icon.png
share/help/eu/evolution/figures/search-icon.png
share/help/eu/evolution/figures/window-overview-layers.png
+share/help/eu/evolution/flatpak-limitations.page
share/help/eu/evolution/google-services.page
+share/help/eu/evolution/import-apps-kmail.page
share/help/eu/evolution/import-apps-mozilla.page
share/help/eu/evolution/import-apps-outlook.page
share/help/eu/evolution/import-data.page
@@ -2638,6 +2646,7 @@ share/help/eu/evolution/mail-filters-not-working.page
share/help/eu/evolution/mail-filters.page
share/help/eu/evolution/mail-folders.page
share/help/eu/evolution/mail-follow-up-flag.page
+share/help/eu/evolution/mail-imap-change-send-method.page
share/help/eu/evolution/mail-imap-subscriptions.page
share/help/eu/evolution/mail-labels.page
share/help/eu/evolution/mail-layout-changing.page
@@ -2670,6 +2679,7 @@ share/help/eu/evolution/mail-send-and-receive-manual.page
share/help/eu/evolution/mail-send-and-receive.page
share/help/eu/evolution/mail-sending-options-smtp.page
share/help/eu/evolution/mail-several-pop-accounts.page
+share/help/eu/evolution/mail-sorting-folder-list.page
share/help/eu/evolution/mail-sorting-message-list.page
share/help/eu/evolution/mail-spam-marking.page
share/help/eu/evolution/mail-spam-settings.page
@@ -2704,7 +2714,6 @@ share/help/eu/evolution/tasks-using-several-tasklists.page
share/help/eu/evolution/tasks-webdav.page
share/help/eu/evolution/using-categories.page
share/help/eu/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/eu/evolution/xinclude-mail-account-identity.xml
share/help/eu/evolution/xinclude-searching.xml
share/help/fr/evolution/backup-restore.page
share/help/fr/evolution/calendar-alarms-and-reminders.page
@@ -2775,12 +2784,13 @@ share/help/fr/evolution/figures/html-composer-insert-link.png
share/help/fr/evolution/figures/html-composer-insert-rule.png
share/help/fr/evolution/figures/html-composer-insert-table.png
share/help/fr/evolution/figures/minus-icon.png
-share/help/fr/evolution/figures/new-mail-notification.png
share/help/fr/evolution/figures/new-mail-switcher.png
share/help/fr/evolution/figures/plus-icon.png
share/help/fr/evolution/figures/search-icon.png
share/help/fr/evolution/figures/window-overview-layers.png
+share/help/fr/evolution/flatpak-limitations.page
share/help/fr/evolution/google-services.page
+share/help/fr/evolution/import-apps-kmail.page
share/help/fr/evolution/import-apps-mozilla.page
share/help/fr/evolution/import-apps-outlook.page
share/help/fr/evolution/import-data.page
@@ -2865,6 +2875,7 @@ share/help/fr/evolution/mail-filters-not-working.page
share/help/fr/evolution/mail-filters.page
share/help/fr/evolution/mail-folders.page
share/help/fr/evolution/mail-follow-up-flag.page
+share/help/fr/evolution/mail-imap-change-send-method.page
share/help/fr/evolution/mail-imap-subscriptions.page
share/help/fr/evolution/mail-labels.page
share/help/fr/evolution/mail-layout-changing.page
@@ -2897,6 +2908,7 @@ share/help/fr/evolution/mail-send-and-receive-manual.page
share/help/fr/evolution/mail-send-and-receive.page
share/help/fr/evolution/mail-sending-options-smtp.page
share/help/fr/evolution/mail-several-pop-accounts.page
+share/help/fr/evolution/mail-sorting-folder-list.page
share/help/fr/evolution/mail-sorting-message-list.page
share/help/fr/evolution/mail-spam-marking.page
share/help/fr/evolution/mail-spam-settings.page
@@ -2931,7 +2943,6 @@ share/help/fr/evolution/tasks-using-several-tasklists.page
share/help/fr/evolution/tasks-webdav.page
share/help/fr/evolution/using-categories.page
share/help/fr/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/fr/evolution/xinclude-mail-account-identity.xml
share/help/fr/evolution/xinclude-searching.xml
share/help/gl/evolution/backup-restore.page
share/help/gl/evolution/calendar-alarms-and-reminders.page
@@ -3002,12 +3013,13 @@ share/help/gl/evolution/figures/html-composer-insert-link.png
share/help/gl/evolution/figures/html-composer-insert-rule.png
share/help/gl/evolution/figures/html-composer-insert-table.png
share/help/gl/evolution/figures/minus-icon.png
-share/help/gl/evolution/figures/new-mail-notification.png
share/help/gl/evolution/figures/new-mail-switcher.png
share/help/gl/evolution/figures/plus-icon.png
share/help/gl/evolution/figures/search-icon.png
share/help/gl/evolution/figures/window-overview-layers.png
+share/help/gl/evolution/flatpak-limitations.page
share/help/gl/evolution/google-services.page
+share/help/gl/evolution/import-apps-kmail.page
share/help/gl/evolution/import-apps-mozilla.page
share/help/gl/evolution/import-apps-outlook.page
share/help/gl/evolution/import-data.page
@@ -3092,6 +3104,7 @@ share/help/gl/evolution/mail-filters-not-working.page
share/help/gl/evolution/mail-filters.page
share/help/gl/evolution/mail-folders.page
share/help/gl/evolution/mail-follow-up-flag.page
+share/help/gl/evolution/mail-imap-change-send-method.page
share/help/gl/evolution/mail-imap-subscriptions.page
share/help/gl/evolution/mail-labels.page
share/help/gl/evolution/mail-layout-changing.page
@@ -3124,6 +3137,7 @@ share/help/gl/evolution/mail-send-and-receive-manual.page
share/help/gl/evolution/mail-send-and-receive.page
share/help/gl/evolution/mail-sending-options-smtp.page
share/help/gl/evolution/mail-several-pop-accounts.page
+share/help/gl/evolution/mail-sorting-folder-list.page
share/help/gl/evolution/mail-sorting-message-list.page
share/help/gl/evolution/mail-spam-marking.page
share/help/gl/evolution/mail-spam-settings.page
@@ -3158,7 +3172,6 @@ share/help/gl/evolution/tasks-using-several-tasklists.page
share/help/gl/evolution/tasks-webdav.page
share/help/gl/evolution/using-categories.page
share/help/gl/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/gl/evolution/xinclude-mail-account-identity.xml
share/help/gl/evolution/xinclude-searching.xml
share/help/hu/evolution/backup-restore.page
share/help/hu/evolution/calendar-alarms-and-reminders.page
@@ -3229,12 +3242,13 @@ share/help/hu/evolution/figures/html-composer-insert-link.png
share/help/hu/evolution/figures/html-composer-insert-rule.png
share/help/hu/evolution/figures/html-composer-insert-table.png
share/help/hu/evolution/figures/minus-icon.png
-share/help/hu/evolution/figures/new-mail-notification.png
share/help/hu/evolution/figures/new-mail-switcher.png
share/help/hu/evolution/figures/plus-icon.png
share/help/hu/evolution/figures/search-icon.png
share/help/hu/evolution/figures/window-overview-layers.png
+share/help/hu/evolution/flatpak-limitations.page
share/help/hu/evolution/google-services.page
+share/help/hu/evolution/import-apps-kmail.page
share/help/hu/evolution/import-apps-mozilla.page
share/help/hu/evolution/import-apps-outlook.page
share/help/hu/evolution/import-data.page
@@ -3319,6 +3333,7 @@ share/help/hu/evolution/mail-filters-not-working.page
share/help/hu/evolution/mail-filters.page
share/help/hu/evolution/mail-folders.page
share/help/hu/evolution/mail-follow-up-flag.page
+share/help/hu/evolution/mail-imap-change-send-method.page
share/help/hu/evolution/mail-imap-subscriptions.page
share/help/hu/evolution/mail-labels.page
share/help/hu/evolution/mail-layout-changing.page
@@ -3351,6 +3366,7 @@ share/help/hu/evolution/mail-send-and-receive-manual.page
share/help/hu/evolution/mail-send-and-receive.page
share/help/hu/evolution/mail-sending-options-smtp.page
share/help/hu/evolution/mail-several-pop-accounts.page
+share/help/hu/evolution/mail-sorting-folder-list.page
share/help/hu/evolution/mail-sorting-message-list.page
share/help/hu/evolution/mail-spam-marking.page
share/help/hu/evolution/mail-spam-settings.page
@@ -3385,7 +3401,6 @@ share/help/hu/evolution/tasks-using-several-tasklists.page
share/help/hu/evolution/tasks-webdav.page
share/help/hu/evolution/using-categories.page
share/help/hu/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/hu/evolution/xinclude-mail-account-identity.xml
share/help/hu/evolution/xinclude-searching.xml
share/help/mk/evolution/backup-restore.page
share/help/mk/evolution/calendar-alarms-and-reminders.page
@@ -3456,12 +3471,13 @@ share/help/mk/evolution/figures/html-composer-insert-link.png
share/help/mk/evolution/figures/html-composer-insert-rule.png
share/help/mk/evolution/figures/html-composer-insert-table.png
share/help/mk/evolution/figures/minus-icon.png
-share/help/mk/evolution/figures/new-mail-notification.png
share/help/mk/evolution/figures/new-mail-switcher.png
share/help/mk/evolution/figures/plus-icon.png
share/help/mk/evolution/figures/search-icon.png
share/help/mk/evolution/figures/window-overview-layers.png
+share/help/mk/evolution/flatpak-limitations.page
share/help/mk/evolution/google-services.page
+share/help/mk/evolution/import-apps-kmail.page
share/help/mk/evolution/import-apps-mozilla.page
share/help/mk/evolution/import-apps-outlook.page
share/help/mk/evolution/import-data.page
@@ -3546,6 +3562,7 @@ share/help/mk/evolution/mail-filters-not-working.page
share/help/mk/evolution/mail-filters.page
share/help/mk/evolution/mail-folders.page
share/help/mk/evolution/mail-follow-up-flag.page
+share/help/mk/evolution/mail-imap-change-send-method.page
share/help/mk/evolution/mail-imap-subscriptions.page
share/help/mk/evolution/mail-labels.page
share/help/mk/evolution/mail-layout-changing.page
@@ -3578,6 +3595,7 @@ share/help/mk/evolution/mail-send-and-receive-manual.page
share/help/mk/evolution/mail-send-and-receive.page
share/help/mk/evolution/mail-sending-options-smtp.page
share/help/mk/evolution/mail-several-pop-accounts.page
+share/help/mk/evolution/mail-sorting-folder-list.page
share/help/mk/evolution/mail-sorting-message-list.page
share/help/mk/evolution/mail-spam-marking.page
share/help/mk/evolution/mail-spam-settings.page
@@ -3612,7 +3630,6 @@ share/help/mk/evolution/tasks-using-several-tasklists.page
share/help/mk/evolution/tasks-webdav.page
share/help/mk/evolution/using-categories.page
share/help/mk/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/mk/evolution/xinclude-mail-account-identity.xml
share/help/mk/evolution/xinclude-searching.xml
share/help/oc/evolution/backup-restore.page
share/help/oc/evolution/calendar-alarms-and-reminders.page
@@ -3683,12 +3700,13 @@ share/help/oc/evolution/figures/html-composer-insert-link.png
share/help/oc/evolution/figures/html-composer-insert-rule.png
share/help/oc/evolution/figures/html-composer-insert-table.png
share/help/oc/evolution/figures/minus-icon.png
-share/help/oc/evolution/figures/new-mail-notification.png
share/help/oc/evolution/figures/new-mail-switcher.png
share/help/oc/evolution/figures/plus-icon.png
share/help/oc/evolution/figures/search-icon.png
share/help/oc/evolution/figures/window-overview-layers.png
+share/help/oc/evolution/flatpak-limitations.page
share/help/oc/evolution/google-services.page
+share/help/oc/evolution/import-apps-kmail.page
share/help/oc/evolution/import-apps-mozilla.page
share/help/oc/evolution/import-apps-outlook.page
share/help/oc/evolution/import-data.page
@@ -3773,6 +3791,7 @@ share/help/oc/evolution/mail-filters-not-working.page
share/help/oc/evolution/mail-filters.page
share/help/oc/evolution/mail-folders.page
share/help/oc/evolution/mail-follow-up-flag.page
+share/help/oc/evolution/mail-imap-change-send-method.page
share/help/oc/evolution/mail-imap-subscriptions.page
share/help/oc/evolution/mail-labels.page
share/help/oc/evolution/mail-layout-changing.page
@@ -3805,6 +3824,7 @@ share/help/oc/evolution/mail-send-and-receive-manual.page
share/help/oc/evolution/mail-send-and-receive.page
share/help/oc/evolution/mail-sending-options-smtp.page
share/help/oc/evolution/mail-several-pop-accounts.page
+share/help/oc/evolution/mail-sorting-folder-list.page
share/help/oc/evolution/mail-sorting-message-list.page
share/help/oc/evolution/mail-spam-marking.page
share/help/oc/evolution/mail-spam-settings.page
@@ -3839,7 +3859,6 @@ share/help/oc/evolution/tasks-using-several-tasklists.page
share/help/oc/evolution/tasks-webdav.page
share/help/oc/evolution/using-categories.page
share/help/oc/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/oc/evolution/xinclude-mail-account-identity.xml
share/help/oc/evolution/xinclude-searching.xml
share/help/ru/evolution/backup-restore.page
share/help/ru/evolution/calendar-alarms-and-reminders.page
@@ -3910,12 +3929,13 @@ share/help/ru/evolution/figures/html-composer-insert-link.png
share/help/ru/evolution/figures/html-composer-insert-rule.png
share/help/ru/evolution/figures/html-composer-insert-table.png
share/help/ru/evolution/figures/minus-icon.png
-share/help/ru/evolution/figures/new-mail-notification.png
share/help/ru/evolution/figures/new-mail-switcher.png
share/help/ru/evolution/figures/plus-icon.png
share/help/ru/evolution/figures/search-icon.png
share/help/ru/evolution/figures/window-overview-layers.png
+share/help/ru/evolution/flatpak-limitations.page
share/help/ru/evolution/google-services.page
+share/help/ru/evolution/import-apps-kmail.page
share/help/ru/evolution/import-apps-mozilla.page
share/help/ru/evolution/import-apps-outlook.page
share/help/ru/evolution/import-data.page
@@ -4000,6 +4020,7 @@ share/help/ru/evolution/mail-filters-not-working.page
share/help/ru/evolution/mail-filters.page
share/help/ru/evolution/mail-folders.page
share/help/ru/evolution/mail-follow-up-flag.page
+share/help/ru/evolution/mail-imap-change-send-method.page
share/help/ru/evolution/mail-imap-subscriptions.page
share/help/ru/evolution/mail-labels.page
share/help/ru/evolution/mail-layout-changing.page
@@ -4032,6 +4053,7 @@ share/help/ru/evolution/mail-send-and-receive-manual.page
share/help/ru/evolution/mail-send-and-receive.page
share/help/ru/evolution/mail-sending-options-smtp.page
share/help/ru/evolution/mail-several-pop-accounts.page
+share/help/ru/evolution/mail-sorting-folder-list.page
share/help/ru/evolution/mail-sorting-message-list.page
share/help/ru/evolution/mail-spam-marking.page
share/help/ru/evolution/mail-spam-settings.page
@@ -4066,7 +4088,6 @@ share/help/ru/evolution/tasks-using-several-tasklists.page
share/help/ru/evolution/tasks-webdav.page
share/help/ru/evolution/using-categories.page
share/help/ru/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/ru/evolution/xinclude-mail-account-identity.xml
share/help/ru/evolution/xinclude-searching.xml
share/help/sl/evolution/backup-restore.page
share/help/sl/evolution/calendar-alarms-and-reminders.page
@@ -4137,12 +4158,13 @@ share/help/sl/evolution/figures/html-composer-insert-link.png
share/help/sl/evolution/figures/html-composer-insert-rule.png
share/help/sl/evolution/figures/html-composer-insert-table.png
share/help/sl/evolution/figures/minus-icon.png
-share/help/sl/evolution/figures/new-mail-notification.png
share/help/sl/evolution/figures/new-mail-switcher.png
share/help/sl/evolution/figures/plus-icon.png
share/help/sl/evolution/figures/search-icon.png
share/help/sl/evolution/figures/window-overview-layers.png
+share/help/sl/evolution/flatpak-limitations.page
share/help/sl/evolution/google-services.page
+share/help/sl/evolution/import-apps-kmail.page
share/help/sl/evolution/import-apps-mozilla.page
share/help/sl/evolution/import-apps-outlook.page
share/help/sl/evolution/import-data.page
@@ -4227,6 +4249,7 @@ share/help/sl/evolution/mail-filters-not-working.page
share/help/sl/evolution/mail-filters.page
share/help/sl/evolution/mail-folders.page
share/help/sl/evolution/mail-follow-up-flag.page
+share/help/sl/evolution/mail-imap-change-send-method.page
share/help/sl/evolution/mail-imap-subscriptions.page
share/help/sl/evolution/mail-labels.page
share/help/sl/evolution/mail-layout-changing.page
@@ -4259,6 +4282,7 @@ share/help/sl/evolution/mail-send-and-receive-manual.page
share/help/sl/evolution/mail-send-and-receive.page
share/help/sl/evolution/mail-sending-options-smtp.page
share/help/sl/evolution/mail-several-pop-accounts.page
+share/help/sl/evolution/mail-sorting-folder-list.page
share/help/sl/evolution/mail-sorting-message-list.page
share/help/sl/evolution/mail-spam-marking.page
share/help/sl/evolution/mail-spam-settings.page
@@ -4293,7 +4317,6 @@ share/help/sl/evolution/tasks-using-several-tasklists.page
share/help/sl/evolution/tasks-webdav.page
share/help/sl/evolution/using-categories.page
share/help/sl/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/sl/evolution/xinclude-mail-account-identity.xml
share/help/sl/evolution/xinclude-searching.xml
share/help/sv/evolution/backup-restore.page
share/help/sv/evolution/calendar-alarms-and-reminders.page
@@ -4364,12 +4387,13 @@ share/help/sv/evolution/figures/html-composer-insert-link.png
share/help/sv/evolution/figures/html-composer-insert-rule.png
share/help/sv/evolution/figures/html-composer-insert-table.png
share/help/sv/evolution/figures/minus-icon.png
-share/help/sv/evolution/figures/new-mail-notification.png
share/help/sv/evolution/figures/new-mail-switcher.png
share/help/sv/evolution/figures/plus-icon.png
share/help/sv/evolution/figures/search-icon.png
share/help/sv/evolution/figures/window-overview-layers.png
+share/help/sv/evolution/flatpak-limitations.page
share/help/sv/evolution/google-services.page
+share/help/sv/evolution/import-apps-kmail.page
share/help/sv/evolution/import-apps-mozilla.page
share/help/sv/evolution/import-apps-outlook.page
share/help/sv/evolution/import-data.page
@@ -4454,6 +4478,7 @@ share/help/sv/evolution/mail-filters-not-working.page
share/help/sv/evolution/mail-filters.page
share/help/sv/evolution/mail-folders.page
share/help/sv/evolution/mail-follow-up-flag.page
+share/help/sv/evolution/mail-imap-change-send-method.page
share/help/sv/evolution/mail-imap-subscriptions.page
share/help/sv/evolution/mail-labels.page
share/help/sv/evolution/mail-layout-changing.page
@@ -4486,6 +4511,7 @@ share/help/sv/evolution/mail-send-and-receive-manual.page
share/help/sv/evolution/mail-send-and-receive.page
share/help/sv/evolution/mail-sending-options-smtp.page
share/help/sv/evolution/mail-several-pop-accounts.page
+share/help/sv/evolution/mail-sorting-folder-list.page
share/help/sv/evolution/mail-sorting-message-list.page
share/help/sv/evolution/mail-spam-marking.page
share/help/sv/evolution/mail-spam-settings.page
@@ -4520,7 +4546,6 @@ share/help/sv/evolution/tasks-using-several-tasklists.page
share/help/sv/evolution/tasks-webdav.page
share/help/sv/evolution/using-categories.page
share/help/sv/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/sv/evolution/xinclude-mail-account-identity.xml
share/help/sv/evolution/xinclude-searching.xml
share/help/te/evolution/backup-restore.page
share/help/te/evolution/calendar-alarms-and-reminders.page
@@ -4591,12 +4616,13 @@ share/help/te/evolution/figures/html-composer-insert-link.png
share/help/te/evolution/figures/html-composer-insert-rule.png
share/help/te/evolution/figures/html-composer-insert-table.png
share/help/te/evolution/figures/minus-icon.png
-share/help/te/evolution/figures/new-mail-notification.png
share/help/te/evolution/figures/new-mail-switcher.png
share/help/te/evolution/figures/plus-icon.png
share/help/te/evolution/figures/search-icon.png
share/help/te/evolution/figures/window-overview-layers.png
+share/help/te/evolution/flatpak-limitations.page
share/help/te/evolution/google-services.page
+share/help/te/evolution/import-apps-kmail.page
share/help/te/evolution/import-apps-mozilla.page
share/help/te/evolution/import-apps-outlook.page
share/help/te/evolution/import-data.page
@@ -4681,6 +4707,7 @@ share/help/te/evolution/mail-filters-not-working.page
share/help/te/evolution/mail-filters.page
share/help/te/evolution/mail-folders.page
share/help/te/evolution/mail-follow-up-flag.page
+share/help/te/evolution/mail-imap-change-send-method.page
share/help/te/evolution/mail-imap-subscriptions.page
share/help/te/evolution/mail-labels.page
share/help/te/evolution/mail-layout-changing.page
@@ -4713,6 +4740,7 @@ share/help/te/evolution/mail-send-and-receive-manual.page
share/help/te/evolution/mail-send-and-receive.page
share/help/te/evolution/mail-sending-options-smtp.page
share/help/te/evolution/mail-several-pop-accounts.page
+share/help/te/evolution/mail-sorting-folder-list.page
share/help/te/evolution/mail-sorting-message-list.page
share/help/te/evolution/mail-spam-marking.page
share/help/te/evolution/mail-spam-settings.page
@@ -4747,8 +4775,236 @@ share/help/te/evolution/tasks-using-several-tasklists.page
share/help/te/evolution/tasks-webdav.page
share/help/te/evolution/using-categories.page
share/help/te/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/te/evolution/xinclude-mail-account-identity.xml
share/help/te/evolution/xinclude-searching.xml
+share/help/uk/evolution/backup-restore.page
+share/help/uk/evolution/calendar-alarms-and-reminders.page
+share/help/uk/evolution/calendar-caldav.page
+share/help/uk/evolution/calendar-classifications.page
+share/help/uk/evolution/calendar-free-busy.page
+share/help/uk/evolution/calendar-google.page
+share/help/uk/evolution/calendar-layout-appointment-display.page
+share/help/uk/evolution/calendar-layout-general-formatting.page
+share/help/uk/evolution/calendar-layout-views.page
+share/help/uk/evolution/calendar-layout.page
+share/help/uk/evolution/calendar-local.page
+share/help/uk/evolution/calendar-marcus-bains-line.page
+share/help/uk/evolution/calendar-meetings-delegating.page
+share/help/uk/evolution/calendar-meetings-replying-to-invitation.page
+share/help/uk/evolution/calendar-meetings-sending-invitation.page
+share/help/uk/evolution/calendar-meetings.page
+share/help/uk/evolution/calendar-organizing.page
+share/help/uk/evolution/calendar-publishing.page
+share/help/uk/evolution/calendar-recurrence.page
+share/help/uk/evolution/calendar-searching.page
+share/help/uk/evolution/calendar-sharing-information.page
+share/help/uk/evolution/calendar-timezones.page
+share/help/uk/evolution/calendar-usage-add-appointment.page
+share/help/uk/evolution/calendar-usage-delete-appointment.page
+share/help/uk/evolution/calendar-usage-edit-appointment.page
+share/help/uk/evolution/calendar-usage.page
+share/help/uk/evolution/calendar-using-several-calendars.page
+share/help/uk/evolution/calendar-weather.page
+share/help/uk/evolution/calendar-webdav.page
+share/help/uk/evolution/contacts-add-automatically.page
+share/help/uk/evolution/contacts-autocompletion.page
+share/help/uk/evolution/contacts-google.page
+share/help/uk/evolution/contacts-ldap.page
+share/help/uk/evolution/contacts-libreoffice.page
+share/help/uk/evolution/contacts-local.page
+share/help/uk/evolution/contacts-organizing.page
+share/help/uk/evolution/contacts-searching.page
+share/help/uk/evolution/contacts-usage-add-contact.page
+share/help/uk/evolution/contacts-usage-delete-contact.page
+share/help/uk/evolution/contacts-usage-edit-contact.page
+share/help/uk/evolution/contacts-usage.page
+share/help/uk/evolution/contacts-using-contact-lists.page
+share/help/uk/evolution/contacts-using-several-addressbooks.page
+share/help/uk/evolution/credits.page
+share/help/uk/evolution/customize-ui-items.page
+share/help/uk/evolution/data-storage.page
+share/help/uk/evolution/default-browser.page
+share/help/uk/evolution/deleting-appointments.page
+share/help/uk/evolution/deleting-emails.page
+share/help/uk/evolution/deleting-to-free-disk-space.page
+share/help/uk/evolution/exporting-data-calendar.page
+share/help/uk/evolution/exporting-data-contacts.page
+share/help/uk/evolution/exporting-data-mail.page
+share/help/uk/evolution/exporting-data.page
+share/help/uk/evolution/figures/color-000000.png
+share/help/uk/evolution/figures/color-204a87.png
+share/help/uk/evolution/figures/color-2e3436.png
+share/help/uk/evolution/figures/color-4e9a06.png
+share/help/uk/evolution/figures/color-5c3566.png
+share/help/uk/evolution/figures/color-8f5902.png
+share/help/uk/evolution/figures/color-a40000.png
+share/help/uk/evolution/figures/color-c4a000.png
+share/help/uk/evolution/figures/color-ce5c00.png
+share/help/uk/evolution/figures/evolutionlogo.png
+share/help/uk/evolution/figures/html-composer-insert-image.png
+share/help/uk/evolution/figures/html-composer-insert-link.png
+share/help/uk/evolution/figures/html-composer-insert-rule.png
+share/help/uk/evolution/figures/html-composer-insert-table.png
+share/help/uk/evolution/figures/minus-icon.png
+share/help/uk/evolution/figures/new-mail-switcher.png
+share/help/uk/evolution/figures/plus-icon.png
+share/help/uk/evolution/figures/search-icon.png
+share/help/uk/evolution/figures/window-overview-layers.png
+share/help/uk/evolution/flatpak-limitations.page
+share/help/uk/evolution/google-services.page
+share/help/uk/evolution/import-apps-kmail.page
+share/help/uk/evolution/import-apps-mozilla.page
+share/help/uk/evolution/import-apps-outlook.page
+share/help/uk/evolution/import-data.page
+share/help/uk/evolution/import-single-files.page
+share/help/uk/evolution/import-supported-file-formats.page
+share/help/uk/evolution/index.page
+share/help/uk/evolution/intro-application.page
+share/help/uk/evolution/intro-first-run.page
+share/help/uk/evolution/intro-keyboard-shortcuts.page
+share/help/uk/evolution/intro-main-window.page
+share/help/uk/evolution/legal.xml
+share/help/uk/evolution/mail-access-gmail-imap-account.page
+share/help/uk/evolution/mail-access-gmail-pop-account.page
+share/help/uk/evolution/mail-account-manage-imap-plus.page
+share/help/uk/evolution/mail-account-manage-local-delivery.page
+share/help/uk/evolution/mail-account-manage-maildir-format-directories.page
+share/help/uk/evolution/mail-account-manage-mh-format-directories.page
+share/help/uk/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
+share/help/uk/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
+share/help/uk/evolution/mail-account-manage-microsoft-exchange.page
+share/help/uk/evolution/mail-account-manage-pop.page
+share/help/uk/evolution/mail-account-manage-unix-mbox-spool-directory.page
+share/help/uk/evolution/mail-account-manage-unix-mbox-spool-file.page
+share/help/uk/evolution/mail-account-manage-usenet-news.page
+share/help/uk/evolution/mail-account-management.page
+share/help/uk/evolution/mail-attachments-received.page
+share/help/uk/evolution/mail-attachments-sending.page
+share/help/uk/evolution/mail-attachments.page
+share/help/uk/evolution/mail-calendar-sending-invitations.page
+share/help/uk/evolution/mail-cannot-see.page
+share/help/uk/evolution/mail-change-columns-in-message-list.page
+share/help/uk/evolution/mail-change-time-format.page
+share/help/uk/evolution/mail-composer-change-quotation-string.page
+share/help/uk/evolution/mail-composer-custom-header-lines.page
+share/help/uk/evolution/mail-composer-enable-html-format.page
+share/help/uk/evolution/mail-composer-external-editor.page
+share/help/uk/evolution/mail-composer-forward-as-attachment.page
+share/help/uk/evolution/mail-composer-forward.page
+share/help/uk/evolution/mail-composer-from-field-override.page
+share/help/uk/evolution/mail-composer-html-image.page
+share/help/uk/evolution/mail-composer-html-link.page
+share/help/uk/evolution/mail-composer-html-rule.page
+share/help/uk/evolution/mail-composer-html-table.page
+share/help/uk/evolution/mail-composer-html-text.page
+share/help/uk/evolution/mail-composer-html.page
+share/help/uk/evolution/mail-composer-mail-signatures-manage.page
+share/help/uk/evolution/mail-composer-mail-signatures-per-account.page
+share/help/uk/evolution/mail-composer-mail-signatures.page
+share/help/uk/evolution/mail-composer-message-templates-reply.page
+share/help/uk/evolution/mail-composer-message-templates-save.page
+share/help/uk/evolution/mail-composer-message-templates-variables.page
+share/help/uk/evolution/mail-composer-message-templates.page
+share/help/uk/evolution/mail-composer-plain-text.page
+share/help/uk/evolution/mail-composer-priority.page
+share/help/uk/evolution/mail-composer-reply.page
+share/help/uk/evolution/mail-composer-search.page
+share/help/uk/evolution/mail-composer-send-account-overrides.page
+share/help/uk/evolution/mail-composer-several-recipients.page
+share/help/uk/evolution/mail-composer-spellcheck.page
+share/help/uk/evolution/mail-composer-write-new-message.page
+share/help/uk/evolution/mail-default-CC-and-BCC.page
+share/help/uk/evolution/mail-default-folder-locations.page
+share/help/uk/evolution/mail-delete-and-undelete.page
+share/help/uk/evolution/mail-display-message-source.page
+share/help/uk/evolution/mail-displaying-character-encodings.page
+share/help/uk/evolution/mail-displaying-collapsible-headers.page
+share/help/uk/evolution/mail-displaying-images-in-html.page
+share/help/uk/evolution/mail-displaying-message.page
+share/help/uk/evolution/mail-displaying-sender-photograph.page
+share/help/uk/evolution/mail-duplicates.page
+share/help/uk/evolution/mail-encryption-gpg-create-key.page
+share/help/uk/evolution/mail-encryption-gpg-decrypting.page
+share/help/uk/evolution/mail-encryption-gpg-getting-keys.page
+share/help/uk/evolution/mail-encryption-gpg-set-up.page
+share/help/uk/evolution/mail-encryption-gpg-signing-encrypting.page
+share/help/uk/evolution/mail-encryption-s-mime-manage.page
+share/help/uk/evolution/mail-encryption-s-mime-signing-encrypting.page
+share/help/uk/evolution/mail-encryption.page
+share/help/uk/evolution/mail-filters-actions.page
+share/help/uk/evolution/mail-filters-conditions.page
+share/help/uk/evolution/mail-filters-not-working.page
+share/help/uk/evolution/mail-filters.page
+share/help/uk/evolution/mail-folders.page
+share/help/uk/evolution/mail-follow-up-flag.page
+share/help/uk/evolution/mail-imap-change-send-method.page
+share/help/uk/evolution/mail-imap-subscriptions.page
+share/help/uk/evolution/mail-labels.page
+share/help/uk/evolution/mail-layout-changing.page
+share/help/uk/evolution/mail-localized-re-subjects.page
+share/help/uk/evolution/mail-moving-emails.page
+share/help/uk/evolution/mail-not-sent.page
+share/help/uk/evolution/mail-organizing.page
+share/help/uk/evolution/mail-read-receipts.page
+share/help/uk/evolution/mail-received-notification.page
+share/help/uk/evolution/mail-receiving-options-exchange-ews.page
+share/help/uk/evolution/mail-receiving-options-exchange-mapi.page
+share/help/uk/evolution/mail-receiving-options-imap-plus.page
+share/help/uk/evolution/mail-receiving-options-local-delivery.page
+share/help/uk/evolution/mail-receiving-options-maildir-format-directories.page
+share/help/uk/evolution/mail-receiving-options-mh-format-directories.page
+share/help/uk/evolution/mail-receiving-options-pop.page
+share/help/uk/evolution/mail-receiving-options-unix-mbox-spool-directory.page
+share/help/uk/evolution/mail-receiving-options-unix-mbox-spool-file.page
+share/help/uk/evolution/mail-receiving-options-usenet-news.page
+share/help/uk/evolution/mail-receiving-options.page
+share/help/uk/evolution/mail-refresh-folders.page
+share/help/uk/evolution/mail-save-as-pdf.page
+share/help/uk/evolution/mail-search-folders-add.page
+share/help/uk/evolution/mail-search-folders-conditions.page
+share/help/uk/evolution/mail-search-folders.page
+share/help/uk/evolution/mail-searching-attachment-type.page
+share/help/uk/evolution/mail-searching.page
+share/help/uk/evolution/mail-send-and-receive-automatically.page
+share/help/uk/evolution/mail-send-and-receive-manual.page
+share/help/uk/evolution/mail-send-and-receive.page
+share/help/uk/evolution/mail-sending-options-smtp.page
+share/help/uk/evolution/mail-several-pop-accounts.page
+share/help/uk/evolution/mail-sorting-folder-list.page
+share/help/uk/evolution/mail-sorting-message-list.page
+share/help/uk/evolution/mail-spam-marking.page
+share/help/uk/evolution/mail-spam-settings.page
+share/help/uk/evolution/mail-spam.page
+share/help/uk/evolution/mail-two-trash-folders.page
+share/help/uk/evolution/mail-usenet-subscriptions.page
+share/help/uk/evolution/mail-vertical-view.page
+share/help/uk/evolution/mail-word-wrap.page
+share/help/uk/evolution/mail-working-offline.page
+share/help/uk/evolution/memos-searching.page
+share/help/uk/evolution/memos-usage-add-memo.page
+share/help/uk/evolution/memos-usage-delete-memo.page
+share/help/uk/evolution/memos-usage-edit-memo.page
+share/help/uk/evolution/memos-usage.page
+share/help/uk/evolution/offline.page
+share/help/uk/evolution/organizing.page
+share/help/uk/evolution/problems-debug-how-to.page
+share/help/uk/evolution/problems-getting-help.page
+share/help/uk/evolution/problems-reporting-bugs.page
+share/help/uk/evolution/searching-items.page
+share/help/uk/evolution/sync-with-other-devices.page
+share/help/uk/evolution/tasks-caldav.page
+share/help/uk/evolution/tasks-display-settings.page
+share/help/uk/evolution/tasks-local.page
+share/help/uk/evolution/tasks-organizing.page
+share/help/uk/evolution/tasks-searching.page
+share/help/uk/evolution/tasks-usage-add-task.page
+share/help/uk/evolution/tasks-usage-delete-task.page
+share/help/uk/evolution/tasks-usage-edit-task.page
+share/help/uk/evolution/tasks-usage.page
+share/help/uk/evolution/tasks-using-several-tasklists.page
+share/help/uk/evolution/tasks-webdav.page
+share/help/uk/evolution/using-categories.page
+share/help/uk/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/uk/evolution/xinclude-searching.xml
share/help/zh_CN/evolution/backup-restore.page
share/help/zh_CN/evolution/calendar-alarms-and-reminders.page
share/help/zh_CN/evolution/calendar-caldav.page
@@ -4818,12 +5074,13 @@ share/help/zh_CN/evolution/figures/html-composer-insert-link.png
share/help/zh_CN/evolution/figures/html-composer-insert-rule.png
share/help/zh_CN/evolution/figures/html-composer-insert-table.png
share/help/zh_CN/evolution/figures/minus-icon.png
-share/help/zh_CN/evolution/figures/new-mail-notification.png
share/help/zh_CN/evolution/figures/new-mail-switcher.png
share/help/zh_CN/evolution/figures/plus-icon.png
share/help/zh_CN/evolution/figures/search-icon.png
share/help/zh_CN/evolution/figures/window-overview-layers.png
+share/help/zh_CN/evolution/flatpak-limitations.page
share/help/zh_CN/evolution/google-services.page
+share/help/zh_CN/evolution/import-apps-kmail.page
share/help/zh_CN/evolution/import-apps-mozilla.page
share/help/zh_CN/evolution/import-apps-outlook.page
share/help/zh_CN/evolution/import-data.page
@@ -4908,6 +5165,7 @@ share/help/zh_CN/evolution/mail-filters-not-working.page
share/help/zh_CN/evolution/mail-filters.page
share/help/zh_CN/evolution/mail-folders.page
share/help/zh_CN/evolution/mail-follow-up-flag.page
+share/help/zh_CN/evolution/mail-imap-change-send-method.page
share/help/zh_CN/evolution/mail-imap-subscriptions.page
share/help/zh_CN/evolution/mail-labels.page
share/help/zh_CN/evolution/mail-layout-changing.page
@@ -4940,6 +5198,7 @@ share/help/zh_CN/evolution/mail-send-and-receive-manual.page
share/help/zh_CN/evolution/mail-send-and-receive.page
share/help/zh_CN/evolution/mail-sending-options-smtp.page
share/help/zh_CN/evolution/mail-several-pop-accounts.page
+share/help/zh_CN/evolution/mail-sorting-folder-list.page
share/help/zh_CN/evolution/mail-sorting-message-list.page
share/help/zh_CN/evolution/mail-spam-marking.page
share/help/zh_CN/evolution/mail-spam-settings.page
@@ -4974,29 +5233,23 @@ share/help/zh_CN/evolution/tasks-using-several-tasklists.page
share/help/zh_CN/evolution/tasks-webdav.page
share/help/zh_CN/evolution/using-categories.page
share/help/zh_CN/evolution/xinclude-filter-vfolder-conditions.xml
-share/help/zh_CN/evolution/xinclude-mail-account-identity.xml
share/help/zh_CN/evolution/xinclude-searching.xml
share/icons/hicolor/16x16/apps/evolution-mail.png
share/icons/hicolor/16x16/apps/evolution-memos.png
share/icons/hicolor/16x16/apps/evolution-tasks.png
-share/icons/hicolor/16x16/apps/evolution.png
share/icons/hicolor/22x22/apps/evolution-mail.png
share/icons/hicolor/22x22/apps/evolution-memos.png
share/icons/hicolor/22x22/apps/evolution-tasks.png
-share/icons/hicolor/22x22/apps/evolution.png
share/icons/hicolor/24x24/apps/evolution-mail.png
share/icons/hicolor/24x24/apps/evolution-memos.png
share/icons/hicolor/24x24/apps/evolution-tasks.png
-share/icons/hicolor/24x24/apps/evolution.png
-share/icons/hicolor/256x256/apps/evolution.png
share/icons/hicolor/32x32/apps/evolution-mail.png
share/icons/hicolor/32x32/apps/evolution-memos.png
share/icons/hicolor/32x32/apps/evolution-tasks.png
-share/icons/hicolor/32x32/apps/evolution.png
share/icons/hicolor/48x48/apps/evolution-mail.png
share/icons/hicolor/48x48/apps/evolution-memos.png
share/icons/hicolor/48x48/apps/evolution-tasks.png
-share/icons/hicolor/48x48/apps/evolution.png
+share/icons/hicolor/scalable/apps/evolution.svg
share/icons/hicolor/symbolic/apps/evolution-symbolic.svg
share/locale/af/LC_MESSAGES/evolution.mo
share/locale/am/LC_MESSAGES/evolution.mo
@@ -5014,6 +5267,7 @@ share/locale/br/LC_MESSAGES/evolution.mo
share/locale/bs/LC_MESSAGES/evolution.mo
share/locale/ca/LC_MESSAGES/evolution.mo
share/locale/ca@valencia/LC_MESSAGES/evolution.mo
+share/locale/ckb/LC_MESSAGES/evolution.mo
share/locale/cs/LC_MESSAGES/evolution.mo
share/locale/cy/LC_MESSAGES/evolution.mo
share/locale/da/LC_MESSAGES/evolution.mo
@@ -5091,6 +5345,7 @@ share/locale/xh/LC_MESSAGES/evolution.mo
share/locale/zh_CN/LC_MESSAGES/evolution.mo
share/locale/zh_HK/LC_MESSAGES/evolution.mo
share/locale/zh_TW/LC_MESSAGES/evolution.mo
+share/man/man1/evolution.1.gz
%%BOGOFILTER%%share/metainfo/org.gnome.Evolution-bogofilter.metainfo.xml
%%PST%%share/metainfo/org.gnome.Evolution-pst.metainfo.xml
%%SPAMASSASSIN%%share/metainfo/org.gnome.Evolution-spamassassin.metainfo.xml
diff --git a/mail/mailagent/pkg-plist b/mail/mailagent/pkg-plist
index a55b1a4e0146..ab9fb8536618 100644
--- a/mail/mailagent/pkg-plist
+++ b/mail/mailagent/pkg-plist
@@ -34,8 +34,8 @@ man/man1/edusers.1.gz
man/man1/mailagent.1.gz
man/man1/mailhelp.1.gz
man/man1/package.1.gz
-@exec [ -f %%ORGFILE%% ] || touch %%ORGFILE%% || true
-@unexec [ -s %%ORGFILE%% ] || rm -f %%ORGFILE%% || true
+@touch %%ORGFILE%%
+@rmempty %%ORGFILE%%
%%EXAMPLESDIR%%/agent/README
%%EXAMPLESDIR%%/agent/daemon
%%EXAMPLESDIR%%/agent/mailfolders
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index 74d2bffad472..e035c2336e3c 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= cheese
-PORTVERSION= 3.28.0
+PORTVERSION= 3.38.0
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Photobooth-inspired app for taking pictures and videos from webcam
@@ -29,36 +29,19 @@ RUN_DEPENDS= gnome-video-effects>=0:graphics/gnome-video-effects
PORTSCOUT= limitw:1,even
-USES= gettext gl gmake gnome libtool localbase pathfix \
- pkgconfig tar:xz xorg
-USE_GNOME= cairo intlhack evolutiondataserver3 librsvg2 \
+USES= gettext gl gnome localbase:ldflags pkgconfig meson tar:xz xorg
+USE_GNOME= cairo evolutiondataserver3 librsvg2 \
gnomedesktop3 libxml2:build introspection:build
USE_GL= egl
USE_XORG= xi xext xdamage xfixes xcomposite xrandr xxf86vm x11
USE_GSTREAMER1= bad good jpeg ogg theora v4l2 vorbis vpx
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
CPPFLAGS+= -Wno-format-nonliteral
-INSTALL_TARGET= install-strip
-DOCS= AUTHORS COPYING ChangeLog NEWS README
-GLIB_SCHEMAS= org.gnome.Cheese.gschema.xml
-
-OPTIONS_SUB= yes
-OPTIONS_DEFINE= MANPAGES DOCS
-OPTIONS_DEFAULT=MANPAGES
+MESON_ARGS= -Dgtk_doc=false \
+ -Dman=false
-MANPAGES_CONFIGURE_ENABLE= man
-MANPAGES_CONFIGURE_WITH= xml-catalog=${LOCALBASE}/share/xml/catalog
-MANPAGES_BUILD_DEPENDS= docbook-xml>=0:textproc/docbook-xml \
- docbook-xsl>=0:textproc/docbook-xsl
-MANPAGES_USE= GNOME=libxslt:build
-
-post-install:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
+GLIB_SCHEMAS= org.gnome.Cheese.gschema.xml
.include <bsd.port.mk>
diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo
index 9a6f5baf26bc..440050fda5ec 100644
--- a/multimedia/cheese/distinfo
+++ b/multimedia/cheese/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524943812
-SHA256 (gnome3/cheese-3.28.0.tar.xz) = 5c1e7a2e1fccc1b0c7b636fb03f2ae83862e2feaebadb94be37c3758182eaa19
-SIZE (gnome3/cheese-3.28.0.tar.xz) = 1544904
+TIMESTAMP = 1601310668
+SHA256 (gnome/cheese-3.38.0.tar.xz) = 88d2732b421b903110a2628db25c0d61e219c42bdfb5971151033fba95a8d16f
+SIZE (gnome/cheese-3.38.0.tar.xz) = 1086428
diff --git a/multimedia/cheese/files/patch-config.h.in b/multimedia/cheese/files/patch-config.h.in
deleted file mode 100644
index 2ca7d26631f4..000000000000
--- a/multimedia/cheese/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig 2014-10-20 08:03:47.398635920 +0200
-+++ config.h.in 2014-10-20 08:03:55.769637288 +0200
-@@ -6,6 +6,9 @@
- /* Define to 1 if you have the <dlfcn.h> header file. */
- #undef HAVE_DLFCN_H
-
-+/* Enable hal support */
-+#undef HAVE_HAL
-+
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
-
diff --git a/multimedia/cheese/pkg-plist b/multimedia/cheese/pkg-plist
index 08971df083e2..c6ed29950427 100644
--- a/multimedia/cheese/pkg-plist
+++ b/multimedia/cheese/pkg-plist
@@ -12,52 +12,15 @@ include/cheese/cheese.h
lib/girepository-1.0/Cheese-3.0.typelib
lib/libcheese-gtk.so
lib/libcheese-gtk.so.25
-lib/libcheese-gtk.so.25.1.0
+lib/libcheese-gtk.so.25.1.5
lib/libcheese.so
lib/libcheese.so.8
-lib/libcheese.so.8.0.10
+lib/libcheese.so.8.0.15
libdata/pkgconfig/cheese-gtk.pc
libdata/pkgconfig/cheese.pc
-%%MANPAGES%%man/man1/cheese.1.gz
-share/appdata/org.gnome.Cheese.appdata.xml
share/applications/org.gnome.Cheese.desktop
share/dbus-1/services/org.gnome.Cheese.service
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
share/gir-1.0/Cheese-3.0.gir
-share/gtk-doc/html/cheese/CheeseAvatarChooser.html
-share/gtk-doc/html/cheese/CheeseAvatarWidget.html
-share/gtk-doc/html/cheese/CheeseCamera.html
-share/gtk-doc/html/cheese/CheeseCameraDevice.html
-share/gtk-doc/html/cheese/CheeseCameraDeviceMonitor.html
-share/gtk-doc/html/cheese/CheeseEffect.html
-share/gtk-doc/html/cheese/CheeseFileUtil.html
-share/gtk-doc/html/cheese/CheeseFlash.html
-share/gtk-doc/html/cheese/CheeseWidget.html
-share/gtk-doc/html/cheese/annotation-glossary.html
-share/gtk-doc/html/cheese/api-index-full.html
-share/gtk-doc/html/cheese/cheese-Initializing-libcheese-gtk.html
-share/gtk-doc/html/cheese/cheese-Initializing-libcheese.html
-share/gtk-doc/html/cheese/cheese-overview.html
-share/gtk-doc/html/cheese/cheese.devhelp2
-share/gtk-doc/html/cheese/cheese.html
-share/gtk-doc/html/cheese/cheese_architecture.png
-share/gtk-doc/html/cheese/home.png
-share/gtk-doc/html/cheese/index.html
-share/gtk-doc/html/cheese/left-insensitive.png
-share/gtk-doc/html/cheese/left.png
-share/gtk-doc/html/cheese/libcheese-gtk.html
-share/gtk-doc/html/cheese/libcheese.html
-share/gtk-doc/html/cheese/object-tree.html
-share/gtk-doc/html/cheese/right-insensitive.png
-share/gtk-doc/html/cheese/right.png
-share/gtk-doc/html/cheese/running-cheese.html
-share/gtk-doc/html/cheese/style.css
-share/gtk-doc/html/cheese/up-insensitive.png
-share/gtk-doc/html/cheese/up.png
share/help/C/cheese/burst-mode.page
share/help/C/cheese/effects-apply.page
share/help/C/cheese/figures/cheese.png
@@ -112,6 +75,24 @@ share/help/cs/cheese/pref-fullscreen.page
share/help/cs/cheese/pref-image-properties.page
share/help/cs/cheese/pref-resolution.page
share/help/cs/cheese/video-record.page
+share/help/da/cheese/burst-mode.page
+share/help/da/cheese/effects-apply.page
+share/help/da/cheese/figures/cheese.png
+share/help/da/cheese/figures/effects.png
+share/help/da/cheese/figures/image-properties.png
+share/help/da/cheese/index.page
+share/help/da/cheese/introduction.page
+share/help/da/cheese/legal.xml
+share/help/da/cheese/photo-delete.page
+share/help/da/cheese/photo-save.page
+share/help/da/cheese/photo-take.page
+share/help/da/cheese/photo-view.page
+share/help/da/cheese/pref-countdown.page
+share/help/da/cheese/pref-flash.page
+share/help/da/cheese/pref-fullscreen.page
+share/help/da/cheese/pref-image-properties.page
+share/help/da/cheese/pref-resolution.page
+share/help/da/cheese/video-record.page
share/help/de/cheese/burst-mode.page
share/help/de/cheese/effects-apply.page
share/help/de/cheese/figures/cheese.png
@@ -382,6 +363,24 @@ share/help/sv/cheese/pref-fullscreen.page
share/help/sv/cheese/pref-image-properties.page
share/help/sv/cheese/pref-resolution.page
share/help/sv/cheese/video-record.page
+share/help/uk/cheese/burst-mode.page
+share/help/uk/cheese/effects-apply.page
+share/help/uk/cheese/figures/cheese.png
+share/help/uk/cheese/figures/effects.png
+share/help/uk/cheese/figures/image-properties.png
+share/help/uk/cheese/index.page
+share/help/uk/cheese/introduction.page
+share/help/uk/cheese/legal.xml
+share/help/uk/cheese/photo-delete.page
+share/help/uk/cheese/photo-save.page
+share/help/uk/cheese/photo-take.page
+share/help/uk/cheese/photo-view.page
+share/help/uk/cheese/pref-countdown.page
+share/help/uk/cheese/pref-flash.page
+share/help/uk/cheese/pref-fullscreen.page
+share/help/uk/cheese/pref-image-properties.page
+share/help/uk/cheese/pref-resolution.page
+share/help/uk/cheese/video-record.page
share/help/zh_CN/cheese/burst-mode.page
share/help/zh_CN/cheese/effects-apply.page
share/help/zh_CN/cheese/figures/cheese.png
@@ -400,12 +399,7 @@ share/help/zh_CN/cheese/pref-fullscreen.page
share/help/zh_CN/cheese/pref-image-properties.page
share/help/zh_CN/cheese/pref-resolution.page
share/help/zh_CN/cheese/video-record.page
-share/icons/hicolor/16x16/apps/org.gnome.Cheese.png
-share/icons/hicolor/22x22/apps/org.gnome.Cheese.png
-share/icons/hicolor/24x24/apps/org.gnome.Cheese.png
-share/icons/hicolor/256x256/apps/org.gnome.Cheese.png
-share/icons/hicolor/32x32/apps/org.gnome.Cheese.png
-share/icons/hicolor/48x48/apps/org.gnome.Cheese.png
+share/icons/hicolor/scalable/apps/org.gnome.Cheese.svg
share/icons/hicolor/symbolic/apps/org.gnome.Cheese-symbolic.svg
share/locale/af/LC_MESSAGES/cheese.mo
share/locale/an/LC_MESSAGES/cheese.mo
@@ -420,6 +414,7 @@ share/locale/bn_IN/LC_MESSAGES/cheese.mo
share/locale/bs/LC_MESSAGES/cheese.mo
share/locale/ca/LC_MESSAGES/cheese.mo
share/locale/ca@valencia/LC_MESSAGES/cheese.mo
+share/locale/ckb/LC_MESSAGES/cheese.mo
share/locale/cs/LC_MESSAGES/cheese.mo
share/locale/da/LC_MESSAGES/cheese.mo
share/locale/de/LC_MESSAGES/cheese.mo
@@ -457,6 +452,7 @@ share/locale/lo/LC_MESSAGES/cheese.mo
share/locale/lt/LC_MESSAGES/cheese.mo
share/locale/lv/LC_MESSAGES/cheese.mo
share/locale/mai/LC_MESSAGES/cheese.mo
+share/locale/mjw/LC_MESSAGES/cheese.mo
share/locale/mk/LC_MESSAGES/cheese.mo
share/locale/ml/LC_MESSAGES/cheese.mo
share/locale/mr/LC_MESSAGES/cheese.mo
@@ -494,3 +490,4 @@ share/locale/zh_CN/LC_MESSAGES/cheese.mo
share/locale/zh_HK/LC_MESSAGES/cheese.mo
share/locale/zh_TW/LC_MESSAGES/cheese.mo
share/locale/zu/LC_MESSAGES/cheese.mo
+share/metainfo/org.gnome.Cheese.appdata.xml
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 28f65b6fc630..754adcef0e7c 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -3,7 +3,7 @@
PORTNAME= totem
PORTVERSION= 3.26.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/net-im/farstream/Makefile b/net-im/farstream/Makefile
index da5d0e43dab1..b9584c6fc6e0 100644
--- a/net-im/farstream/Makefile
+++ b/net-im/farstream/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= farstream
-PORTVERSION= 0.2.8
-PORTREVISION= 1
+PORTVERSION= 0.2.9
CATEGORIES= net-im devel
MASTER_SITES= http://freedesktop.org/software/farstream/releases/farstream/
diff --git a/net-im/farstream/distinfo b/net-im/farstream/distinfo
index b25bb84f8236..35317faaec0a 100644
--- a/net-im/farstream/distinfo
+++ b/net-im/farstream/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1576460171
-SHA256 (farstream-0.2.8.tar.gz) = 2b3b9c6b4f64ace8c83e03d1da5c5a2884c1cae10b35471072b574201ab38908
-SIZE (farstream-0.2.8.tar.gz) = 1315548
-SHA256 (11dde55cbaf5179e8e1885cf1483e538a8d5a4a9.patch) = 3f156b4baf70004d74b3489e414367800c24acdb94bcbd315afdd31104d0deb7
-SIZE (11dde55cbaf5179e8e1885cf1483e538a8d5a4a9.patch) = 2164
+TIMESTAMP = 1600374079
+SHA256 (farstream-0.2.9.tar.gz) = cb7d112433cf7c2e37a8ec918fb24f0ea5cb293cfa1002488e431de26482f47b
+SIZE (farstream-0.2.9.tar.gz) = 1334833
diff --git a/net-im/farstream/files/patch-11dde55cbaf5179e8e1885cf1483e538a8d5a4a9 b/net-im/farstream/files/patch-11dde55cbaf5179e8e1885cf1483e538a8d5a4a9
deleted file mode 100644
index 75483f15cb29..000000000000
--- a/net-im/farstream/files/patch-11dde55cbaf5179e8e1885cf1483e538a8d5a4a9
+++ /dev/null
@@ -1,56 +0,0 @@
-From 11dde55cbaf5179e8e1885cf1483e538a8d5a4a9 Mon Sep 17 00:00:00 2001
-From: Jakub Adam <jakub.adam@ktknet.cz>
-Date: Thu, 14 Apr 2016 15:17:50 +0200
-Subject: [PATCH] rtpbitrateadapter: should make no adaption by default
-
-Description of "bitrate" property says 0 (the default value) means
-the element performs no adaption, and so one would assume it would
-remain passive until "bitrate" is set to some nonzero value. However,
-when "bitrate" is left unset, the adapter instead requests video in tiny
-128x96 resolution on its sink pad.
-
-In order for fs_rtp_bitrate_adapter_getcaps() to return peer_caps by
-default, the value of FsRtpBitrateAdapter::bitrate has to be initialized
-to G_MAXUINT.
-
-Also fix the comments to say that MAXUINT is no adaptation.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=99183
----
- gst/fsrtpconference/fs-rtp-bitrate-adapter.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/gst/fsrtpconference/fs-rtp-bitrate-adapter.c b/gst/fsrtpconference/fs-rtp-bitrate-adapter.c
-index e8684fd5..99ea03a0 100644
---- ./gst/fsrtpconference/fs-rtp-bitrate-adapter.c~
-+++ ./gst/fsrtpconference/fs-rtp-bitrate-adapter.c
-@@ -55,6 +55,7 @@ enum
- };
-
- #define PROP_INTERVAL_DEFAULT (10 * GST_SECOND)
-+#define PROP_BITRATE_DEFAULT (G_MAXUINT)
-
- static void fs_rtp_bitrate_adapter_finalize (GObject *object);
- static void fs_rtp_bitrate_adapter_set_property (GObject *object,
-@@ -105,8 +106,8 @@ fs_rtp_bitrate_adapter_class_init (FsRtpBitrateAdapterClass *klass)
- PROP_BITRATE,
- g_param_spec_uint ("bitrate",
- "Bitrate to adapt for",
-- "The bitrate to adapt for (0 means no adaption)",
-- 0, G_MAXUINT, 0,
-+ "The bitrate to adapt for (MAXUINT means no adaption)",
-+ 0, G_MAXUINT, PROP_BITRATE_DEFAULT,
- G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (gobject_class,
-@@ -161,6 +162,7 @@ fs_rtp_bitrate_adapter_init (FsRtpBitrateAdapter *self)
- self->system_clock = gst_system_clock_obtain ();
- self->interval = PROP_INTERVAL_DEFAULT;
-
-+ self->bitrate = PROP_BITRATE_DEFAULT;
- self->last_bitrate = G_MAXUINT;
- }
-
---
-2.22.2
-
diff --git a/net-im/farstream/pkg-plist b/net-im/farstream/pkg-plist
index 03e74061d0ac..0b3579c80bea 100644
--- a/net-im/farstream/pkg-plist
+++ b/net-im/farstream/pkg-plist
@@ -16,19 +16,25 @@ lib/farstream-0.2/libnice-transmitter.so
lib/farstream-0.2/librawudp-transmitter.so
lib/farstream-0.2/libshm-transmitter.so
lib/girepository-1.0/Farstream-0.2.typelib
-lib/gstreamer-1.0/libfsmsnconference.so
lib/gstreamer-1.0/libfsrawconference.so
lib/gstreamer-1.0/libfsrtpconference.so
lib/gstreamer-1.0/libfsrtpxdata.so
lib/gstreamer-1.0/libfsvideoanyrate.so
lib/libfarstream-0.2.so
lib/libfarstream-0.2.so.5
-lib/libfarstream-0.2.so.5.1.0
+lib/libfarstream-0.2.so.5.1.1
libdata/pkgconfig/farstream-0.2.pc
%%DATADIR%%/0.2/fsrawconference/default-element-properties
%%DATADIR%%/0.2/fsrtpconference/default-codec-preferences
%%DATADIR%%/0.2/fsrtpconference/default-element-properties
share/gir-1.0/Farstream-0.2.gir
+share/gtk-doc/html/farstream-libs-0.2/FsConference.html
+share/gtk-doc/html/farstream-libs-0.2/FsElementAddedNotifier.html
+share/gtk-doc/html/farstream-libs-0.2/FsParticipant.html
+share/gtk-doc/html/farstream-libs-0.2/FsSession.html
+share/gtk-doc/html/farstream-libs-0.2/FsStream.html
+share/gtk-doc/html/farstream-libs-0.2/FsStreamTransmitter.html
+share/gtk-doc/html/farstream-libs-0.2/FsTransmitter.html
share/gtk-doc/html/farstream-libs-0.2/ch01.html
share/gtk-doc/html/farstream-libs-0.2/ch02.html
share/gtk-doc/html/farstream-libs-0.2/ch03.html
@@ -40,16 +46,8 @@ share/gtk-doc/html/farstream-libs-0.2/farstream-libs-FsCodec.html
share/gtk-doc/html/farstream-libs-0.2/farstream-libs-FsPlugin.html
share/gtk-doc/html/farstream-libs-0.2/farstream-libs-RTP-Specific-types.html
share/gtk-doc/html/farstream-libs-0.2/farstream-libs-Utility-functions.html
-share/gtk-doc/html/farstream-libs-0.2/FsConference.html
-share/gtk-doc/html/farstream-libs-0.2/FsElementAddedNotifier.html
-share/gtk-doc/html/farstream-libs-0.2/FsParticipant.html
-share/gtk-doc/html/farstream-libs-0.2/FsSession.html
-share/gtk-doc/html/farstream-libs-0.2/FsStream.html
-share/gtk-doc/html/farstream-libs-0.2/FsStreamTransmitter.html
-share/gtk-doc/html/farstream-libs-0.2/FsTransmitter.html
share/gtk-doc/html/farstream-libs-0.2/home.png
share/gtk-doc/html/farstream-libs-0.2/index.html
-share/gtk-doc/html/farstream-libs-0.2/index.sgml
share/gtk-doc/html/farstream-libs-0.2/left-insensitive.png
share/gtk-doc/html/farstream-libs-0.2/left.png
share/gtk-doc/html/farstream-libs-0.2/pt01.html
@@ -59,13 +57,17 @@ share/gtk-doc/html/farstream-libs-0.2/right.png
share/gtk-doc/html/farstream-libs-0.2/style.css
share/gtk-doc/html/farstream-libs-0.2/up-insensitive.png
share/gtk-doc/html/farstream-libs-0.2/up.png
+share/gtk-doc/html/farstream-plugins-0.2/FsRTPXdataDepay.html
+share/gtk-doc/html/farstream-plugins-0.2/FsRTPXdataPay.html
+share/gtk-doc/html/farstream-plugins-0.2/FsRawConference.html
+share/gtk-doc/html/farstream-plugins-0.2/FsRtpConference.html
+share/gtk-doc/html/farstream-plugins-0.2/FsRtpParticipant.html
+share/gtk-doc/html/farstream-plugins-0.2/FsRtpSession.html
+share/gtk-doc/html/farstream-plugins-0.2/FsRtpStream.html
+share/gtk-doc/html/farstream-plugins-0.2/FsVideoanyrate.html
share/gtk-doc/html/farstream-plugins-0.2/ch01.html
share/gtk-doc/html/farstream-plugins-0.2/ch02.html
-share/gtk-doc/html/farstream-plugins-0.2/ch03.html
share/gtk-doc/html/farstream-plugins-0.2/farstream-plugins-0.2.devhelp2
-share/gtk-doc/html/farstream-plugins-0.2/farstream-plugins-FsMsnCamCamRecvConference.html
-share/gtk-doc/html/farstream-plugins-0.2/farstream-plugins-FsMsnSession.html
-share/gtk-doc/html/farstream-plugins-0.2/farstream-plugins-FsMsnStream.html
share/gtk-doc/html/farstream-plugins-0.2/farstream-plugins-FsMulticastStreamTransmitter.html
share/gtk-doc/html/farstream-plugins-0.2/farstream-plugins-FsNiceStreamTransmitter.html
share/gtk-doc/html/farstream-plugins-0.2/farstream-plugins-FsRawParticipant.html
@@ -73,20 +75,8 @@ share/gtk-doc/html/farstream-plugins-0.2/farstream-plugins-FsRawSession.html
share/gtk-doc/html/farstream-plugins-0.2/farstream-plugins-FsRawStream.html
share/gtk-doc/html/farstream-plugins-0.2/farstream-plugins-FsRawUdpStreamTransmitter.html
share/gtk-doc/html/farstream-plugins-0.2/farstream-plugins-FsShmStreamTransmitter.html
-share/gtk-doc/html/farstream-plugins-0.2/FsMsnCamSendConference.html
-share/gtk-doc/html/farstream-plugins-0.2/FsMsnConference.html
-share/gtk-doc/html/farstream-plugins-0.2/FsMsnParticipant.html
-share/gtk-doc/html/farstream-plugins-0.2/FsRawConference.html
-share/gtk-doc/html/farstream-plugins-0.2/FsRtpConference.html
-share/gtk-doc/html/farstream-plugins-0.2/FsRtpParticipant.html
-share/gtk-doc/html/farstream-plugins-0.2/FsRtpSession.html
-share/gtk-doc/html/farstream-plugins-0.2/FsRtpStream.html
-share/gtk-doc/html/farstream-plugins-0.2/FsRTPXdataDepay.html
-share/gtk-doc/html/farstream-plugins-0.2/FsRTPXdataPay.html
-share/gtk-doc/html/farstream-plugins-0.2/FsVideoanyrate.html
share/gtk-doc/html/farstream-plugins-0.2/home.png
share/gtk-doc/html/farstream-plugins-0.2/index.html
-share/gtk-doc/html/farstream-plugins-0.2/index.sgml
share/gtk-doc/html/farstream-plugins-0.2/left-insensitive.png
share/gtk-doc/html/farstream-plugins-0.2/left.png
share/gtk-doc/html/farstream-plugins-0.2/pt01.html
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index 64172ace07f6..6fe6eea39fc9 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= folks
-PORTVERSION= 0.11.4
-PORTREVISION= 3
+PORTVERSION= 0.14.0
CATEGORIES= net-im
MASTER_SITES= GNOME
@@ -13,8 +12,7 @@ COMMENT= Library to aggregates people from multiple sources
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vapigen:lang/vala \
- ${LOCALBASE}/bin/egrep:textproc/gnugrep
+BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libgcr-3.so:security/gcr \
libzeitgeist-2.0.so:sysutils/zeitgeist \
@@ -26,33 +24,25 @@ LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libdbus-glib-1.so:devel/dbus-glib \
libdbus-1.so:devel/dbus
-USES= gettext gmake gnome libtool localbase pathfix pkgconfig \
+USES= gettext gnome localbase meson python:3.5+,build pkgconfig \
readline sqlite tar:xz
USE_GNOME= evolutiondataserver3 intlhack introspection:build
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-bluez-backend \
- --disable-libsocialweb-backend
-CONFIGURE_ENV+= ac_cv_path_EGREP=${LOCALBASE}/bin/egrep
-INSTALL_TARGET= install-strip
+MESON_ARGS= -Dbluez_backend=false
GLIB_SCHEMAS= org.freedesktop.folks.gschema.xml
-PLIST_SUB= LIBVER=25 VERSION=43 LIBVERLONG=25.18.4
+PLIST_SUB= LIBVER=25 LIBVERLONG=25.21.0
+
+BINARY_ALIAS= python3=${PYTHON_CMD}
OPTIONS_SUB= yes
OPTIONS_DEFINE= TRACKER
OPTIONS_DEFAULT=TRACKER
TRACKER_DESC= Tracker backend
-TRACKER_CONFIGURE_ENABLE= tracker-backend
+TRACKER_MESON_TRUE= tracker_backend
TRACKER_LIB_DEPENDS= libtracker-control-2.0.so:sysutils/tracker
-post-patch:
- @${REINPLACE_CMD} -e 's|--fatal-warnings||g' \
- ${WRKSRC}/configure
- # Until after when the bundled gir is updated >= 0.11.4
- @${RM} ${WRKSRC}/backends/tracker/lib/FolksTracker-0.6.gir
-
.include <bsd.port.mk>
diff --git a/net-im/folks/distinfo b/net-im/folks/distinfo
index 68ed7c878fb9..8b2cd5514efe 100644
--- a/net-im/folks/distinfo
+++ b/net-im/folks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515794103
-SHA256 (folks-0.11.4.tar.xz) = a7b03ed30373e29f62fc3e6f498adce2d4909b852608fc2058a02fda9f80189a
-SIZE (folks-0.11.4.tar.xz) = 1972272
+TIMESTAMP = 1601293010
+SHA256 (folks-0.14.0.tar.xz) = d6e778da637d3b33fd9a6b45115e8157d8868211dc08b943d1075b5eb7282bb9
+SIZE (folks-0.14.0.tar.xz) = 520924
diff --git a/net-im/folks/pkg-plist b/net-im/folks/pkg-plist
index 87eb35911ef5..092562ace394 100644
--- a/net-im/folks/pkg-plist
+++ b/net-im/folks/pkg-plist
@@ -3,14 +3,13 @@ bin/folks-inspect
include/folks/folks-dummy.h
include/folks/folks-eds.h
include/folks/folks-telepathy.h
-%%TRACKER%%include/folks/folks-tracker.h
include/folks/folks.h
-lib/folks/%%VERSION%%/backends/dummy/dummy.so
-lib/folks/%%VERSION%%/backends/eds/eds.so
-lib/folks/%%VERSION%%/backends/key-file/key-file.so
-lib/folks/%%VERSION%%/backends/ofono/ofono.so
-lib/folks/%%VERSION%%/backends/telepathy/telepathy.so
-%%TRACKER%%lib/folks/%%VERSION%%/backends/tracker/tracker.so
+lib/folks/46/backends/dummy/dummy.so
+lib/folks/46/backends/eds/eds.so
+lib/folks/46/backends/key-file/key-file.so
+lib/folks/46/backends/ofono/ofono.so
+lib/folks/46/backends/telepathy/telepathy.so
+%%TRACKER%%lib/folks/46/backends/tracker/tracker.so
lib/girepository-1.0/Folks-0.6.typelib
lib/girepository-1.0/FolksDummy-0.6.typelib
lib/girepository-1.0/FolksEds-0.6.typelib
@@ -40,8 +39,8 @@ share/GConf/gsettings/folks.convert
share/gir-1.0/Folks-0.6.gir
share/gir-1.0/FolksDummy-0.6.gir
share/gir-1.0/FolksEds-0.6.gir
-%%TRACKER%%share/gir-1.0/FolksTracker-0.6.gir
share/gir-1.0/FolksTelepathy-0.6.gir
+%%TRACKER%%share/gir-1.0/FolksTracker-0.6.gir
share/locale/ar/LC_MESSAGES/folks.mo
share/locale/as/LC_MESSAGES/folks.mo
share/locale/be/LC_MESSAGES/folks.mo
@@ -78,7 +77,9 @@ share/locale/lt/LC_MESSAGES/folks.mo
share/locale/lv/LC_MESSAGES/folks.mo
share/locale/ml/LC_MESSAGES/folks.mo
share/locale/mr/LC_MESSAGES/folks.mo
+share/locale/ms/LC_MESSAGES/folks.mo
share/locale/nb/LC_MESSAGES/folks.mo
+share/locale/ne/LC_MESSAGES/folks.mo
share/locale/nl/LC_MESSAGES/folks.mo
share/locale/oc/LC_MESSAGES/folks.mo
share/locale/or/LC_MESSAGES/folks.mo
@@ -109,7 +110,7 @@ share/vala/vapi/folks-eds.deps
share/vala/vapi/folks-eds.vapi
share/vala/vapi/folks-telepathy.deps
share/vala/vapi/folks-telepathy.vapi
-%%TRACKER%%share/vala/vapi/folks-tracker.deps
-%%TRACKER%%share/vala/vapi/folks-tracker.vapi
+share/vala/vapi/folks-tracker.deps
+share/vala/vapi/folks-tracker.vapi
share/vala/vapi/folks.deps
share/vala/vapi/folks.vapi
diff --git a/net-mgmt/arpwatch/pkg-plist b/net-mgmt/arpwatch/pkg-plist
index 43009156963d..8623cd9af164 100644
--- a/net-mgmt/arpwatch/pkg-plist
+++ b/net-mgmt/arpwatch/pkg-plist
@@ -11,6 +11,6 @@ man/man8/arpsnmp.8.gz
man/man8/arpwatch.8.gz
sbin/arpsnmp
sbin/arpwatch
-@postexec test -f %D/arpwatch/arp.dat || touch %D/arpwatch/arp.dat
-@preunexec test -f %D/arpwatch/arp.dat && test -s %D/arpwatch/arp.dat || rm -f %D/arpwatch/arp.dat
+@touch arpwatch/arp.dat
+@rmempty arpwatch/arp.dat
@dir(,operator,0755) arpwatch
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index cea905c499f1..67e3d839d342 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,6 +3,7 @@
PORTNAME= brasero
PORTVERSION= 3.12.2
+PORTREVISION= 1
CATEGORIES= sysutils audio multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 4c4e0487b3d6..d4141b42a468 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-control-center
-PORTVERSION= 3.28.2
-PORTREVISION= 6
+PORTVERSION= 3.36.4
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Control center for GNOME 3 project
@@ -33,7 +32,11 @@ LIB_DEPENDS= libcanberra.so:audio/libcanberra \
libpwquality.so:security/libpwquality \
libgtop-2.0.so:devel/libgtop \
libgrilo-0.3.so:net/grilo \
- libpolkit-gobject-1.so:sysutils/polkit
+ libpolkit-gobject-1.so:sysutils/polkit \
+ libhandy-0.0.so:x11-toolkits/libhandy0 \
+ libudisks2.so:sysutils/libudisks \
+ libsecret-1.so:security/libsecret \
+ libepoxy.so:graphics/libepoxy
RUN_DEPENDS= gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas \
cantarell-fonts>=0:x11-fonts/cantarell-fonts \
@@ -43,7 +46,7 @@ PORTSCOUT= limitw:1,even
USES= compiler:c++11-lib gettext gnome localbase:ldflags meson \
pkgconfig python:3.6+,build samba:lib tar:xz xorg
-USE_GNOME= cairo gnomedesktop3 libxml2
+USE_GNOME= cairo gnomedesktop3 libxml2 gsound
USE_XORG= x11 xi
#USE_GSTREAMER1= yes
INSTALLS_ICONS= yes
@@ -72,8 +75,7 @@ WAYLAND_LIB_DEPENDS= libgudev-1.0.so:devel/libgudev
RUN_DEPENDS+= etc_os-release>0:sysutils/etc_os-release
post-patch:
@${REINPLACE_CMD} -e 's|/etc/os-release|${LOCALBASE}/etc/os-release|g' \
- ${WRKSRC}/panels/privacy/cc-privacy-panel.c \
- ${WRKSRC}/panels/info/cc-info-overview-panel.c
+ ${WRKSRC}/panels/common/cc-os-release.c
.endif
.include <bsd.port.post.mk>
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 64d6c7827f17..eb16b3e0d1cb 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527916911
-SHA256 (gnome3/gnome-control-center-3.28.2.tar.xz) = ff9e3d7c1693c6004c8a337eb84452d517259b52330081b6b226a8ac5793d734
-SIZE (gnome3/gnome-control-center-3.28.2.tar.xz) = 5857128
+TIMESTAMP = 1601230613
+SHA256 (gnome/gnome-control-center-3.36.4.tar.xz) = ac02346bcf3391aa5c86ed857d76689fdb6e43c2b4b20d3ec6eab0ea9fecf754
+SIZE (gnome/gnome-control-center-3.36.4.tar.xz) = 6304992
diff --git a/sysutils/gnome-control-center/files/patch-panels_info_info-overview.ui b/sysutils/gnome-control-center/files/patch-panels_info_info-overview.ui
deleted file mode 100644
index 738b2a56f29d..000000000000
--- a/sysutils/gnome-control-center/files/patch-panels_info_info-overview.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- panels/info/info-overview.ui.orig 2017-10-05 21:57:04.444084000 +0200
-+++ panels/info/info-overview.ui 2017-10-05 21:57:19.290705000 +0200
-@@ -315,7 +315,7 @@
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
-- <property name="visible">True</property>
-+ <property name="visible">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
diff --git a/sysutils/gnome-control-center/files/patch-panels_keyboard_meson.build b/sysutils/gnome-control-center/files/patch-panels_keyboard_meson.build
index 484780b78c19..f9fbd75108b2 100644
--- a/sysutils/gnome-control-center/files/patch-panels_keyboard_meson.build
+++ b/sysutils/gnome-control-center/files/patch-panels_keyboard_meson.build
@@ -1,6 +1,6 @@
---- panels/keyboard/meson.build.orig 2018-04-29 09:38:45.338206000 +0200
-+++ panels/keyboard/meson.build 2018-04-29 09:40:44.959934000 +0200
-@@ -30,7 +30,7 @@
+--- panels/keyboard/meson.build.orig 2020-07-03 05:10:57 UTC
++++ panels/keyboard/meson.build
+@@ -30,7 +30,7 @@ configure_file(
input: pc + '.in',
output: pc,
install: true,
diff --git a/sysutils/gnome-control-center/files/patch-panels_user-accounts_um-realm-manager.c b/sysutils/gnome-control-center/files/patch-panels_user-accounts_cc-realm-manager.c
index 32e85e82778d..919f64eb3eb1 100644
--- a/sysutils/gnome-control-center/files/patch-panels_user-accounts_um-realm-manager.c
+++ b/sysutils/gnome-control-center/files/patch-panels_user-accounts_cc-realm-manager.c
@@ -1,17 +1,17 @@
http://git.pld-linux.org/gitweb.cgi?p=packages/gnome-control-center.git;a=blob;f=krb5.patch;h=260e9aac087453b798dc58b23bbc79705e6172d9;hb=49c1b881b47743e0c76eaf9158a37fd6532c111f
---- panels/user-accounts/um-realm-manager.c.orig 2013-06-17 21:10:46.000000000 +0000
-+++ panels/user-accounts/um-realm-manager.c 2013-06-17 21:20:51.000000000 +0000
-@@ -23,7 +23,7 @@
+--- panels/user-accounts/cc-realm-manager.c.orig 2020-07-03 05:10:57 UTC
++++ panels/user-accounts/cc-realm-manager.c
+@@ -22,7 +22,7 @@
- #include "um-realm-manager.h"
+ #include "cc-realm-manager.h"
-#include <krb5/krb5.h>
+#include <krb5.h>
#include <glib.h>
#include <glib/gi18n.h>
-@@ -732,8 +732,10 @@
+@@ -656,8 +656,10 @@ login_perform_kinit (krb5_context k5,
code = krb5_get_init_creds_opt_alloc (k5, &opts);
g_return_val_if_fail (code == 0, code);
diff --git a/sysutils/gnome-control-center/files/patch-panels_user-accounts_meson.build b/sysutils/gnome-control-center/files/patch-panels_user-accounts_meson.build
index b9d53de1e79e..ac340165cc46 100644
--- a/sysutils/gnome-control-center/files/patch-panels_user-accounts_meson.build
+++ b/sysutils/gnome-control-center/files/patch-panels_user-accounts_meson.build
@@ -1,6 +1,6 @@
---- panels/user-accounts/meson.build.orig 2018-04-28 22:01:31.903197000 +0200
-+++ panels/user-accounts/meson.build 2018-04-29 08:50:01.767068000 +0200
-@@ -157,7 +157,8 @@
+--- panels/user-accounts/meson.build.orig 2020-07-03 05:10:57 UTC
++++ panels/user-accounts/meson.build
+@@ -157,7 +157,8 @@ sources = common_sources + files(
)
# Kerberos support
diff --git a/sysutils/gnome-control-center/files/patch-panels_user-accounts_um-utils.c b/sysutils/gnome-control-center/files/patch-panels_user-accounts_um-utils.c
deleted file mode 100644
index edc29106de46..000000000000
--- a/sysutils/gnome-control-center/files/patch-panels_user-accounts_um-utils.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- panels/user-accounts/um-utils.c.orig 2014-03-03 11:55:25.000000000 +0000
-+++ panels/user-accounts/um-utils.c 2014-03-15 15:23:03.820288215 +0000
-@@ -26,6 +26,16 @@
- #include <limits.h>
- #include <unistd.h>
- #include <pwd.h>
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#if __FreeBSD_version < 900000
-+#include <utmp.h>
-+#else
-+#include <utmpx.h>
-+/* from the old utmp.h */
-+#define UT_NAMESIZE 16
-+#endif
-+#endif
-
- #include <gio/gio.h>
- #include <gio/gunixoutputstream.h>
diff --git a/sysutils/gnome-control-center/files/patch-shell_meson.build b/sysutils/gnome-control-center/files/patch-shell_meson.build
index b49f9d60e32b..78fbb4c2f492 100644
--- a/sysutils/gnome-control-center/files/patch-shell_meson.build
+++ b/sysutils/gnome-control-center/files/patch-shell_meson.build
@@ -1,14 +1,14 @@
# find heimal from base, make configurable ?
---- shell/meson.build.orig 2018-04-28 21:51:43.246323000 +0200
-+++ shell/meson.build 2018-04-28 21:54:37.283829000 +0200
-@@ -97,7 +97,8 @@
- dependencies: shell_deps,
- c_args: cflags,
- link_with: panels_libs + [libshell],
-- install: true
-+ install: true,
-+ install_rpath : '/usr/lib'
+--- shell/meson.build.orig 2020-09-27 18:22:48 UTC
++++ shell/meson.build
+@@ -130,7 +130,8 @@ executable(
+ dependencies : shell_deps,
+ c_args : cflags,
+ link_with : panels_libs,
+- install : true
++ install : true,
++ install_rpath : '/usr/lib'
)
- # Because it is confusing and somewhat problematic to directly add and compile
+
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index a7f6f9299c3c..8c3825230273 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -1,27 +1,34 @@
bin/gnome-control-center
libdata/pkgconfig/gnome-keybindings.pc
libexec/cc-remote-login-helper
+libexec/gnome-control-center-print-renderer
libexec/gnome-control-center-search-provider
+share/applications/gnome-applications-panel.desktop
share/applications/gnome-background-panel.desktop
+share/applications/gnome-camera-panel.desktop
share/applications/gnome-color-panel.desktop
share/applications/gnome-control-center.desktop
share/applications/gnome-datetime-panel.desktop
share/applications/gnome-default-apps-panel.desktop
+share/applications/gnome-diagnostics-panel.desktop
share/applications/gnome-display-panel.desktop
share/applications/gnome-info-overview-panel.desktop
share/applications/gnome-keyboard-panel.desktop
+share/applications/gnome-location-panel.desktop
+share/applications/gnome-lock-panel.desktop
+share/applications/gnome-microphone-panel.desktop
share/applications/gnome-mouse-panel.desktop
share/applications/gnome-notifications-panel.desktop
share/applications/gnome-online-accounts-panel.desktop
share/applications/gnome-power-panel.desktop
share/applications/gnome-printers-panel.desktop
-share/applications/gnome-privacy-panel.desktop
share/applications/gnome-region-panel.desktop
share/applications/gnome-removable-media-panel.desktop
share/applications/gnome-search-panel.desktop
share/applications/gnome-sharing-panel.desktop
share/applications/gnome-sound-panel.desktop
share/applications/gnome-universal-access-panel.desktop
+share/applications/gnome-usage-panel.desktop
share/applications/gnome-user-accounts-panel.desktop
share/bash-completion/completions/gnome-control-center
share/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service
@@ -30,47 +37,6 @@ share/gettext/its/gnome-keybindings.its
share/gettext/its/gnome-keybindings.loc
share/gettext/its/sounds.its
share/gettext/its/sounds.loc
-%%DATADIR%%/icons/hicolor/16x16/devices/audio-headset.svg
-%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png
-%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png
-%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png
-%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-muted.png
-%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-high.png
-%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-low.png
-%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-medium.png
-%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-muted.png
-%%DATADIR%%/icons/hicolor/24x24/devices/audio-headset.svg
-%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-high.png
-%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-low.png
-%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-medium.png
-%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-muted.png
-%%DATADIR%%/icons/hicolor/32x32/devices/audio-headset.svg
-%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-high.png
-%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png
-%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png
-%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-headset.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-center-back-testing.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-center-back.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-center-testing.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-center.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-left-back-testing.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-left-back.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-left-side-testing.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-left-side.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-left-testing.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-left.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-mono-testing.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-mono.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-right-back-testing.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-right-back.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-right-side-testing.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-right-side.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-right-testing.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-right.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-speaker-testing.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-subwoofer-testing.svg
-%%DATADIR%%/icons/hicolor/scalable/devices/audio-subwoofer.svg
%%DATADIR%%/keybindings/00-multimedia.xml
%%DATADIR%%/keybindings/01-input-sources.xml
%%DATADIR%%/keybindings/01-launchers.xml
@@ -78,60 +44,43 @@ share/gettext/its/sounds.loc
%%DATADIR%%/keybindings/01-system.xml
%%DATADIR%%/keybindings/50-accessibility.xml
%%DATADIR%%/pixmaps/noise-texture-light.png
-%%DATADIR%%/sounds/gnome-sounds-default.xml
share/gnome-shell/search-providers/gnome-control-center-search-provider.ini
-share/icons/hicolor/16x16/apps/gnome-control-center.png
share/icons/hicolor/16x16/apps/gnome-power-manager.png
share/icons/hicolor/16x16/apps/goa-panel.png
-share/icons/hicolor/16x16/apps/multimedia-volume-control.png
-share/icons/hicolor/16x16/apps/multimedia-volume-control.svg
share/icons/hicolor/16x16/apps/preferences-color.png
share/icons/hicolor/16x16/apps/preferences-desktop-display.png
share/icons/hicolor/16x16/apps/preferences-system-time.png
share/icons/hicolor/22x22/apps/gnome-power-manager.png
share/icons/hicolor/22x22/apps/goa-panel.png
-share/icons/hicolor/22x22/apps/multimedia-volume-control.png
-share/icons/hicolor/22x22/apps/multimedia-volume-control.svg
share/icons/hicolor/22x22/apps/preferences-color.png
share/icons/hicolor/22x22/apps/preferences-desktop-display.png
share/icons/hicolor/22x22/apps/preferences-system-time.png
-share/icons/hicolor/24x24/apps/gnome-control-center.png
share/icons/hicolor/24x24/apps/gnome-power-manager.png
share/icons/hicolor/24x24/apps/goa-panel.png
-share/icons/hicolor/24x24/apps/multimedia-volume-control.png
share/icons/hicolor/24x24/apps/preferences-color.png
share/icons/hicolor/24x24/apps/preferences-desktop-display.png
share/icons/hicolor/256x256/apps/gnome-power-manager.png
share/icons/hicolor/256x256/apps/goa-panel.png
share/icons/hicolor/256x256/apps/preferences-color.png
share/icons/hicolor/256x256/apps/preferences-system-time.png
-share/icons/hicolor/32x32/apps/gnome-control-center.png
share/icons/hicolor/32x32/apps/gnome-power-manager.png
share/icons/hicolor/32x32/apps/goa-panel.png
-share/icons/hicolor/32x32/apps/multimedia-volume-control.png
-share/icons/hicolor/32x32/apps/multimedia-volume-control.svg
share/icons/hicolor/32x32/apps/preferences-color.png
share/icons/hicolor/32x32/apps/preferences-desktop-display.png
share/icons/hicolor/32x32/apps/preferences-system-time.png
-share/icons/hicolor/48x48/apps/gnome-control-center.png
share/icons/hicolor/48x48/apps/gnome-power-manager.png
share/icons/hicolor/48x48/apps/goa-panel.png
-share/icons/hicolor/48x48/apps/multimedia-volume-control.png
share/icons/hicolor/48x48/apps/preferences-color.png
share/icons/hicolor/48x48/apps/preferences-system-time.png
-share/icons/hicolor/512x512/apps/gnome-control-center.png
share/icons/hicolor/64x64/apps/preferences-color.png
-share/icons/hicolor/scalable/apps/gnome-control-center-symbolic.svg
-share/icons/hicolor/scalable/apps/multimedia-volume-control.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings.Devel.svg
+share/icons/hicolor/scalable/apps/org.gnome.Settings.svg
share/icons/hicolor/scalable/apps/preferences-color.svg
share/icons/hicolor/scalable/apps/preferences-desktop-display.svg
share/icons/hicolor/scalable/apps/preferences-system-time.svg
share/icons/hicolor/scalable/categories/slideshow-symbolic.svg
share/icons/hicolor/scalable/emblems/slideshow-emblem.svg
-share/icons/hicolor/scalable/status/audio-input-microphone-high-symbolic.svg
-share/icons/hicolor/scalable/status/audio-input-microphone-low-symbolic.svg
-share/icons/hicolor/scalable/status/audio-input-microphone-medium-symbolic.svg
-share/icons/hicolor/scalable/status/audio-input-microphone-muted-symbolic.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Settings-symbolic.svg
share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/am/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -157,6 +106,7 @@ share/locale/bs/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/ca/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ckb/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/crh/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/cs/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -230,6 +180,7 @@ share/locale/lv/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/mai/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/mai/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/mg/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mjw/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/mk/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index ca8398007d26..43fe6e303d53 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-settings-daemon
-PORTVERSION= 3.28.1
-PORTREVISION= 2
+PORTVERSION= 3.38.0
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 3 settings daemon
@@ -25,7 +24,10 @@ LIB_DEPENDS= libcanberra.so:audio/libcanberra \
libgeoclue-2.so:net/geoclue \
libupower-glib.so:sysutils/upower \
libgeocode-glib.so:net/geocode-glib \
- libgweather-3.so:net/libgweather
+ libgweather-3.so:net/libgweather \
+ libcups.so:print/cups \
+ libnss3.so:security/nss \
+ libnspr4.so:devel/nspr
PORTSCOUT= limitw:1,even
@@ -39,21 +41,13 @@ INSTALLS_ICONS= yes
MESON_ARGS= -Dnssdb_dir=${LOCALBASE}/share/certs/ \
-Dalsa=false \
-Drfkill=false \
- -Dnetwork_manager=false
+ -Dnetwork_manager=false \
+ -Dsystemd=false \
+ -Dwwan=false \
+ -Dcups=true \
+ -Dsmartcard=true
BINARY_ALIAS= python3=${PYTHON_VERSION}
-OPTIONS_SUB= yes
-OPTIONS_DEFINE= CUPS SMARTCARD
-OPTIONS_DEFAULT=CUPS SMARTCARD
-
-CUPS_MESON_TRUE= cups
-CUPS_LIB_DEPENDS= libcups.so:print/cups
-
-SMARTCARD_DESC= Smartcard support
-SMARTCARD_MESON_TRUE= smartcard
-SMARTCARD_LIB_DEPENDS= libnss3.so:security/nss \
- libnspr4.so:devel/nspr
-
# wayland doesn't build yet, undefined symbol
MESON_ARGS+= -Dwayland=false -Dgudev=false
#WAYLAND_MESON_TRUE= wayland gudev
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 839c6110bf7c..1479b3f2cc43 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524858563
-SHA256 (gnome3/gnome-settings-daemon-3.28.1.tar.xz) = 594f78e194eb42a6f77785d1a92a4cb9cda54b8c3af6ca0c315b4570d38d2d7d
-SIZE (gnome3/gnome-settings-daemon-3.28.1.tar.xz) = 1362420
+TIMESTAMP = 1601311194
+SHA256 (gnome/gnome-settings-daemon-3.38.0.tar.xz) = b7ed5b5fab9aad192ceed6a95be2805124e3c63c46891bbae076f7ec3fd6792e
+SIZE (gnome/gnome-settings-daemon-3.38.0.tar.xz) = 1433260
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index 4a19270aeb44..b6498d295789 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -1,11 +1,10 @@
+etc/xdg/Xwayland-session.d/00-xrdb
etc/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop
-etc/xdg/autostart/org.gnome.SettingsDaemon.Clipboard.desktop
etc/xdg/autostart/org.gnome.SettingsDaemon.Color.desktop
etc/xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop
etc/xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop
etc/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop
etc/xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop
-etc/xdg/autostart/org.gnome.SettingsDaemon.Mouse.desktop
etc/xdg/autostart/org.gnome.SettingsDaemon.Power.desktop
etc/xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop
etc/xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop
@@ -13,29 +12,27 @@ etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop
etc/xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop
etc/xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop
etc/xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.UsbProtection.desktop
etc/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop
+etc/xdg/autostart/org.gnome.SettingsDaemon.Wwan.desktop
etc/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop
include/gnome-settings-daemon-3.0/gnome-settings-daemon/gsd-enums.h
lib/gnome-settings-daemon-3.0/libgsd.so
libdata/pkgconfig/gnome-settings-daemon.pc
libexec/gsd-a11y-settings
-libexec/gsd-clipboard
libexec/gsd-color
libexec/gsd-datetime
-libexec/gsd-dummy
libexec/gsd-housekeeping
libexec/gsd-keyboard
-libexec/gsd-locate-pointer
libexec/gsd-media-keys
-libexec/gsd-mouse
libexec/gsd-power
-%%CUPS%%libexec/gsd-print-notifications
-%%CUPS%%libexec/gsd-printer
+libexec/gsd-print-notifications
+libexec/gsd-printer
libexec/gsd-screensaver-proxy
libexec/gsd-sharing
-%%SMARTCARD%%libexec/gsd-smartcard
+libexec/gsd-smartcard
libexec/gsd-sound
-libexec/gsd-test-input-helper
+libexec/gsd-usb-protection
libexec/gsd-xsettings
share/GConf/gsettings/gnome-settings-daemon.convert
%%DATADIR%%/datetime/backward
@@ -54,6 +51,7 @@ share/locale/br/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/bs/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/ca/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/ckb/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/crh/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/cs/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/cy/LC_MESSAGES/gnome-settings-daemon.mo
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index de971ae9a7d9..06bb27695af1 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= meld
-PORTVERSION= 3.20.1
+PORTVERSION= 3.21.0
CATEGORIES= textproc devel python
MASTER_SITES= GNOME
@@ -18,7 +18,7 @@ RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
USES= desktop-file-utils gettext gnome python:3.4+ shared-mime-info \
shebangfix tar:xz
USE_PYTHON= distutils noflavors
-USE_GNOME= gtksourceview3 intltool libxml2:build pygobject3
+USE_GNOME= gtksourceview4 intltool libxml2:build pygobject3
SHEBANG_FILES= bin/meld
GLIB_SCHEMAS= org.gnome.meld.gschema.xml
diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo
index ec9991b7f0a9..840b33a79ed6 100644
--- a/textproc/meld/distinfo
+++ b/textproc/meld/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562394516
-SHA256 (meld-3.20.1.tar.xz) = a54843bc4d6cb1d31d0a58aa725091622194d50c32ef67026b35c86dda3cb249
-SIZE (meld-3.20.1.tar.xz) = 594812
+TIMESTAMP = 1592237329
+SHA256 (meld-3.21.0.tar.xz) = b680114d5ab793324549fd58f4eb202d8e280c0633a0b765ede6dfb34160a81b
+SIZE (meld-3.21.0.tar.xz) = 614744
diff --git a/textproc/meld/files/patch-setup.py b/textproc/meld/files/patch-setup.py
deleted file mode 100644
index 578579099286..000000000000
--- a/textproc/meld/files/patch-setup.py
+++ /dev/null
@@ -1,17 +0,0 @@
---- setup.py.orig 2014-11-22 12:24:31 UTC
-+++ setup.py
-@@ -37,11 +37,11 @@ setup(
- },
- scripts=['bin/meld'],
- data_files=[
-- ('share/man/man1',
-+ ('man/man1',
- ['meld.1']
- ),
-- ('share/doc/meld-' + meld.conf.__version__,
-- ['COPYING', 'NEWS']
-+ ('share/doc/meld',
-+ ['NEWS']
- ),
- ('share/meld',
- ['data/meld.css']
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index b5f57f3e1367..07775a53139d 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -2,22 +2,24 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/__init__.py
%%PYTHON_SITELIBDIR%%/meld/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/accelerators.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/accelerators.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/actiongutter.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/actiongutter.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/build_helpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/build_helpers.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/chunkmap.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/chunkmap.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffgrid.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffgrid.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffmap.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffmap.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/dirdiff.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/dirdiff.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/filediff.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/filediff.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/filemerge.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/meld/__pycache__/filemerge.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/gutterrendererchunk.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -34,6 +36,8 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/__pycache__/melddoc.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldwindow.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldwindow.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/menuhelpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/menuhelpers.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/newdifftab.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -48,6 +52,8 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/sourceview.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/sourceview.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/style.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/style.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -60,14 +66,15 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/__pycache__/vcview.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/windowstate.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/__pycache__/windowstate.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/accelerators.py
+%%PYTHON_SITELIBDIR%%/meld/actiongutter.py
%%PYTHON_SITELIBDIR%%/meld/build_helpers.py
+%%PYTHON_SITELIBDIR%%/meld/chunkmap.py
%%PYTHON_SITELIBDIR%%/meld/conf.py
%%PYTHON_SITELIBDIR%%/meld/const.py
%%PYTHON_SITELIBDIR%%/meld/diffgrid.py
-%%PYTHON_SITELIBDIR%%/meld/diffmap.py
%%PYTHON_SITELIBDIR%%/meld/dirdiff.py
%%PYTHON_SITELIBDIR%%/meld/filediff.py
-%%PYTHON_SITELIBDIR%%/meld/filemerge.py
%%PYTHON_SITELIBDIR%%/meld/filters.py
%%PYTHON_SITELIBDIR%%/meld/gutterrendererchunk.py
%%PYTHON_SITELIBDIR%%/meld/iohelpers.py
@@ -91,6 +98,7 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/meldbuffer.py
%%PYTHON_SITELIBDIR%%/meld/melddoc.py
%%PYTHON_SITELIBDIR%%/meld/meldwindow.py
+%%PYTHON_SITELIBDIR%%/meld/menuhelpers.py
%%PYTHON_SITELIBDIR%%/meld/misc.py
%%PYTHON_SITELIBDIR%%/meld/newdifftab.py
%%PYTHON_SITELIBDIR%%/meld/patchdialog.py
@@ -98,6 +106,7 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/recent.py
%%PYTHON_SITELIBDIR%%/meld/settings.py
%%PYTHON_SITELIBDIR%%/meld/sourceview.py
+%%PYTHON_SITELIBDIR%%/meld/style.py
%%PYTHON_SITELIBDIR%%/meld/task.py
%%PYTHON_SITELIBDIR%%/meld/tree.py
%%PYTHON_SITELIBDIR%%/meld/treehelpers.py
@@ -116,14 +125,10 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/findbar.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gladesupport.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gladesupport.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gnomeglade.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gnomeglade.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gtkcompat.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listselector.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listselector.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/msgarea.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -132,6 +137,8 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebook.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebooklabel.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebooklabel.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/recentselector.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/recentselector.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -144,14 +151,13 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/ui/filechooser.py
%%PYTHON_SITELIBDIR%%/meld/ui/findbar.py
%%PYTHON_SITELIBDIR%%/meld/ui/gladesupport.py
-%%PYTHON_SITELIBDIR%%/meld/ui/gnomeglade.py
%%PYTHON_SITELIBDIR%%/meld/ui/gtkcompat.py
%%PYTHON_SITELIBDIR%%/meld/ui/historyentry.py
-%%PYTHON_SITELIBDIR%%/meld/ui/listselector.py
%%PYTHON_SITELIBDIR%%/meld/ui/listwidget.py
%%PYTHON_SITELIBDIR%%/meld/ui/msgarea.py
%%PYTHON_SITELIBDIR%%/meld/ui/notebook.py
%%PYTHON_SITELIBDIR%%/meld/ui/notebooklabel.py
+%%PYTHON_SITELIBDIR%%/meld/ui/recentselector.py
%%PYTHON_SITELIBDIR%%/meld/ui/statusbar.py
%%PYTHON_SITELIBDIR%%/meld/ui/util.py
%%PYTHON_SITELIBDIR%%/meld/ui/vcdialogs.py
@@ -167,6 +173,8 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_vc.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/bzr.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/bzr.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/cvs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/cvs.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/darcs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/darcs.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/git.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -178,13 +186,13 @@ bin/meld
%%PYTHON_SITELIBDIR%%/meld/vc/_null.py
%%PYTHON_SITELIBDIR%%/meld/vc/_vc.py
%%PYTHON_SITELIBDIR%%/meld/vc/bzr.py
+%%PYTHON_SITELIBDIR%%/meld/vc/cvs.py
%%PYTHON_SITELIBDIR%%/meld/vc/darcs.py
%%PYTHON_SITELIBDIR%%/meld/vc/git.py
%%PYTHON_SITELIBDIR%%/meld/vc/mercurial.py
%%PYTHON_SITELIBDIR%%/meld/vc/svn.py
%%PYTHON_SITELIBDIR%%/meld/vcview.py
%%PYTHON_SITELIBDIR%%/meld/windowstate.py
-man/man1/meld.1.gz
share/applications/org.gnome.meld.desktop
share/help/C/meld/command-line.page
share/help/C/meld/file-changes.page
@@ -202,18 +210,8 @@ share/help/C/meld/resolving-conflicts.page
share/help/C/meld/text-filters.page
share/help/C/meld/vc-mode.page
share/help/C/meld/vc-supported.page
-share/icons/HighContrast/scalable/apps/org.gnome.meld.svg
-share/icons/hicolor/16x16/actions/meld-change-apply-left.png
-share/icons/hicolor/16x16/actions/meld-change-apply-right.png
-share/icons/hicolor/16x16/actions/meld-change-copy.png
-share/icons/hicolor/16x16/actions/meld-change-delete.png
-share/icons/hicolor/16x16/apps/meld-version-control.png
-share/icons/hicolor/16x16/apps/org.gnome.meld.png
-share/icons/hicolor/22x22/apps/org.gnome.meld.png
-share/icons/hicolor/32x32/apps/org.gnome.meld.png
-share/icons/hicolor/48x48/apps/meld-version-control.png
-share/icons/hicolor/48x48/apps/org.gnome.meld.png
share/icons/hicolor/scalable/apps/org.gnome.meld.svg
+share/icons/hicolor/symbolic/apps/org.gnome.meld-symbolic.svg
share/locale/ar/LC_MESSAGES/meld.mo
share/locale/bg/LC_MESSAGES/meld.mo
share/locale/bs/LC_MESSAGES/meld.mo
@@ -260,40 +258,11 @@ share/locale/uk/LC_MESSAGES/meld.mo
share/locale/vi/LC_MESSAGES/meld.mo
share/locale/zh_CN/LC_MESSAGES/meld.mo
share/locale/zh_TW/LC_MESSAGES/meld.mo
-%%DATADIR%%/icons/COPYING
-%%DATADIR%%/icons/COPYING_CCBYSA3
-%%DATADIR%%/icons/emblem-meld-newer-file.png
-%%DATADIR%%/icons/filter-ignored-24.png
-%%DATADIR%%/icons/filter-modified-24.png
-%%DATADIR%%/icons/filter-nonvc-24.png
-%%DATADIR%%/icons/filter-normal-24.png
-%%DATADIR%%/icons/vc-add-24.png
-%%DATADIR%%/icons/vc-checkout-24.png
-%%DATADIR%%/icons/vc-commit-24.png
-%%DATADIR%%/icons/vc-push-24.png
-%%DATADIR%%/icons/vc-remove-24.png
-%%DATADIR%%/icons/vc-resolve-24.png
-%%DATADIR%%/icons/vc-update-24.png
-%%DATADIR%%/meld.css
-%%DATADIR%%/styles/meld-base.xml
-%%DATADIR%%/styles/meld-dark.xml
-%%DATADIR%%/ui/EditableList.ui
-%%DATADIR%%/ui/application.ui
-%%DATADIR%%/ui/appmenu-fallback.xml
-%%DATADIR%%/ui/dirdiff-ui.xml
-%%DATADIR%%/ui/dirdiff.ui
-%%DATADIR%%/ui/encoding-selector.ui
-%%DATADIR%%/ui/filediff-ui.xml
-%%DATADIR%%/ui/filediff.ui
-%%DATADIR%%/ui/findbar.ui
-%%DATADIR%%/ui/language-selector.ui
-%%DATADIR%%/ui/meldapp-ui.xml
-%%DATADIR%%/ui/meldapp.ui
-%%DATADIR%%/ui/patch-dialog.ui
-%%DATADIR%%/ui/preferences.ui
-%%DATADIR%%/ui/shortcuts.ui
-%%DATADIR%%/ui/tab-placeholder.ui
-%%DATADIR%%/ui/vcview-ui.xml
-%%DATADIR%%/ui/vcview.ui
+share/man/man1/meld.1.gz
+%%DATADIR%%/org.gnome.Meld.gresource
+%%DATADIR%%/styles/meld-base.style-scheme.xml
+%%DATADIR%%/styles/meld-dark.style-scheme.xml
share/metainfo/org.gnome.meld.appdata.xml
share/mime/packages/org.gnome.meld.xml
+@dir %%DATADIR%%/icons
+@dir %%DATADIR%%/ui
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index f19bc5927ed5..2328e2aac59c 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,7 +3,7 @@
PORTNAME= epiphany
PORTVERSION= 3.28.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 07f025cc4eb6..7eddee1cff35 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-user-share
PORTVERSION= 3.14.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-fm/nautilus-python/Makefile b/x11-fm/nautilus-python/Makefile
index a9aeb91079da..9d79db231b0a 100644
--- a/x11-fm/nautilus-python/Makefile
+++ b/x11-fm/nautilus-python/Makefile
@@ -2,6 +2,7 @@
PORTNAME= nautilus-python
DISTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= x11-fm gnome python
MASTER_SITES= GNOME
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index b50e1fe2183a..4a596aed6792 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nautilus
PORTVERSION= 3.28.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fm gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index 8f80c6a2e4b8..0dac315a7160 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nemo
PORTVERSION= 2.4.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fm gnome
DIST_SUBDIR= gnome3
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index 4d7be61c7ee3..bcde82d32d10 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= mutter
-PORTVERSION= 3.28.3
-PORTREVISION= 2
+PORTVERSION= 3.36.6
CATEGORIES= x11-wm
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Window and compositing manager based on Clutter
@@ -16,7 +15,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= zenity>=3.0.0:x11/zenity \
xkeyboard-config>=0:x11/xkeyboard-config \
- gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas
+ gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas \
+ gnome-settings-daemon>0:sysutils/gnome-settings-daemon \
+ evdev-proto>0:devel/evdev-proto
LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
libfribidi.so:converters/fribidi \
libxkbcommon.so:x11/libxkbcommon \
@@ -27,38 +28,41 @@ LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
libxkbfile.so:x11/libxkbfile \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
- libdrm.so:graphics/libdrm
+ libdrm.so:graphics/libdrm \
+ libpipewire-0.3.so:multimedia/pipewire \
+ libgraphene-1.0.so:graphics/graphene
RUN_DEPENDS= zenity>=3.0.0:x11/zenity \
xkeyboard-config>=0:x11/xkeyboard-config \
- gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas
+ gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas \
+ gnome-settings-daemon>0:sysutils/gnome-settings-daemon
PORTSCOUT= limitw:1,even
-USES= compiler:c++0x gettext gl gmake gnome libtool localbase pathfix \
+USES= compiler:c++0x gettext gl gnome localbase meson \
pkgconfig tar:xz xorg
USE_GL= egl
USE_GNOME= cairo gdkpixbuf2 gnomedesktop3 introspection
USE_XORG= ice sm x11 xcb xcomposite xcursor xdamage xext xfixes \
xi xinerama xrandr xrender xtst
-GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CFLAGS+= -Wno-unknown-warning-option \
-Wno-format-nonliteral
CPPFLAGS+= -fno-omit-frame-pointer
-CONFIGURE_ARGS= --without-libwacom \
- --disable-wayland
+MESON_ARGS= -Dlibwacom=false \
+ -Dwayland=false \
+ -Dudev=false \
+ -Dnative_backend=false \
+ -Dprofiler=false \
+ -Dtests=false \
+ -Dsm=true
# Required by embedded cogl/clutter forks.
-CONFIGURE_ARGS+= --with-x \
- --with-gl-libname=libGL.so \
- --with-gles1-libname=libGLESv1_CM \
- --with-gles2-libname=libGLESv2 \
- --enable-kms-egl-platform=yes \
- --enable-xlib-egl-platform=yes \
- --disable-wayland-egl-server \
- --enable-compile-warnings=yes
+MESON_ARGS+= -Dopengl_libname=libGL.so \
+ -Dgles2_libname=libGLESv2
+
+# Disable remote_desktop for now because it requires memfd which only appears current
+MESON_ARGS+= -Dremote_desktop=false
-INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.gnome.mutter.gschema.xml \
org.gnome.mutter.wayland.gschema.xml
diff --git a/x11-wm/mutter/distinfo b/x11-wm/mutter/distinfo
index 78ca94984957..f097df3a202d 100644
--- a/x11-wm/mutter/distinfo
+++ b/x11-wm/mutter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538670224
-SHA256 (gnome3/mutter-3.28.3.tar.xz) = 8904236269295cd62c24cd1d7b64e1d0688fffe4c7386d620dcb342070cd036f
-SIZE (gnome3/mutter-3.28.3.tar.xz) = 3693812
+TIMESTAMP = 1601307300
+SHA256 (gnome/mutter-3.36.6.tar.xz) = 7fab160eecf4299e445e24aa34b5e903745ffcc256f82b7f267cd106e435e034
+SIZE (gnome/mutter-3.36.6.tar.xz) = 2689156
diff --git a/x11-wm/mutter/files/patch-meson.build b/x11-wm/mutter/files/patch-meson.build
new file mode 100644
index 000000000000..aaca6af54b4b
--- /dev/null
+++ b/x11-wm/mutter/files/patch-meson.build
@@ -0,0 +1,25 @@
+--- meson.build.orig 2020-09-28 15:41:47 UTC
++++ meson.build
+@@ -320,22 +320,6 @@ if buildtype != 'plain'
+ '-Wmissing-include-dirs',
+ '-Wlogical-op',
+ '-Wignored-qualifiers',
+- '-Werror=redundant-decls',
+- '-Werror=implicit',
+- '-Werror=nonnull',
+- '-Werror=init-self',
+- '-Werror=main',
+- '-Werror=missing-braces',
+- '-Werror=sequence-point',
+- '-Werror=return-type',
+- '-Werror=trigraphs',
+- '-Werror=array-bounds',
+- '-Werror=write-strings',
+- '-Werror=address',
+- '-Werror=int-to-pointer-cast',
+- '-Werror=pointer-to-int-cast',
+- '-Werror=empty-body',
+- '-Werror=write-strings',
+ ]
+ supported_warnings = cc.get_supported_arguments(all_warnings)
+ add_project_arguments(supported_warnings, language: 'c')
diff --git a/x11-wm/mutter/files/patch-src_backends_meta-egl.c b/x11-wm/mutter/files/patch-src_backends_meta-egl.c
index 3f2500abac24..9a63abd4c487 100644
--- a/x11-wm/mutter/files/patch-src_backends_meta-egl.c
+++ b/x11-wm/mutter/files/patch-src_backends_meta-egl.c
@@ -7,9 +7,9 @@ Date: Tue, 11 Jul 2017 16:03:26 +0100
Subject: [PATCH] wayland: Add zwp_linux_dmabuf_v1 support
Index: src/backends/meta-egl.c
---- src/backends/meta-egl.c.orig
+--- src/backends/meta-egl.c.orig 2020-09-07 19:18:23 UTC
+++ src/backends/meta-egl.c
-@@ -67,8 +67,6 @@ struct _MetaEgl
+@@ -69,8 +69,6 @@ struct _MetaEgl
PFNEGLSTREAMCONSUMERACQUIREKHRPROC eglStreamConsumerAcquireKHR;
PFNEGLSTREAMCONSUMERACQUIREATTRIBNVPROC eglStreamConsumerAcquireAttribNV;
@@ -18,7 +18,7 @@ Index: src/backends/meta-egl.c
};
G_DEFINE_TYPE (MetaEgl, meta_egl, G_TYPE_OBJECT)
-@@ -926,51 +924,6 @@ meta_egl_stream_consumer_acquire (MetaEgl *egl,
+@@ -1019,51 +1017,6 @@ meta_egl_stream_consumer_acquire (MetaEgl *egl,
return TRUE;
}
@@ -70,7 +70,7 @@ Index: src/backends/meta-egl.c
#define GET_EGL_PROC_ADDR(proc) \
egl->proc = (void *) eglGetProcAddress (#proc);
-@@ -1007,8 +960,6 @@ meta_egl_constructed (GObject *object)
+@@ -1100,8 +1053,6 @@ meta_egl_constructed (GObject *object)
GET_EGL_PROC_ADDR (eglStreamConsumerAcquireKHR);
GET_EGL_PROC_ADDR (eglStreamConsumerAcquireAttribNV);
diff --git a/x11-wm/mutter/files/patch-src_compositor_compositor.c b/x11-wm/mutter/files/patch-src_compositor_compositor.c
deleted file mode 100644
index fe493c81ce34..000000000000
--- a/x11-wm/mutter/files/patch-src_compositor_compositor.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_compositor_compositor_c,v 1.2 2017/05/21 17:48:10 jasper Exp $
-
-undefined reference to `meta_dnd_wayland_handle_begin_modal'
-
-Index: src/compositor/compositor.c
---- src/compositor/compositor.c.orig
-+++ src/compositor/compositor.c
-@@ -383,6 +383,7 @@ meta_begin_modal_for_plugin (MetaCompositor *composi
- meta_plugin_get_screen (plugin),
- display->grab_window, display->grab_op);
-
-+#ifdef HAVE_WAYLAND
- if (meta_is_wayland_compositor ())
- {
- meta_display_sync_wayland_input_focus (display);
-@@ -392,6 +393,7 @@ meta_begin_modal_for_plugin (MetaCompositor *composi
- meta_dnd_wayland_handle_begin_modal (compositor);
- #endif
- }
-+#endif
-
- return TRUE;
- }
diff --git a/x11-wm/mutter/files/patch-src_core_main.c b/x11-wm/mutter/files/patch-src_core_main.c
deleted file mode 100644
index bc10f1c15d2c..000000000000
--- a/x11-wm/mutter/files/patch-src_core_main.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_core_main_c,v 1.6 2018/04/26 09:19:27 jasper Exp $
-
-extend HAVE_WAYLAND block to include opt_nested and META_TYPE_BACKEND_X11_NESTED.
-
-Index: src/core/main.c
---- src/core/main.c.orig
-+++ src/core/main.c
-@@ -456,7 +456,6 @@ calculate_compositor_configuration (MetaCompositorType
- if (run_as_wayland_compositor)
- *compositor_type = META_COMPOSITOR_TYPE_WAYLAND;
- else
--#endif /* HAVE_WAYLAND */
- *compositor_type = META_COMPOSITOR_TYPE_X11;
-
- #ifdef HAVE_WAYLAND
-@@ -473,6 +472,7 @@ calculate_compositor_configuration (MetaCompositorType
- *backend_gtype = META_TYPE_BACKEND_NATIVE;
- return;
- }
-+#endif /* HAVE_WAYLAND */
-
- #ifdef HAVE_WAYLAND
- if (run_as_wayland_compositor)
diff --git a/x11-wm/mutter/pkg-plist b/x11-wm/mutter/pkg-plist
index 30f9f2e3c92f..091b6b195893 100644
--- a/x11-wm/mutter/pkg-plist
+++ b/x11-wm/mutter/pkg-plist
@@ -1,293 +1,263 @@
bin/mutter
-include/mutter/clutter-2/cally/cally-actor.h
-include/mutter/clutter-2/cally/cally-clone.h
-include/mutter/clutter-2/cally/cally-factory.h
-include/mutter/clutter-2/cally/cally-group.h
-include/mutter/clutter-2/cally/cally-main.h
-include/mutter/clutter-2/cally/cally-rectangle.h
-include/mutter/clutter-2/cally/cally-root.h
-include/mutter/clutter-2/cally/cally-stage.h
-include/mutter/clutter-2/cally/cally-text.h
-include/mutter/clutter-2/cally/cally-texture.h
-include/mutter/clutter-2/cally/cally-util.h
-include/mutter/clutter-2/cally/cally.h
-include/mutter/clutter-2/clutter/clutter-action.h
-include/mutter/clutter-2/clutter/clutter-actor-meta.h
-include/mutter/clutter-2/clutter/clutter-actor.h
-include/mutter/clutter-2/clutter/clutter-align-constraint.h
-include/mutter/clutter-2/clutter/clutter-animatable.h
-include/mutter/clutter-2/clutter/clutter-autocleanups.h
-include/mutter/clutter-2/clutter/clutter-backend.h
-include/mutter/clutter-2/clutter/clutter-bin-layout.h
-include/mutter/clutter-2/clutter/clutter-bind-constraint.h
-include/mutter/clutter-2/clutter/clutter-binding-pool.h
-include/mutter/clutter-2/clutter/clutter-blur-effect.h
-include/mutter/clutter-2/clutter/clutter-box-layout.h
-include/mutter/clutter-2/clutter/clutter-brightness-contrast-effect.h
-include/mutter/clutter-2/clutter/clutter-cairo.h
-include/mutter/clutter-2/clutter/clutter-canvas.h
-include/mutter/clutter-2/clutter/clutter-child-meta.h
-include/mutter/clutter-2/clutter/clutter-click-action.h
-include/mutter/clutter-2/clutter/clutter-clone.h
-include/mutter/clutter-2/clutter/clutter-color-static.h
-include/mutter/clutter-2/clutter/clutter-color.h
-include/mutter/clutter-2/clutter/clutter-colorize-effect.h
-include/mutter/clutter-2/clutter/clutter-config.h
-include/mutter/clutter-2/clutter/clutter-constraint.h
-include/mutter/clutter-2/clutter/clutter-container.h
-include/mutter/clutter-2/clutter/clutter-content.h
-include/mutter/clutter-2/clutter/clutter-deform-effect.h
-include/mutter/clutter-2/clutter/clutter-deprecated.h
-include/mutter/clutter-2/clutter/clutter-desaturate-effect.h
-include/mutter/clutter-2/clutter/clutter-device-manager.h
-include/mutter/clutter-2/clutter/clutter-drag-action.h
-include/mutter/clutter-2/clutter/clutter-drop-action.h
-include/mutter/clutter-2/clutter/clutter-effect.h
-include/mutter/clutter-2/clutter/clutter-enum-types.h
-include/mutter/clutter-2/clutter/clutter-enums.h
-include/mutter/clutter-2/clutter/clutter-event.h
-include/mutter/clutter-2/clutter/clutter-feature.h
-include/mutter/clutter-2/clutter/clutter-fixed-layout.h
-include/mutter/clutter-2/clutter/clutter-flow-layout.h
-include/mutter/clutter-2/clutter/clutter-gesture-action.h
-include/mutter/clutter-2/clutter/clutter-grid-layout.h
-include/mutter/clutter-2/clutter/clutter-group.h
-include/mutter/clutter-2/clutter/clutter-image.h
-include/mutter/clutter-2/clutter/clutter-input-device-tool.h
-include/mutter/clutter-2/clutter/clutter-input-device.h
-include/mutter/clutter-2/clutter/clutter-input-focus.h
-include/mutter/clutter-2/clutter/clutter-input-method.h
-include/mutter/clutter-2/clutter/clutter-interval.h
-include/mutter/clutter-2/clutter/clutter-keyframe-transition.h
-include/mutter/clutter-2/clutter/clutter-keysyms.h
-include/mutter/clutter-2/clutter/clutter-layout-manager.h
-include/mutter/clutter-2/clutter/clutter-layout-meta.h
-include/mutter/clutter-2/clutter/clutter-macros.h
-include/mutter/clutter-2/clutter/clutter-main.h
-include/mutter/clutter-2/clutter/clutter-marshal.h
-include/mutter/clutter-2/clutter/clutter-mutter.h
-include/mutter/clutter-2/clutter/clutter-offscreen-effect.h
-include/mutter/clutter-2/clutter/clutter-page-turn-effect.h
-include/mutter/clutter-2/clutter/clutter-paint-node.h
-include/mutter/clutter-2/clutter/clutter-paint-nodes.h
-include/mutter/clutter-2/clutter/clutter-pan-action.h
-include/mutter/clutter-2/clutter/clutter-path-constraint.h
-include/mutter/clutter-2/clutter/clutter-path.h
-include/mutter/clutter-2/clutter/clutter-property-transition.h
-include/mutter/clutter-2/clutter/clutter-rotate-action.h
-include/mutter/clutter-2/clutter/clutter-script.h
-include/mutter/clutter-2/clutter/clutter-scriptable.h
-include/mutter/clutter-2/clutter/clutter-scroll-actor.h
-include/mutter/clutter-2/clutter/clutter-settings.h
-include/mutter/clutter-2/clutter/clutter-shader-effect.h
-include/mutter/clutter-2/clutter/clutter-shader-types.h
-include/mutter/clutter-2/clutter/clutter-snap-constraint.h
-include/mutter/clutter-2/clutter/clutter-stage-manager.h
-include/mutter/clutter-2/clutter/clutter-stage.h
-include/mutter/clutter-2/clutter/clutter-swipe-action.h
-include/mutter/clutter-2/clutter/clutter-tap-action.h
-include/mutter/clutter-2/clutter/clutter-test-utils.h
-include/mutter/clutter-2/clutter/clutter-text-buffer.h
-include/mutter/clutter-2/clutter/clutter-text.h
-include/mutter/clutter-2/clutter/clutter-texture.h
-include/mutter/clutter-2/clutter/clutter-timeline.h
-include/mutter/clutter-2/clutter/clutter-transition-group.h
-include/mutter/clutter-2/clutter/clutter-transition.h
-include/mutter/clutter-2/clutter/clutter-types.h
-include/mutter/clutter-2/clutter/clutter-units.h
-include/mutter/clutter-2/clutter/clutter-version.h
-include/mutter/clutter-2/clutter/clutter-virtual-input-device.h
-include/mutter/clutter-2/clutter/clutter-zoom-action.h
-include/mutter/clutter-2/clutter/clutter.h
-include/mutter/clutter-2/clutter/deprecated/clutter-actor.h
-include/mutter/clutter-2/clutter/deprecated/clutter-alpha.h
-include/mutter/clutter-2/clutter/deprecated/clutter-animatable.h
-include/mutter/clutter-2/clutter/deprecated/clutter-animation.h
-include/mutter/clutter-2/clutter/deprecated/clutter-animator.h
-include/mutter/clutter-2/clutter/deprecated/clutter-backend.h
-include/mutter/clutter-2/clutter/deprecated/clutter-behaviour-depth.h
-include/mutter/clutter-2/clutter/deprecated/clutter-behaviour-ellipse.h
-include/mutter/clutter-2/clutter/deprecated/clutter-behaviour-opacity.h
-include/mutter/clutter-2/clutter/deprecated/clutter-behaviour-path.h
-include/mutter/clutter-2/clutter/deprecated/clutter-behaviour-rotate.h
-include/mutter/clutter-2/clutter/deprecated/clutter-behaviour-scale.h
-include/mutter/clutter-2/clutter/deprecated/clutter-behaviour.h
-include/mutter/clutter-2/clutter/deprecated/clutter-bin-layout.h
-include/mutter/clutter-2/clutter/deprecated/clutter-box.h
-include/mutter/clutter-2/clutter/deprecated/clutter-cairo-texture.h
-include/mutter/clutter-2/clutter/deprecated/clutter-container.h
-include/mutter/clutter-2/clutter/deprecated/clutter-frame-source.h
-include/mutter/clutter-2/clutter/deprecated/clutter-group.h
-include/mutter/clutter-2/clutter/deprecated/clutter-input-device.h
-include/mutter/clutter-2/clutter/deprecated/clutter-keysyms.h
-include/mutter/clutter-2/clutter/deprecated/clutter-list-model.h
-include/mutter/clutter-2/clutter/deprecated/clutter-main.h
-include/mutter/clutter-2/clutter/deprecated/clutter-media.h
-include/mutter/clutter-2/clutter/deprecated/clutter-model.h
-include/mutter/clutter-2/clutter/deprecated/clutter-rectangle.h
-include/mutter/clutter-2/clutter/deprecated/clutter-score.h
-include/mutter/clutter-2/clutter/deprecated/clutter-shader.h
-include/mutter/clutter-2/clutter/deprecated/clutter-stage-manager.h
-include/mutter/clutter-2/clutter/deprecated/clutter-stage.h
-include/mutter/clutter-2/clutter/deprecated/clutter-state.h
-include/mutter/clutter-2/clutter/deprecated/clutter-table-layout.h
-include/mutter/clutter-2/clutter/deprecated/clutter-texture.h
-include/mutter/clutter-2/clutter/deprecated/clutter-timeline.h
-include/mutter/clutter-2/clutter/deprecated/clutter-timeout-pool.h
-include/mutter/clutter-2/clutter/deprecated/clutter-util.h
-include/mutter/clutter-2/clutter/x11/clutter-x11-texture-pixmap.h
-include/mutter/clutter-2/clutter/x11/clutter-x11.h
-include/mutter/cogl/cogl-pango/cogl-pango.h
-include/mutter/cogl/cogl-path/cogl-path-enum-types.h
-include/mutter/cogl/cogl-path/cogl-path-functions.h
-include/mutter/cogl/cogl-path/cogl-path-types.h
-include/mutter/cogl/cogl-path/cogl-path.h
-include/mutter/cogl/cogl/cogl-atlas-texture.h
-include/mutter/cogl/cogl/cogl-attribute-buffer.h
-include/mutter/cogl/cogl/cogl-attribute.h
-include/mutter/cogl/cogl/cogl-auto-texture.h
-include/mutter/cogl/cogl/cogl-bitmap.h
-include/mutter/cogl/cogl/cogl-buffer.h
-include/mutter/cogl/cogl/cogl-clutter.h
-include/mutter/cogl/cogl/cogl-color.h
-include/mutter/cogl/cogl/cogl-context.h
-include/mutter/cogl/cogl/cogl-defines.h
-include/mutter/cogl/cogl/cogl-deprecated.h
-include/mutter/cogl/cogl/cogl-depth-state.h
-include/mutter/cogl/cogl/cogl-display.h
-include/mutter/cogl/cogl/cogl-egl-defines.h
-include/mutter/cogl/cogl/cogl-egl.h
-include/mutter/cogl/cogl/cogl-error.h
-include/mutter/cogl/cogl/cogl-euler.h
-include/mutter/cogl/cogl/cogl-fence.h
-include/mutter/cogl/cogl/cogl-frame-info.h
-include/mutter/cogl/cogl/cogl-framebuffer.h
-include/mutter/cogl/cogl/cogl-gles2-types.h
-include/mutter/cogl/cogl/cogl-gles2.h
-include/mutter/cogl/cogl/cogl-glib-source.h
-include/mutter/cogl/cogl/cogl-glx.h
-include/mutter/cogl/cogl/cogl-gtype-private.h
-include/mutter/cogl/cogl/cogl-index-buffer.h
-include/mutter/cogl/cogl/cogl-indices.h
-include/mutter/cogl/cogl/cogl-macros.h
-include/mutter/cogl/cogl/cogl-material-compat.h
-include/mutter/cogl/cogl/cogl-matrix-stack.h
-include/mutter/cogl/cogl/cogl-matrix.h
-include/mutter/cogl/cogl/cogl-meta-texture.h
-include/mutter/cogl/cogl/cogl-mutter.h
-include/mutter/cogl/cogl/cogl-object.h
-include/mutter/cogl/cogl/cogl-offscreen.h
-include/mutter/cogl/cogl/cogl-onscreen-template.h
-include/mutter/cogl/cogl/cogl-onscreen.h
-include/mutter/cogl/cogl/cogl-output.h
-include/mutter/cogl/cogl/cogl-pango.h
-include/mutter/cogl/cogl/cogl-pipeline-layer-state.h
-include/mutter/cogl/cogl/cogl-pipeline-state.h
-include/mutter/cogl/cogl/cogl-pipeline.h
-include/mutter/cogl/cogl/cogl-pixel-buffer.h
-include/mutter/cogl/cogl/cogl-poll.h
-include/mutter/cogl/cogl/cogl-primitive-texture.h
-include/mutter/cogl/cogl/cogl-primitive.h
-include/mutter/cogl/cogl/cogl-primitives.h
-include/mutter/cogl/cogl/cogl-quaternion.h
-include/mutter/cogl/cogl/cogl-renderer.h
-include/mutter/cogl/cogl/cogl-shader.h
-include/mutter/cogl/cogl/cogl-snippet.h
-include/mutter/cogl/cogl/cogl-sub-texture.h
-include/mutter/cogl/cogl/cogl-swap-chain.h
-include/mutter/cogl/cogl/cogl-texture-2d-gl.h
-include/mutter/cogl/cogl/cogl-texture-2d-sliced.h
-include/mutter/cogl/cogl/cogl-texture-2d.h
-include/mutter/cogl/cogl/cogl-texture-3d.h
-include/mutter/cogl/cogl/cogl-texture-pixmap-x11.h
-include/mutter/cogl/cogl/cogl-texture-rectangle.h
-include/mutter/cogl/cogl/cogl-texture.h
-include/mutter/cogl/cogl/cogl-type-casts.h
-include/mutter/cogl/cogl/cogl-types.h
-include/mutter/cogl/cogl/cogl-vector.h
-include/mutter/cogl/cogl/cogl-version.h
-include/mutter/cogl/cogl/cogl-vertex-buffer.h
-include/mutter/cogl/cogl/cogl-xlib-renderer.h
-include/mutter/cogl/cogl/cogl-xlib.h
-include/mutter/cogl/cogl/cogl.h
-include/mutter/cogl/cogl/cogl1-context.h
-include/mutter/cogl/cogl/deprecated/cogl-auto-texture.h
-include/mutter/cogl/cogl/deprecated/cogl-clutter-xlib.h
-include/mutter/cogl/cogl/deprecated/cogl-clutter.h
-include/mutter/cogl/cogl/deprecated/cogl-framebuffer-deprecated.h
-include/mutter/cogl/cogl/deprecated/cogl-material-compat.h
-include/mutter/cogl/cogl/deprecated/cogl-shader.h
-include/mutter/cogl/cogl/deprecated/cogl-type-casts.h
-include/mutter/cogl/cogl/deprecated/cogl-vertex-buffer.h
-include/mutter/cogl/cogl/gl-prototypes/cogl-core-functions.h
-include/mutter/cogl/cogl/gl-prototypes/cogl-gles2-functions.h
-include/mutter/cogl/cogl/gl-prototypes/cogl-glsl-functions.h
-include/mutter/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
-include/mutter/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
-include/mutter/meta/barrier.h
-include/mutter/meta/boxes.h
-include/mutter/meta/common.h
-include/mutter/meta/compositor-mutter.h
-include/mutter/meta/compositor.h
-include/mutter/meta/display.h
-include/mutter/meta/errors.h
-include/mutter/meta/group.h
-include/mutter/meta/keybindings.h
-include/mutter/meta/main.h
-include/mutter/meta/meta-backend.h
-include/mutter/meta/meta-background-actor.h
-include/mutter/meta/meta-background-group.h
-include/mutter/meta/meta-background-image.h
-include/mutter/meta/meta-background.h
-include/mutter/meta/meta-close-dialog.h
-include/mutter/meta/meta-cursor-tracker.h
-include/mutter/meta/meta-dnd.h
-include/mutter/meta/meta-enum-types.h
-include/mutter/meta/meta-idle-monitor.h
-include/mutter/meta/meta-inhibit-shortcuts-dialog.h
-include/mutter/meta/meta-monitor-manager.h
-include/mutter/meta/meta-plugin.h
-include/mutter/meta/meta-settings.h
-include/mutter/meta/meta-shadow-factory.h
-include/mutter/meta/meta-shaped-texture.h
-include/mutter/meta/meta-stage.h
-include/mutter/meta/meta-version.h
-include/mutter/meta/meta-window-actor.h
-include/mutter/meta/meta-window-group.h
-include/mutter/meta/meta-window-shape.h
-include/mutter/meta/prefs.h
-include/mutter/meta/screen.h
-include/mutter/meta/theme.h
-include/mutter/meta/types.h
-include/mutter/meta/util.h
-include/mutter/meta/window.h
-include/mutter/meta/workspace.h
-lib/libmutter-2.so
-lib/libmutter-2.so.0
-lib/libmutter-2.so.0.0.0
-lib/mutter/Cally-2.gir
-lib/mutter/Cally-2.typelib
-lib/mutter/Clutter-2.gir
-lib/mutter/Clutter-2.typelib
-lib/mutter/ClutterX11-2.gir
-lib/mutter/ClutterX11-2.typelib
-lib/mutter/Cogl-2.gir
-lib/mutter/Cogl-2.typelib
-lib/mutter/CoglPango-2.gir
-lib/mutter/CoglPango-2.typelib
-lib/mutter/Meta-2.gir
-lib/mutter/Meta-2.typelib
-lib/mutter/libmutter-clutter-2.so
-lib/mutter/libmutter-cogl-2.so
-lib/mutter/libmutter-cogl-pango-2.so
-lib/mutter/libmutter-cogl-path-2.so
-lib/mutter/plugins/default.so
-libdata/pkgconfig/libmutter-2.pc
-libdata/pkgconfig/mutter-clutter-2.pc
-libdata/pkgconfig/mutter-clutter-x11-2.pc
-libdata/pkgconfig/mutter-cogl-2.pc
-libdata/pkgconfig/mutter-cogl-pango-2.pc
-libdata/pkgconfig/mutter-cogl-path-2.pc
+include/mutter-6/clutter/cally/cally-actor.h
+include/mutter-6/clutter/cally/cally-clone.h
+include/mutter-6/clutter/cally/cally-factory.h
+include/mutter-6/clutter/cally/cally-group.h
+include/mutter-6/clutter/cally/cally-main.h
+include/mutter-6/clutter/cally/cally-rectangle.h
+include/mutter-6/clutter/cally/cally-root.h
+include/mutter-6/clutter/cally/cally-stage.h
+include/mutter-6/clutter/cally/cally-text.h
+include/mutter-6/clutter/cally/cally-util.h
+include/mutter-6/clutter/cally/cally.h
+include/mutter-6/clutter/clutter/clutter-action.h
+include/mutter-6/clutter/clutter/clutter-actor-meta.h
+include/mutter-6/clutter/clutter/clutter-actor.h
+include/mutter-6/clutter/clutter/clutter-align-constraint.h
+include/mutter-6/clutter/clutter/clutter-animatable.h
+include/mutter-6/clutter/clutter/clutter-autocleanups.h
+include/mutter-6/clutter/clutter/clutter-backend.h
+include/mutter-6/clutter/clutter/clutter-bin-layout.h
+include/mutter-6/clutter/clutter/clutter-bind-constraint.h
+include/mutter-6/clutter/clutter/clutter-binding-pool.h
+include/mutter-6/clutter/clutter/clutter-blur-effect.h
+include/mutter-6/clutter/clutter/clutter-box-layout.h
+include/mutter-6/clutter/clutter/clutter-brightness-contrast-effect.h
+include/mutter-6/clutter/clutter/clutter-cairo.h
+include/mutter-6/clutter/clutter/clutter-canvas.h
+include/mutter-6/clutter/clutter/clutter-child-meta.h
+include/mutter-6/clutter/clutter/clutter-click-action.h
+include/mutter-6/clutter/clutter/clutter-clone.h
+include/mutter-6/clutter/clutter/clutter-color-static.h
+include/mutter-6/clutter/clutter/clutter-color.h
+include/mutter-6/clutter/clutter/clutter-colorize-effect.h
+include/mutter-6/clutter/clutter/clutter-config.h
+include/mutter-6/clutter/clutter/clutter-constraint.h
+include/mutter-6/clutter/clutter/clutter-container.h
+include/mutter-6/clutter/clutter/clutter-content.h
+include/mutter-6/clutter/clutter/clutter-deform-effect.h
+include/mutter-6/clutter/clutter/clutter-deprecated.h
+include/mutter-6/clutter/clutter/clutter-desaturate-effect.h
+include/mutter-6/clutter/clutter/clutter-drag-action.h
+include/mutter-6/clutter/clutter/clutter-drop-action.h
+include/mutter-6/clutter/clutter/clutter-effect.h
+include/mutter-6/clutter/clutter/clutter-enum-types.h
+include/mutter-6/clutter/clutter/clutter-enums.h
+include/mutter-6/clutter/clutter/clutter-event.h
+include/mutter-6/clutter/clutter/clutter-feature.h
+include/mutter-6/clutter/clutter/clutter-fixed-layout.h
+include/mutter-6/clutter/clutter/clutter-flow-layout.h
+include/mutter-6/clutter/clutter/clutter-gesture-action.h
+include/mutter-6/clutter/clutter/clutter-grid-layout.h
+include/mutter-6/clutter/clutter/clutter-group.h
+include/mutter-6/clutter/clutter/clutter-image.h
+include/mutter-6/clutter/clutter/clutter-input-device-tool.h
+include/mutter-6/clutter/clutter/clutter-input-device.h
+include/mutter-6/clutter/clutter/clutter-input-focus.h
+include/mutter-6/clutter/clutter/clutter-input-method.h
+include/mutter-6/clutter/clutter/clutter-interval.h
+include/mutter-6/clutter/clutter/clutter-keyframe-transition.h
+include/mutter-6/clutter/clutter/clutter-keymap.h
+include/mutter-6/clutter/clutter/clutter-keysyms.h
+include/mutter-6/clutter/clutter/clutter-layout-manager.h
+include/mutter-6/clutter/clutter/clutter-layout-meta.h
+include/mutter-6/clutter/clutter/clutter-macros.h
+include/mutter-6/clutter/clutter/clutter-main.h
+include/mutter-6/clutter/clutter/clutter-marshal.h
+include/mutter-6/clutter/clutter/clutter-mutter.h
+include/mutter-6/clutter/clutter/clutter-offscreen-effect.h
+include/mutter-6/clutter/clutter/clutter-page-turn-effect.h
+include/mutter-6/clutter/clutter/clutter-paint-context.h
+include/mutter-6/clutter/clutter/clutter-paint-node.h
+include/mutter-6/clutter/clutter/clutter-paint-nodes.h
+include/mutter-6/clutter/clutter/clutter-pan-action.h
+include/mutter-6/clutter/clutter/clutter-path-constraint.h
+include/mutter-6/clutter/clutter/clutter-path.h
+include/mutter-6/clutter/clutter/clutter-pick-context.h
+include/mutter-6/clutter/clutter/clutter-property-transition.h
+include/mutter-6/clutter/clutter/clutter-rotate-action.h
+include/mutter-6/clutter/clutter/clutter-script.h
+include/mutter-6/clutter/clutter/clutter-scriptable.h
+include/mutter-6/clutter/clutter/clutter-scroll-actor.h
+include/mutter-6/clutter/clutter/clutter-seat.h
+include/mutter-6/clutter/clutter/clutter-settings.h
+include/mutter-6/clutter/clutter/clutter-shader-effect.h
+include/mutter-6/clutter/clutter/clutter-shader-types.h
+include/mutter-6/clutter/clutter/clutter-snap-constraint.h
+include/mutter-6/clutter/clutter/clutter-stage-manager.h
+include/mutter-6/clutter/clutter/clutter-stage-view.h
+include/mutter-6/clutter/clutter/clutter-stage.h
+include/mutter-6/clutter/clutter/clutter-swipe-action.h
+include/mutter-6/clutter/clutter/clutter-tap-action.h
+include/mutter-6/clutter/clutter/clutter-text-buffer.h
+include/mutter-6/clutter/clutter/clutter-text.h
+include/mutter-6/clutter/clutter/clutter-timeline.h
+include/mutter-6/clutter/clutter/clutter-transition-group.h
+include/mutter-6/clutter/clutter/clutter-transition.h
+include/mutter-6/clutter/clutter/clutter-types.h
+include/mutter-6/clutter/clutter/clutter-units.h
+include/mutter-6/clutter/clutter/clutter-virtual-input-device.h
+include/mutter-6/clutter/clutter/clutter-zoom-action.h
+include/mutter-6/clutter/clutter/clutter.h
+include/mutter-6/clutter/clutter/deprecated/clutter-actor.h
+include/mutter-6/clutter/clutter/deprecated/clutter-alpha.h
+include/mutter-6/clutter/clutter/deprecated/clutter-animation.h
+include/mutter-6/clutter/clutter/deprecated/clutter-box.h
+include/mutter-6/clutter/clutter/deprecated/clutter-container.h
+include/mutter-6/clutter/clutter/deprecated/clutter-group.h
+include/mutter-6/clutter/clutter/deprecated/clutter-rectangle.h
+include/mutter-6/clutter/clutter/deprecated/clutter-stage.h
+include/mutter-6/clutter/clutter/deprecated/clutter-state.h
+include/mutter-6/clutter/clutter/deprecated/clutter-timeline.h
+include/mutter-6/clutter/clutter/x11/clutter-x11.h
+include/mutter-6/cogl/cogl-pango/cogl-pango.h
+include/mutter-6/cogl/cogl-path/cogl-path-enum-types.h
+include/mutter-6/cogl/cogl-path/cogl-path-functions.h
+include/mutter-6/cogl/cogl-path/cogl-path-types.h
+include/mutter-6/cogl/cogl-path/cogl-path.h
+include/mutter-6/cogl/cogl/cogl-atlas-texture.h
+include/mutter-6/cogl/cogl/cogl-attribute-buffer.h
+include/mutter-6/cogl/cogl/cogl-attribute.h
+include/mutter-6/cogl/cogl/cogl-bitmap.h
+include/mutter-6/cogl/cogl/cogl-buffer.h
+include/mutter-6/cogl/cogl/cogl-color.h
+include/mutter-6/cogl/cogl/cogl-context.h
+include/mutter-6/cogl/cogl/cogl-defines.h
+include/mutter-6/cogl/cogl/cogl-depth-state.h
+include/mutter-6/cogl/cogl/cogl-display.h
+include/mutter-6/cogl/cogl/cogl-dma-buf-handle.h
+include/mutter-6/cogl/cogl/cogl-egl-defines.h
+include/mutter-6/cogl/cogl/cogl-egl.h
+include/mutter-6/cogl/cogl/cogl-fence.h
+include/mutter-6/cogl/cogl/cogl-frame-info.h
+include/mutter-6/cogl/cogl/cogl-framebuffer.h
+include/mutter-6/cogl/cogl/cogl-glib-source.h
+include/mutter-6/cogl/cogl/cogl-glx.h
+include/mutter-6/cogl/cogl/cogl-gtype-private.h
+include/mutter-6/cogl/cogl/cogl-index-buffer.h
+include/mutter-6/cogl/cogl/cogl-indices.h
+include/mutter-6/cogl/cogl/cogl-macros.h
+include/mutter-6/cogl/cogl/cogl-matrix-stack.h
+include/mutter-6/cogl/cogl/cogl-matrix.h
+include/mutter-6/cogl/cogl/cogl-meta-texture.h
+include/mutter-6/cogl/cogl/cogl-object.h
+include/mutter-6/cogl/cogl/cogl-offscreen.h
+include/mutter-6/cogl/cogl/cogl-onscreen-template.h
+include/mutter-6/cogl/cogl/cogl-onscreen.h
+include/mutter-6/cogl/cogl/cogl-output.h
+include/mutter-6/cogl/cogl/cogl-pipeline-layer-state.h
+include/mutter-6/cogl/cogl/cogl-pipeline-state.h
+include/mutter-6/cogl/cogl/cogl-pipeline.h
+include/mutter-6/cogl/cogl/cogl-pixel-buffer.h
+include/mutter-6/cogl/cogl/cogl-pixel-format.h
+include/mutter-6/cogl/cogl/cogl-poll.h
+include/mutter-6/cogl/cogl/cogl-primitive-texture.h
+include/mutter-6/cogl/cogl/cogl-primitive.h
+include/mutter-6/cogl/cogl/cogl-renderer.h
+include/mutter-6/cogl/cogl/cogl-snippet.h
+include/mutter-6/cogl/cogl/cogl-sub-texture.h
+include/mutter-6/cogl/cogl/cogl-swap-chain.h
+include/mutter-6/cogl/cogl/cogl-texture-2d-sliced.h
+include/mutter-6/cogl/cogl/cogl-texture-2d.h
+include/mutter-6/cogl/cogl/cogl-texture-pixmap-x11.h
+include/mutter-6/cogl/cogl/cogl-texture.h
+include/mutter-6/cogl/cogl/cogl-trace.h
+include/mutter-6/cogl/cogl/cogl-types.h
+include/mutter-6/cogl/cogl/cogl-version.h
+include/mutter-6/cogl/cogl/cogl-xlib-renderer.h
+include/mutter-6/cogl/cogl/cogl-xlib.h
+include/mutter-6/cogl/cogl/cogl.h
+include/mutter-6/cogl/cogl/cogl1-context.h
+include/mutter-6/cogl/cogl/deprecated/cogl-auto-texture.h
+include/mutter-6/cogl/cogl/deprecated/cogl-clutter.h
+include/mutter-6/cogl/cogl/deprecated/cogl-material-compat.h
+include/mutter-6/cogl/cogl/deprecated/cogl-shader.h
+include/mutter-6/cogl/cogl/deprecated/cogl-type-casts.h
+include/mutter-6/cogl/cogl/gl-prototypes/cogl-core-functions.h
+include/mutter-6/cogl/cogl/gl-prototypes/cogl-gles2-functions.h
+include/mutter-6/cogl/cogl/gl-prototypes/cogl-glsl-functions.h
+include/mutter-6/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
+include/mutter-6/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
+include/mutter-6/meta/barrier.h
+include/mutter-6/meta/boxes.h
+include/mutter-6/meta/common.h
+include/mutter-6/meta/compositor-mutter.h
+include/mutter-6/meta/compositor.h
+include/mutter-6/meta/display.h
+include/mutter-6/meta/group.h
+include/mutter-6/meta/keybindings.h
+include/mutter-6/meta/main.h
+include/mutter-6/meta/meta-backend.h
+include/mutter-6/meta/meta-background-actor.h
+include/mutter-6/meta/meta-background-group.h
+include/mutter-6/meta/meta-background-image.h
+include/mutter-6/meta/meta-background.h
+include/mutter-6/meta/meta-close-dialog.h
+include/mutter-6/meta/meta-cursor-tracker.h
+include/mutter-6/meta/meta-dnd.h
+include/mutter-6/meta/meta-enum-types.h
+include/mutter-6/meta/meta-idle-monitor.h
+include/mutter-6/meta/meta-inhibit-shortcuts-dialog.h
+include/mutter-6/meta/meta-launch-context.h
+include/mutter-6/meta/meta-monitor-manager.h
+include/mutter-6/meta/meta-plugin.h
+include/mutter-6/meta/meta-remote-access-controller.h
+include/mutter-6/meta/meta-selection-source-memory.h
+include/mutter-6/meta/meta-selection-source.h
+include/mutter-6/meta/meta-selection.h
+include/mutter-6/meta/meta-settings.h
+include/mutter-6/meta/meta-shadow-factory.h
+include/mutter-6/meta/meta-shaped-texture.h
+include/mutter-6/meta/meta-sound-player.h
+include/mutter-6/meta/meta-stage.h
+include/mutter-6/meta/meta-startup-notification.h
+include/mutter-6/meta/meta-version.h
+include/mutter-6/meta/meta-window-actor.h
+include/mutter-6/meta/meta-window-group.h
+include/mutter-6/meta/meta-window-shape.h
+include/mutter-6/meta/meta-workspace-manager.h
+include/mutter-6/meta/meta-x11-display.h
+include/mutter-6/meta/meta-x11-errors.h
+include/mutter-6/meta/prefs.h
+include/mutter-6/meta/theme.h
+include/mutter-6/meta/types.h
+include/mutter-6/meta/util.h
+include/mutter-6/meta/window.h
+include/mutter-6/meta/workspace.h
+lib/libmutter-6.so
+lib/libmutter-6.so.0
+lib/libmutter-6.so.0.0.0
+lib/mutter-6/Cally-6.gir
+lib/mutter-6/Cally-6.typelib
+lib/mutter-6/Clutter-6.gir
+lib/mutter-6/Clutter-6.typelib
+lib/mutter-6/ClutterX11-6.gir
+lib/mutter-6/ClutterX11-6.typelib
+lib/mutter-6/Cogl-6.gir
+lib/mutter-6/Cogl-6.typelib
+lib/mutter-6/CoglPango-6.gir
+lib/mutter-6/CoglPango-6.typelib
+lib/mutter-6/Meta-6.gir
+lib/mutter-6/Meta-6.typelib
+lib/mutter-6/libmutter-clutter-6.so
+lib/mutter-6/libmutter-clutter-6.so.0
+lib/mutter-6/libmutter-clutter-6.so.0.0.0
+lib/mutter-6/libmutter-cogl-6.so
+lib/mutter-6/libmutter-cogl-6.so.0
+lib/mutter-6/libmutter-cogl-6.so.0.0.0
+lib/mutter-6/libmutter-cogl-pango-6.so
+lib/mutter-6/libmutter-cogl-pango-6.so.0
+lib/mutter-6/libmutter-cogl-pango-6.so.0.0.0
+lib/mutter-6/libmutter-cogl-path-6.so
+lib/mutter-6/libmutter-cogl-path-6.so.0
+lib/mutter-6/libmutter-cogl-path-6.so.0.0.0
+lib/mutter-6/plugins/libdefault.so
+libdata/pkgconfig/libmutter-6.pc
+libdata/pkgconfig/mutter-clutter-6.pc
+libdata/pkgconfig/mutter-clutter-x11-6.pc
+libdata/pkgconfig/mutter-cogl-6.pc
+libdata/pkgconfig/mutter-cogl-pango-6.pc
+libdata/pkgconfig/mutter-cogl-path-6.pc
libexec/mutter-restart-helper
man/man1/mutter.1.gz
share/GConf/gsettings/mutter-schemas.convert
diff --git a/x11-wm/phoc/Makefile b/x11-wm/phoc/Makefile
index 31d0ae04f7a7..9dfc8ab774d0 100644
--- a/x11-wm/phoc/Makefile
+++ b/x11-wm/phoc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= phoc
DISTVERSIONPREFIX= v
DISTVERSION= 0.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MAINTAINER= jbeich@FreeBSD.org
diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
index 7bd8cb219c61..99e19f4b2a4c 100644
--- a/x11/cinnamon-screensaver/Makefile
+++ b/x11/cinnamon-screensaver/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cinnamon-screensaver
PORTVERSION= 2.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
DIST_SUBDIR= gnome3
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 481730ffc7f5..74975d754008 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cinnamon
PORTVERSION= 2.4.6
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= x11 gnome
DIST_SUBDIR= gnome3
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index e7bc25c150a9..294b84aaab6b 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -11,6 +11,9 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 3 display manager
+LICENSE= GPLv2
+LICENSE_FILES= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= zenity>=3.0.0:x11/zenity \
itstool:textproc/itstool \
iso-codes>=0:misc/iso-codes
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 21c409e49e99..7d3ae00d1561 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-desktop
-PORTVERSION= 3.28.2
+PORTVERSION= 3.38.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Additional UI API for GNOME 3
@@ -26,20 +26,14 @@ RUN_DEPENDS= iso-codes>=0:misc/iso-codes \
cantarell-fonts>=0:x11-fonts/cantarell-fonts \
xkeyboard-config>=0:x11/xkeyboard-config
-USES= bison gettext gmake gnome libtool localbase pathfix \
+USES= bison gettext gnome localbase:ldflags meson \
pkgconfig python:3.4+ tar:xz xorg
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection:build
USE_XORG= x11
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \
- --disable-udev
-INSTALL_TARGET= install-strip
-
-post-patch:
- @${REINPLACE_CMD} -e 's|xsltproc -o| xsltproc --nonet -o|g' \
- ${WRKSRC}/desktop-docs/fdl/Makefile.in \
- ${WRKSRC}/desktop-docs/gpl/Makefile.in \
- ${WRKSRC}/desktop-docs/lgpl/Makefile.in
+MESON_ARGS= -Dgnome_distributor="FreeBSD GNOME Project" \
+ -Dudev=disabled \
+ -Dsystemd=disabled \
+ -Dgtk_doc=false
.include <bsd.port.mk>
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 8f9da2dfff79..8fa49295818d 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525954310
-SHA256 (gnome3/gnome-desktop-3.28.2.tar.xz) = 605087bff17c61bc167ccb5a61ed4d06eab922fcce384576ed2a3577214c8330
-SIZE (gnome3/gnome-desktop-3.28.2.tar.xz) = 1077556
+TIMESTAMP = 1601308023
+SHA256 (gnome/gnome-desktop-3.38.0.tar.xz) = 089dbbe3c66fe5575659a4a385d5d4bbd99cf637034df317f21cf586b5dd6b90
+SIZE (gnome/gnome-desktop-3.38.0.tar.xz) = 745324
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 6cbaf46d6015..dbe1ce58f4bc 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -7,44 +7,17 @@ include/gnome-desktop-3.0/libgnome-desktop/gnome-languages.h
include/gnome-desktop-3.0/libgnome-desktop/gnome-pnp-ids.h
include/gnome-desktop-3.0/libgnome-desktop/gnome-rr-config.h
include/gnome-desktop-3.0/libgnome-desktop/gnome-rr.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-systemd.h
include/gnome-desktop-3.0/libgnome-desktop/gnome-wall-clock.h
include/gnome-desktop-3.0/libgnome-desktop/gnome-xkb-info.h
lib/girepository-1.0/GnomeDesktop-3.0.typelib
lib/libgnome-desktop-3.so
-lib/libgnome-desktop-3.so.17
-lib/libgnome-desktop-3.so.17.0.0
+lib/libgnome-desktop-3.so.19
+lib/libgnome-desktop-3.so.19.0.8
libdata/pkgconfig/gnome-desktop-3.0.pc
libexec/gnome-rr-debug
share/gir-1.0/GnomeDesktop-3.0.gir
share/gnome/gnome-version.xml
-share/gtk-doc/html/gnome-desktop3/GnomeDesktopThumbnailFactory.html
-share/gtk-doc/html/gnome-desktop3/GnomeIdleMonitor.html
-share/gtk-doc/html/gnome-desktop3/GnomeWallClock.html
-share/gtk-doc/html/gnome-desktop3/GnomeXkbInfo.html
-share/gtk-doc/html/gnome-desktop3/annotation-glossary.html
-share/gtk-doc/html/gnome-desktop3/background.html
-share/gtk-doc/html/gnome-desktop3/gnome-desktop3-Language-Utilities.html
-share/gtk-doc/html/gnome-desktop3/gnome-desktop3-gnome-bg.html
-share/gtk-doc/html/gnome-desktop3/gnome-desktop3-gnome-pnp-ids.html
-share/gtk-doc/html/gnome-desktop3/gnome-desktop3-gnome-rr-config.html
-share/gtk-doc/html/gnome-desktop3/gnome-desktop3-gnome-rr.html
-share/gtk-doc/html/gnome-desktop3/gnome-desktop3.devhelp2
-share/gtk-doc/html/gnome-desktop3/home.png
-share/gtk-doc/html/gnome-desktop3/idle-monitor.html
-share/gtk-doc/html/gnome-desktop3/index.html
-share/gtk-doc/html/gnome-desktop3/intro.html
-share/gtk-doc/html/gnome-desktop3/languages.html
-share/gtk-doc/html/gnome-desktop3/left-insensitive.png
-share/gtk-doc/html/gnome-desktop3/left.png
-share/gtk-doc/html/gnome-desktop3/randr.html
-share/gtk-doc/html/gnome-desktop3/right-insensitive.png
-share/gtk-doc/html/gnome-desktop3/right.png
-share/gtk-doc/html/gnome-desktop3/style.css
-share/gtk-doc/html/gnome-desktop3/thumbnail.html
-share/gtk-doc/html/gnome-desktop3/up-insensitive.png
-share/gtk-doc/html/gnome-desktop3/up.png
-share/gtk-doc/html/gnome-desktop3/wall-clock.html
-share/gtk-doc/html/gnome-desktop3/xkb-info.html
share/help/C/fdl/index.docbook
share/help/C/gpl/index.docbook
share/help/C/lgpl/index.docbook
@@ -54,7 +27,9 @@ share/help/ar/lgpl/index.docbook
share/help/ca/fdl/index.docbook
share/help/ca/gpl/index.docbook
share/help/ca/lgpl/index.docbook
+share/help/cs/fdl/index.docbook
share/help/cs/gpl/index.docbook
+share/help/cs/lgpl/index.docbook
share/help/de/fdl/index.docbook
share/help/de/gpl/index.docbook
share/help/de/lgpl/index.docbook
@@ -74,6 +49,7 @@ share/help/fr/gpl/index.docbook
share/help/fr/lgpl/index.docbook
share/help/gl/fdl/index.docbook
share/help/gl/gpl/index.docbook
+share/help/gl/lgpl/index.docbook
share/help/hu/fdl/index.docbook
share/help/hu/gpl/index.docbook
share/help/hu/lgpl/index.docbook
@@ -97,6 +73,9 @@ share/help/sr@latin/gpl/index.docbook
share/help/sv/fdl/index.docbook
share/help/sv/gpl/index.docbook
share/help/sv/lgpl/index.docbook
+share/help/tr/fdl/index.docbook
+share/help/tr/gpl/index.docbook
+share/help/tr/lgpl/index.docbook
share/help/uk/fdl/index.docbook
share/help/uk/gpl/index.docbook
share/help/uk/lgpl/index.docbook
@@ -122,6 +101,7 @@ share/locale/br/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/bs/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/ca/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ckb/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/crh/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/cs/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/csb/LC_MESSAGES/gnome-desktop-3.0.mo
@@ -173,6 +153,7 @@ share/locale/lv/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/mai/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/mg/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/mi/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/mjw/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/mk/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/ml/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/mn/LC_MESSAGES/gnome-desktop-3.0.mo
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index b196e870a814..a965702062ca 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-session
-PORTVERSION= 3.28.1
-PORTREVISION= 3
+PORTVERSION= 3.38.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Session component for the GNOME 3 desktop
@@ -30,6 +29,7 @@ USE_XORG= ice sm x11 xcomposite xtrans
USE_GL= egl gl glesv2
INSTALLS_ICONS= yes
MESON_ARGS= -Dsystemd=false \
+ -Dsystemd_session=disable \
-Dsystemd_journal=false \
-Dconsolekit=true
BINARY_ALIAS= python3=${PYTHON_VERSION}
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 03ee0d36e289..c2be7dfa307e 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524855068
-SHA256 (gnome3/gnome-session-3.28.1.tar.xz) = b893f75c8d34dbdbbc5c56429a17b59136ac7402e12f384da856dcfc725cd592
-SIZE (gnome3/gnome-session-3.28.1.tar.xz) = 480196
+TIMESTAMP = 1601309787
+SHA256 (gnome/gnome-session-3.38.0.tar.xz) = 7bcc0eb2cdba4b3f6d1b459b3a30873b7bb65b383c1f6a5f63c3e3b5c7943d67
+SIZE (gnome/gnome-session-3.38.0.tar.xz) = 481300
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index e5b818f8e586..384531a67973 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -30,6 +30,7 @@ share/locale/br/LC_MESSAGES/gnome-session-3.0.mo
share/locale/bs/LC_MESSAGES/gnome-session-3.0.mo
share/locale/ca/LC_MESSAGES/gnome-session-3.0.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ckb/LC_MESSAGES/gnome-session-3.0.mo
share/locale/crh/LC_MESSAGES/gnome-session-3.0.mo
share/locale/cs/LC_MESSAGES/gnome-session-3.0.mo
share/locale/csb/LC_MESSAGES/gnome-session-3.0.mo
@@ -66,6 +67,7 @@ share/locale/is/LC_MESSAGES/gnome-session-3.0.mo
share/locale/it/LC_MESSAGES/gnome-session-3.0.mo
share/locale/ja/LC_MESSAGES/gnome-session-3.0.mo
share/locale/ka/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/kab/LC_MESSAGES/gnome-session-3.0.mo
share/locale/kk/LC_MESSAGES/gnome-session-3.0.mo
share/locale/km/LC_MESSAGES/gnome-session-3.0.mo
share/locale/kn/LC_MESSAGES/gnome-session-3.0.mo
@@ -76,6 +78,7 @@ share/locale/lv/LC_MESSAGES/gnome-session-3.0.mo
share/locale/mai/LC_MESSAGES/gnome-session-3.0.mo
share/locale/mg/LC_MESSAGES/gnome-session-3.0.mo
share/locale/mi/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/mjw/LC_MESSAGES/gnome-session-3.0.mo
share/locale/mk/LC_MESSAGES/gnome-session-3.0.mo
share/locale/ml/LC_MESSAGES/gnome-session-3.0.mo
share/locale/mn/LC_MESSAGES/gnome-session-3.0.mo
diff --git a/x11/gnome-shell-extensions/Makefile b/x11/gnome-shell-extensions/Makefile
index 2bdd955f4da6..9af3d891edab 100644
--- a/x11/gnome-shell-extensions/Makefile
+++ b/x11/gnome-shell-extensions/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-shell-extensions
-PORTVERSION= 3.28.1
-PORTREVISION= 1
+PORTVERSION= 3.36.3
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME desktop shell extensions
@@ -16,20 +15,19 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= sassc:textproc/sassc
LIB_DEPENDS= libgjs.so:lang/gjs
-RUN_DEPENDS= gnome-shell>=3.28.0:x11/gnome-shell
+RUN_DEPENDS= gnome-shell>=3.36.0:x11/gnome-shell
PORTSCOUT= limitw:1,even
NO_ARCH= yes
USES= gettext gnome meson pkgconfig tar:xz
-USE_GNOME= glib20 gnomedesktop3 intlhack
+USE_GNOME= glib20 gnomedesktop3
USE_LDCONFIG= yes
MESON_ARGS= -Dextension_set=all \
-Dclassic_mode=true
-GLIB_SCHEMAS= org.gnome.shell.extensions.auto-move-windows.gschema.xml \
- org.gnome.shell.extensions.classic-overrides.gschema.xml \
- org.gnome.shell.extensions.example.gschema.xml \
+GLIB_SCHEMAS= 00_org.gnome.shell.extensions.classic.gschema.override \
+ org.gnome.shell.extensions.auto-move-windows.gschema.xml \
org.gnome.shell.extensions.native-window-placement.gschema.xml \
org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml \
org.gnome.shell.extensions.user-theme.gschema.xml \
diff --git a/x11/gnome-shell-extensions/distinfo b/x11/gnome-shell-extensions/distinfo
index 551336673f0c..e4a77174395e 100644
--- a/x11/gnome-shell-extensions/distinfo
+++ b/x11/gnome-shell-extensions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525374861
-SHA256 (gnome3/gnome-shell-extensions-3.28.1.tar.xz) = e9c602338b529c8282e7d13e075703028ea384a1d946f3e8ce760e6c5b469058
-SIZE (gnome3/gnome-shell-extensions-3.28.1.tar.xz) = 199180
+TIMESTAMP = 1601309407
+SHA256 (gnome/gnome-shell-extensions-3.36.3.tar.xz) = 2b674c4dc16f2ce46f07eea00a1754b243a19b469165a171cb1fbdbe376ee3b1
+SIZE (gnome/gnome-shell-extensions-3.36.3.tar.xz) = 207956
diff --git a/x11/gnome-shell-extensions/pkg-plist b/x11/gnome-shell-extensions/pkg-plist
index 057fe92c24f2..f9a183cf8e12 100644
--- a/x11/gnome-shell-extensions/pkg-plist
+++ b/x11/gnome-shell-extensions/pkg-plist
@@ -1,59 +1,43 @@
share/gnome-session/sessions/gnome-classic.session
-share/gnome-shell/extensions/alternate-tab@gnome-shell-extensions.gcampax.github.com/convenience.js
-share/gnome-shell/extensions/alternate-tab@gnome-shell-extensions.gcampax.github.com/extension.js
-share/gnome-shell/extensions/alternate-tab@gnome-shell-extensions.gcampax.github.com/metadata.json
-share/gnome-shell/extensions/alternate-tab@gnome-shell-extensions.gcampax.github.com/prefs.js
-share/gnome-shell/extensions/alternate-tab@gnome-shell-extensions.gcampax.github.com/stylesheet.css
-share/gnome-shell/extensions/apps-menu@gnome-shell-extensions.gcampax.github.com/convenience.js
share/gnome-shell/extensions/apps-menu@gnome-shell-extensions.gcampax.github.com/extension.js
share/gnome-shell/extensions/apps-menu@gnome-shell-extensions.gcampax.github.com/metadata.json
share/gnome-shell/extensions/apps-menu@gnome-shell-extensions.gcampax.github.com/stylesheet.css
-share/gnome-shell/extensions/auto-move-windows@gnome-shell-extensions.gcampax.github.com/convenience.js
share/gnome-shell/extensions/auto-move-windows@gnome-shell-extensions.gcampax.github.com/extension.js
share/gnome-shell/extensions/auto-move-windows@gnome-shell-extensions.gcampax.github.com/metadata.json
share/gnome-shell/extensions/auto-move-windows@gnome-shell-extensions.gcampax.github.com/prefs.js
share/gnome-shell/extensions/auto-move-windows@gnome-shell-extensions.gcampax.github.com/stylesheet.css
-share/gnome-shell/extensions/drive-menu@gnome-shell-extensions.gcampax.github.com/convenience.js
share/gnome-shell/extensions/drive-menu@gnome-shell-extensions.gcampax.github.com/extension.js
share/gnome-shell/extensions/drive-menu@gnome-shell-extensions.gcampax.github.com/metadata.json
share/gnome-shell/extensions/drive-menu@gnome-shell-extensions.gcampax.github.com/stylesheet.css
-share/gnome-shell/extensions/example@gnome-shell-extensions.gcampax.github.com/convenience.js
-share/gnome-shell/extensions/example@gnome-shell-extensions.gcampax.github.com/extension.js
-share/gnome-shell/extensions/example@gnome-shell-extensions.gcampax.github.com/metadata.json
-share/gnome-shell/extensions/example@gnome-shell-extensions.gcampax.github.com/prefs.js
-share/gnome-shell/extensions/example@gnome-shell-extensions.gcampax.github.com/stylesheet.css
-share/gnome-shell/extensions/launch-new-instance@gnome-shell-extensions.gcampax.github.com/convenience.js
+share/gnome-shell/extensions/horizontal-workspaces@gnome-shell-extensions.gcampax.github.com/extension.js
+share/gnome-shell/extensions/horizontal-workspaces@gnome-shell-extensions.gcampax.github.com/metadata.json
+share/gnome-shell/extensions/horizontal-workspaces@gnome-shell-extensions.gcampax.github.com/stylesheet.css
share/gnome-shell/extensions/launch-new-instance@gnome-shell-extensions.gcampax.github.com/extension.js
share/gnome-shell/extensions/launch-new-instance@gnome-shell-extensions.gcampax.github.com/metadata.json
share/gnome-shell/extensions/launch-new-instance@gnome-shell-extensions.gcampax.github.com/stylesheet.css
-share/gnome-shell/extensions/native-window-placement@gnome-shell-extensions.gcampax.github.com/convenience.js
share/gnome-shell/extensions/native-window-placement@gnome-shell-extensions.gcampax.github.com/extension.js
share/gnome-shell/extensions/native-window-placement@gnome-shell-extensions.gcampax.github.com/metadata.json
share/gnome-shell/extensions/native-window-placement@gnome-shell-extensions.gcampax.github.com/stylesheet.css
-share/gnome-shell/extensions/places-menu@gnome-shell-extensions.gcampax.github.com/convenience.js
share/gnome-shell/extensions/places-menu@gnome-shell-extensions.gcampax.github.com/extension.js
share/gnome-shell/extensions/places-menu@gnome-shell-extensions.gcampax.github.com/metadata.json
share/gnome-shell/extensions/places-menu@gnome-shell-extensions.gcampax.github.com/placeDisplay.js
share/gnome-shell/extensions/places-menu@gnome-shell-extensions.gcampax.github.com/stylesheet.css
-share/gnome-shell/extensions/screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com/convenience.js
share/gnome-shell/extensions/screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com/extension.js
share/gnome-shell/extensions/screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com/metadata.json
share/gnome-shell/extensions/screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com/stylesheet.css
-share/gnome-shell/extensions/user-theme@gnome-shell-extensions.gcampax.github.com/convenience.js
share/gnome-shell/extensions/user-theme@gnome-shell-extensions.gcampax.github.com/extension.js
share/gnome-shell/extensions/user-theme@gnome-shell-extensions.gcampax.github.com/metadata.json
share/gnome-shell/extensions/user-theme@gnome-shell-extensions.gcampax.github.com/stylesheet.css
share/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/classic.css
-share/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/convenience.js
share/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/extension.js
share/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/metadata.json
share/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/prefs.js
share/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/stylesheet.css
-share/gnome-shell/extensions/windowsNavigator@gnome-shell-extensions.gcampax.github.com/convenience.js
+share/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/windowPicker.js
+share/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/workspaceIndicator.js
share/gnome-shell/extensions/windowsNavigator@gnome-shell-extensions.gcampax.github.com/extension.js
share/gnome-shell/extensions/windowsNavigator@gnome-shell-extensions.gcampax.github.com/metadata.json
share/gnome-shell/extensions/windowsNavigator@gnome-shell-extensions.gcampax.github.com/stylesheet.css
-share/gnome-shell/extensions/workspace-indicator@gnome-shell-extensions.gcampax.github.com/convenience.js
share/gnome-shell/extensions/workspace-indicator@gnome-shell-extensions.gcampax.github.com/extension.js
share/gnome-shell/extensions/workspace-indicator@gnome-shell-extensions.gcampax.github.com/metadata.json
share/gnome-shell/extensions/workspace-indicator@gnome-shell-extensions.gcampax.github.com/prefs.js
@@ -107,6 +91,7 @@ share/locale/kn/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/ko/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/lt/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/lv/LC_MESSAGES/gnome-shell-extensions.mo
+share/locale/mjw/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/ml/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/mr/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/ms/LC_MESSAGES/gnome-shell-extensions.mo
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 3efb542504d2..15becd3d8f6c 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-shell
-PORTVERSION= 3.28.3
-PORTREVISION= 8
+PORTVERSION= 3.36.6
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Next generation GNOME desktop shell
@@ -16,10 +15,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \
sassc:textproc/sassc \
- gnome-control-center:sysutils/gnome-control-center
+ gnome-control-center:sysutils/gnome-control-center \
+ a2x:textproc/asciidoc
LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
libdrm.so:graphics/libdrm \
- libmutter-2.so:x11-wm/mutter \
+ libmutter-6.so:x11-wm/mutter \
libatk-bridge-2.0.so:accessibility/at-spi2-atk \
libsoup-2.4.so:devel/libsoup \
libjson-glib-1.0.so:devel/json-glib \
@@ -34,8 +34,11 @@ LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
libcanberra.so:audio/libcanberra \
libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libp11-kit.so:security/p11-kit \
- libgjs.so:lang/gjs
-RUN_DEPENDS= gnome-control-center:sysutils/gnome-control-center
+ libgjs.so:lang/gjs \
+ libgraphene-1.0.so:graphics/graphene \
+ libgnome-autoar-0.so:archivers/gnome-autoar
+RUN_DEPENDS= gnome-control-center:sysutils/gnome-control-center \
+ gdm:x11/gdm
PORTSCOUT= limitw:1,even
@@ -43,7 +46,7 @@ USES= compiler:c11 cpe gettext gl gnome libtool localbase meson \
pathfix perl5 pkgconfig python:3.4+ shebangfix tar:xz \
webplugin:native xorg
USE_GNOME= cairo evolutiondataserver3 gdkpixbuf2 introspection \
- libxslt:build libxml2
+ libxslt:build libxml2 gnomedesktop3
USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr xtst
USE_GL= egl gbm
USE_GSTREAMER1= yes
@@ -51,16 +54,19 @@ USE_PERL5= build
USE_LDCONFIG= yes
SHEBANG_FILES= src/gnome-shell-perf-tool.in \
src/gnome-shell-extension-tool.in
+BINARY_ALIAS= python3=${PYTHON_CMD}
WEBPLUGIN_NAME= libgnome-shell-browser-plugin.so
WEBPLUGIN_DIR= ${PREFIX}/lib/mozilla/plugins/
WEBPLUGIN_FILES=libgnome-shell-browser-plugin.so
MESON_ARGS= -Dsystemd=false \
- -Dnetworkmanager=false
+ -Dnetworkmanager=false \
+ -Dpython=${PYTHON_CMD}
CPE_VENDOR= gnome
-GLIB_SCHEMAS= org.gnome.shell.gschema.xml
+GLIB_SCHEMAS= org.gnome.shell.gschema.xml \
+ 00_org.gnome.shell.gschema.override
.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
# Work around "New rpath must not be longer than the old one."
@@ -68,12 +74,7 @@ LDFLAGS+= -fuse-ld=lld
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|python3|${PYTHON_VERSION}|g' \
- ${WRKSRC}/meson.build
- @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|g' \
- ${WRKSRC}/src/shell-app-system.c
-
-pre-build:
- @cd ${BUILD_WRKSRC} && ninja src/st/st-scroll-view-fade-generated.c
+ ${REINPLACE_CMD} -e "s,%%PYTHON_CMD%%,${PYTHON_CMD},g" \
+ ${WRKSRC}/src/meson.build
.include <bsd.port.mk>
diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo
index eb16f63e1ba5..a56b2d97e265 100644
--- a/x11/gnome-shell/distinfo
+++ b/x11/gnome-shell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538670467
-SHA256 (gnome3/gnome-shell-3.28.3.tar.xz) = 1c24f5b306fdedbdd7df4a92caef13061302f1cac97838dfcdf30b692352a276
-SIZE (gnome3/gnome-shell-3.28.3.tar.xz) = 1433388
+TIMESTAMP = 1601305988
+SHA256 (gnome/gnome-shell-3.36.6.tar.xz) = 89701e4e3fe3d852ee18047c4f9e0640c9930ea11883c4772c350b7b5a748664
+SIZE (gnome/gnome-shell-3.36.6.tar.xz) = 1775836
diff --git a/x11/gnome-shell/files/patch-js_misc_loginManager.js b/x11/gnome-shell/files/patch-js_misc_loginManager.js
deleted file mode 100644
index f4900004eebb..000000000000
--- a/x11/gnome-shell/files/patch-js_misc_loginManager.js
+++ /dev/null
@@ -1,134 +0,0 @@
-$OpenBSD: patch-js_misc_loginManager_js,v 1.4 2017/11/04 16:44:50 jasper Exp $
-
-REVERT:
-From ddea54a5398c123a4711243e55811c8ba26f8b85 Mon Sep 17 00:00:00 2001
-From: Victor Toso <victortoso@redhat.com>
-Date: Thu, 12 May 2016 09:25:49 +0200
-Subject: ScreenShield: set LockedHint property from systemd
-
-REVERT:
-From a244c1e987502e359c45c0a9bc0012b5bc635553 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Thu, 24 Apr 2014 17:55:56 +0200
-Subject: loginManager: Kill ConsoleKit support
-
-
---- js/misc/loginManager.js.orig 2018-04-05 22:23:32.831383000 +0200
-+++ js/misc/loginManager.js 2018-04-05 22:30:34.647201000 +0200
-@@ -40,15 +40,38 @@ const SystemdLoginSessionIface = '<node> \
- <signal name="Lock" /> \
- <signal name="Unlock" /> \
- <property name="Active" type="b" access="read" /> \
--<method name="SetLockedHint"> \
-- <arg type="b" direction="in"/> \
--</method> \
- </interface> \
- </node>';
-
- const SystemdLoginManager = Gio.DBusProxy.makeProxyWrapper(SystemdLoginManagerIface);
- const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);
-
-+const ConsoleKitManagerIface = '<node> \
-+<interface name="org.freedesktop.ConsoleKit.Manager"> \
-+<method name="CanRestart"> \
-+ <arg type="b" direction="out"/> \
-+</method> \
-+<method name="CanStop"> \
-+ <arg type="b" direction="out"/> \
-+</method> \
-+<method name="Restart" /> \
-+<method name="Stop" /> \
-+<method name="GetCurrentSession"> \
-+ <arg type="o" direction="out" /> \
-+</method> \
-+</interface> \
-+</node>';
-+
-+const ConsoleKitSessionIface = '<node> \
-+<interface name="org.freedesktop.ConsoleKit.Session"> \
-+<signal name="Lock" /> \
-+<signal name="Unlock" /> \
-+</interface> \
-+</node>';
-+
-+const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
-+const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface);
-+
- function haveSystemd() {
- return GLib.access("/run/systemd/seats", 0) >= 0;
- }
-@@ -78,7 +101,7 @@ function canLock() {
- -1, null);
-
- let version = result.deep_unpack()[0].deep_unpack();
-- return haveSystemd() && versionCompare('3.5.91', version);
-+ return versionCompare('3.5.91', version);
- } catch(e) {
- return false;
- }
-@@ -96,7 +119,7 @@ function getLoginManager() {
- if (haveSystemd())
- _loginManager = new LoginManagerSystemd();
- else
-- _loginManager = new LoginManagerDummy();
-+ _loginManager = new LoginManagerConsoleKit();
- }
-
- return _loginManager;
-@@ -113,6 +136,9 @@ var LoginManagerSystemd = new Lang.Class({
- this._prepareForSleep.bind(this));
- },
-
-+ // Having this function is a bit of a hack since the Systemd and ConsoleKit
-+ // session objects have different interfaces - but in both cases there are
-+ // Lock/Unlock signals, and that's all we count upon at the moment.
- getCurrentSessionProxy(callback) {
- if (this._currentSession) {
- callback (this._currentSession);
-@@ -188,13 +214,35 @@ var LoginManagerSystemd = new Lang.Class({
- });
- Signals.addSignalMethods(LoginManagerSystemd.prototype);
-
--var LoginManagerDummy = new Lang.Class({
-- Name: 'LoginManagerDummy',
-+const LoginManagerConsoleKit = new Lang.Class({
-+ Name: 'LoginManagerConsoleKit',
-
-+ _init: function() {
-+ this._proxy = new ConsoleKitManager(Gio.DBus.system,
-+ 'org.freedesktop.ConsoleKit',
-+ '/org/freedesktop/ConsoleKit/Manager');
-+ },
-+
-+ // Having this function is a bit of a hack since the Systemd and ConsoleKit
-+ // session objects have different interfaces - but in both cases there are
-+ // Lock/Unlock signals, and that's all we count upon at the moment.
- getCurrentSessionProxy(callback) {
-- // we could return a DummySession object that fakes whatever callers
-- // expect (at the time of writing: connect() and connectSignal()
-- // methods), but just never calling the callback should be safer
-+ if (this._currentSession) {
-+ callback (this._currentSession);
-+ return;
-+ }
-+
-+ this._proxy.GetCurrentSessionRemote(Lang.bind(this,
-+ function(result, error) {
-+ if (error) {
-+ logError(error, 'Could not get a proxy for the current session');
-+ } else {
-+ this._currentSession = new ConsoleKitSession(Gio.DBus.system,
-+ 'org.freedesktop.ConsoleKit',
-+ result[0]);
-+ callback(this._currentSession);
-+ }
-+ }));
- },
-
- canSuspend(asyncCallback) {
-@@ -214,4 +262,4 @@ var LoginManagerDummy = new Lang.Class({
- callback(null);
- }
- });
--Signals.addSignalMethods(LoginManagerDummy.prototype);
-+Signals.addSignalMethods(LoginManagerConsoleKit.prototype);
diff --git a/x11/gnome-shell/files/patch-js_ui_screenShield.js b/x11/gnome-shell/files/patch-js_ui_screenShield.js
deleted file mode 100644
index 7c05eacea297..000000000000
--- a/x11/gnome-shell/files/patch-js_ui_screenShield.js
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-js_ui_screenShield_js,v 1.3 2017/11/04 16:44:50 jasper Exp $
-
-REVERT:
-From ddea54a5398c123a4711243e55811c8ba26f8b85 Mon Sep 17 00:00:00 2001
-From: Victor Toso <victortoso@redhat.com>
-Date: Thu, 12 May 2016 09:25:49 +0200
-Subject: ScreenShield: set LockedHint property from systemd
-
-Index: js/ui/screenShield.js
---- js/ui/screenShield.js.orig
-+++ js/ui/screenShield.js
-@@ -582,9 +582,6 @@ var ScreenShield = new Lang.Class({
- if (prevIsActive != this._isActive)
- this.emit('active-changed');
-
-- if (this._loginSession)
-- this._loginSession.SetLockedHintRemote(active);
--
- this._syncInhibitor();
- },
-
diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist
index 89f729b79fff..72f1151e9201 100644
--- a/x11/gnome-shell/pkg-plist
+++ b/x11/gnome-shell/pkg-plist
@@ -1,39 +1,64 @@
+bin/gnome-extensions
+bin/gnome-extensions-app
bin/gnome-shell
bin/gnome-shell-extension-prefs
bin/gnome-shell-extension-tool
bin/gnome-shell-perf-tool
+etc/xdg/autostart/gnome-shell-overrides-migration.desktop
lib/gnome-shell/Gvc-1.0.typelib
lib/gnome-shell/Shell-0.1.typelib
-lib/gnome-shell/ShellMenu-0.1.typelib
lib/gnome-shell/St-1.0.typelib
+lib/gnome-shell/girepository-1.0/Shew-0.typelib
lib/gnome-shell/libgnome-shell-menu.so
lib/gnome-shell/libgnome-shell.so
lib/gnome-shell/libgvc.so
+lib/gnome-shell/libshew-0.so
lib/gnome-shell/libst-1.0.so
-%%WEBPLUGIN_DIR%%libgnome-shell-browser-plugin.so
libexec/gnome-shell-calendar-server
libexec/gnome-shell-hotplug-sniffer
+libexec/gnome-shell-overrides-migration.sh
libexec/gnome-shell-perf-helper
+man/man1/gnome-extensions.1.gz
man/man1/gnome-shell.1.gz
share/GConf/gsettings/gnome-shell-overrides.convert
share/applications/evolution-calendar.desktop
-share/applications/gnome-shell-extension-prefs.desktop
+share/applications/org.gnome.Extensions.desktop
+share/applications/org.gnome.Shell.Extensions.desktop
share/applications/org.gnome.Shell.desktop
+share/bash-completion/completions/gnome-extensions
+share/dbus-1/interfaces/org.gnome.Shell.Extensions.xml
+share/dbus-1/interfaces/org.gnome.Shell.Introspect.xml
share/dbus-1/interfaces/org.gnome.Shell.PadOsd.xml
share/dbus-1/interfaces/org.gnome.Shell.Screencast.xml
share/dbus-1/interfaces/org.gnome.Shell.Screenshot.xml
share/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml
share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml
+share/dbus-1/services/org.gnome.Extensions.service
share/dbus-1/services/org.gnome.Shell.CalendarServer.service
+share/dbus-1/services/org.gnome.Shell.Extensions.service
share/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
+share/dbus-1/services/org.gnome.Shell.Notifications.service
share/gnome-control-center/keybindings/50-gnome-shell-system.xml
%%DATADIR%%/Gvc-1.0.gir
%%DATADIR%%/Shell-0.1.gir
-%%DATADIR%%/ShellMenu-0.1.gir
%%DATADIR%%/St-1.0.gir
+%%DATADIR%%/gir-1.0/Shew-0.gir
+%%DATADIR%%/gnome-shell-dbus-interfaces.gresource
%%DATADIR%%/gnome-shell-osk-layouts.gresource
%%DATADIR%%/gnome-shell-theme.gresource
+%%DATADIR%%/org.gnome.Extensions
+%%DATADIR%%/org.gnome.Extensions.data.gresource
+%%DATADIR%%/org.gnome.Extensions.src.gresource
+%%DATADIR%%/org.gnome.Shell.Extensions
+%%DATADIR%%/org.gnome.Shell.Extensions.src.gresource
+%%DATADIR%%/org.gnome.Shell.Notifications
+%%DATADIR%%/org.gnome.Shell.Notifications.src.gresource
%%DATADIR%%/perf-background.xml
+share/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg
+share/icons/hicolor/scalable/apps/org.gnome.Extensions.svg
+share/icons/hicolor/scalable/apps/org.gnome.Shell.Extensions.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Shell.Extensions-symbolic.svg
share/locale/af/LC_MESSAGES/gnome-shell.mo
share/locale/an/LC_MESSAGES/gnome-shell.mo
share/locale/ar/LC_MESSAGES/gnome-shell.mo
@@ -46,6 +71,7 @@ share/locale/bn_IN/LC_MESSAGES/gnome-shell.mo
share/locale/bs/LC_MESSAGES/gnome-shell.mo
share/locale/ca/LC_MESSAGES/gnome-shell.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-shell.mo
+share/locale/ckb/LC_MESSAGES/gnome-shell.mo
share/locale/cs/LC_MESSAGES/gnome-shell.mo
share/locale/da/LC_MESSAGES/gnome-shell.mo
share/locale/de/LC_MESSAGES/gnome-shell.mo
@@ -80,6 +106,7 @@ share/locale/ku/LC_MESSAGES/gnome-shell.mo
share/locale/ky/LC_MESSAGES/gnome-shell.mo
share/locale/lt/LC_MESSAGES/gnome-shell.mo
share/locale/lv/LC_MESSAGES/gnome-shell.mo
+share/locale/mjw/LC_MESSAGES/gnome-shell.mo
share/locale/mk/LC_MESSAGES/gnome-shell.mo
share/locale/ml/LC_MESSAGES/gnome-shell.mo
share/locale/mr/LC_MESSAGES/gnome-shell.mo
@@ -114,4 +141,5 @@ share/locale/vi/LC_MESSAGES/gnome-shell.mo
share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo
share/locale/zh_HK/LC_MESSAGES/gnome-shell.mo
share/locale/zh_TW/LC_MESSAGES/gnome-shell.mo
+share/metainfo/org.gnome.Extensions.metainfo.xml
share/xdg-desktop-portal/portals/gnome-shell.portal
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 5de874168f69..a1396e16862d 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gnome-terminal
PORTVERSION= 3.36.2
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/x11/phosh/Makefile b/x11/phosh/Makefile
index b30e4a6ff128..765abbeba547 100644
--- a/x11/phosh/Makefile
+++ b/x11/phosh/Makefile
@@ -3,7 +3,7 @@
PORTNAME= phosh
DISTVERSIONPREFIX= v
DISTVERSION= 0.4.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= jbeich@FreeBSD.org
diff --git a/x11/squeekboard/Makefile b/x11/squeekboard/Makefile
index 443e9cdb0827..9cbe958448f5 100644
--- a/x11/squeekboard/Makefile
+++ b/x11/squeekboard/Makefile
@@ -3,7 +3,7 @@
PORTNAME= squeekboard
DISTVERSIONPREFIX= v
DISTVERSION= 1.9.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= jbeich@FreeBSD.org